From 81047829ea871efd3d046eda4956c0590575dc9c Mon Sep 17 00:00:00 2001 From: Default email Date: Thu, 10 Feb 2022 15:34:41 -0500 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 48d63e924a2666baf37f4f14a18f19347fbd54a2 --- third_party/nixpkgs/.editorconfig | 4 - .../out_of_date_package_report.md | 6 +- .../workflows/update-terraform-providers.yml | 2 +- .../nixpkgs/doc/stdenv/stdenv.chapter.md | 6 +- third_party/nixpkgs/flake.nix | 34 +- third_party/nixpkgs/lib/attrsets.nix | 2 +- third_party/nixpkgs/lib/default.nix | 4 +- third_party/nixpkgs/lib/licenses.nix | 10 + third_party/nixpkgs/lib/modules.nix | 12 +- third_party/nixpkgs/lib/sources.nix | 115 +- third_party/nixpkgs/lib/trivial.nix | 10 +- .../nixpkgs/maintainers/maintainer-list.nix | 131 +- third_party/nixpkgs/maintainers/team-list.nix | 7 + .../from_md/release-notes/rl-2205.section.xml | 128 + .../manual/release-notes/rl-2205.section.md | 49 + third_party/nixpkgs/nixos/lib/eval-config.nix | 14 +- third_party/nixpkgs/nixos/lib/qemu-common.nix | 2 +- third_party/nixpkgs/nixos/lib/systemd-lib.nix | 3 + .../nixos/lib/systemd-unit-options.nix | 24 +- .../lib/test-driver/test_driver/machine.py | 4 +- third_party/nixpkgs/nixos/lib/utils.nix | 9 +- .../nixos/modules/config/users-groups.nix | 36 +- .../nixos/modules/hardware/all-firmware.nix | 3 +- .../nixos/modules/hardware/video/nvidia.nix | 5 - .../installer/tools/nix-fallback-paths.nix | 10 +- .../installer/tools/nixos-generate-config.pl | 13 +- .../nixos/modules/installer/tools/tools.nix | 12 +- .../nixpkgs/nixos/modules/module-list.nix | 10 +- .../nixpkgs/nixos/modules/programs/calls.nix | 2 + .../command-not-found/command-not-found.pl | 40 +- .../nixpkgs/nixos/modules/programs/dconf.nix | 2 +- .../nixos/modules/programs/spacefm.nix | 2 - .../nixpkgs/nixos/modules/programs/tilp2.nix | 28 - third_party/nixpkgs/nixos/modules/rename.nix | 6 + .../nixos/modules/security/google_oslogin.nix | 9 +- .../nixpkgs/nixos/modules/security/pam.nix | 12 +- .../services/computing/slurm/slurm.nix | 9 +- .../continuous-integration/github-runner.nix | 1 + .../desktops/gnome/glib-networking.nix | 2 +- .../nixos/modules/services/desktops/gvfs.nix | 2 +- .../services/desktops/pantheon/files.nix | 13 - .../modules/services/hardware/ddccontrol.nix | 3 + .../nixos/modules/services/hardware/udev.nix | 3 +- .../modules/services/hardware/upower.nix | 12 +- .../modules/services/logging/promtail.nix | 2 +- .../nixos/modules/services/misc/autorandr.nix | 1 + .../nixos/modules/services/misc/gitlab.nix | 22 +- .../modules/services/misc/home-assistant.nix | 2 +- .../modules/services/misc/matrix-conduit.nix | 9 + .../nixos/modules/services/misc/mediatomb.nix | 1 - .../modules/services/misc/nix-daemon.nix | 2 +- .../modules/services/misc/packagekit.nix | 6 +- .../nixos/modules/services/misc/plex.nix | 18 +- .../prometheus/exporters/smartctl.nix | 4 +- .../services/network-filesystems/ceph.nix | 4 +- .../services/network-filesystems/ipfs.nix | 29 +- .../services/network-filesystems/moosefs.nix | 249 + .../services/network-filesystems/rsyncd.nix | 2 +- .../modules/services/networking/connman.nix | 4 +- .../modules/services/networking/dhcpcd.nix | 14 + .../modules/services/networking/dhcpd.nix | 93 +- .../modules/services/networking/firewall.nix | 2 +- .../modules/services/networking/headscale.nix | 490 + .../modules/services/networking/i2pd.nix | 16 +- .../modules/services/networking/murmur.nix | 2 +- .../services/networking/networkmanager.nix | 17 + .../modules/services/networking/nftables.nix | 16 +- .../modules/services/networking/seafile.nix | 30 +- .../modules/services/networking/syncplay.nix | 2 +- .../services/networking/wg-netmanager.nix | 42 + .../services/networking/wpa_supplicant.nix | 49 +- .../modules/services/networking/yggdrasil.xml | 1 - .../modules/services/search/elasticsearch.nix | 14 + .../nixos/modules/services/security/cfssl.nix | 93 +- .../modules/services/security/haveged.nix | 66 +- .../services/security/vaultwarden/default.nix | 2 +- .../modules/services/system/cloud-init.nix | 16 +- .../modules/services/system/self-deploy.nix | 5 +- .../modules/services/web-apps/bookstack.nix | 4 +- .../modules/services/web-apps/ethercalc.nix | 62 + .../modules/services/web-apps/miniflux.nix | 9 +- .../modules/services/web-apps/plausible.nix | 15 +- .../services/web-servers/nginx/default.nix | 2 +- .../services/web-servers/shellinabox.nix | 122 - .../services/x11/desktop-managers/default.nix | 2 +- .../services/x11/desktop-managers/gnome.nix | 1 + .../services/x11/desktop-managers/gnome.xml | 9 - .../x11/desktop-managers/pantheon.nix | 10 +- .../x11/desktop-managers/pantheon.xml | 4 +- .../x11/desktop-managers/retroarch.nix | 40 + .../services/x11/display-managers/gdm.nix | 29 +- .../nixos/modules/system/boot/stage-1-init.sh | 3 + .../nixos/modules/system/boot/stage-1.nix | 3 + .../nixos/modules/system/boot/systemd.nix | 2 + .../modules/system/etc/etc-activation.nix | 12 + .../nixpkgs/nixos/modules/system/etc/etc.nix | 6 +- .../nixpkgs/nixos/modules/system/etc/test.nix | 70 + .../nixos/modules/tasks/filesystems.nix | 2 +- .../nixos/modules/tasks/filesystems/apfs.nix | 22 + .../modules/tasks/network-interfaces.nix | 2 +- .../modules/testing/test-instrumentation.nix | 4 + .../modules/virtualisation/amazon-image.nix | 2 +- .../virtualisation/docker-rootless.nix | 6 +- .../fetch-instance-ssh-keys.bash | 36 - .../virtualisation/google-compute-config.nix | 137 +- .../nixos/modules/virtualisation/kvmgt.nix | 2 +- .../nixos/modules/virtualisation/qemu-vm.nix | 13 +- .../virtualisation/virtualbox-guest.nix | 2 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 8 +- third_party/nixpkgs/nixos/tests/apfs.nix | 54 + .../nixpkgs/nixos/tests/breitbandmessung.nix | 33 + .../nixpkgs/nixos/tests/cloud-init.nix | 27 +- .../nixos/tests/google-oslogin/default.nix | 4 +- .../nixos/tests/google-oslogin/server.nix | 4 +- .../nixos/tests/google-oslogin/server.py | 0 third_party/nixpkgs/nixos/tests/haproxy.nix | 1 - third_party/nixpkgs/nixos/tests/installer.nix | 4 + third_party/nixpkgs/nixos/tests/moosefs.nix | 89 + .../nixpkgs/nixos/tests/mysql/common.nix | 2 +- .../nixpkgs/nixos/tests/mysql/mysql.nix | 2 +- .../nixpkgs/nixos/tests/noto-fonts.nix | 44 + third_party/nixpkgs/nixos/tests/plausible.nix | 3 + third_party/nixpkgs/nixos/tests/retroarch.nix | 49 + third_party/nixpkgs/nixos/tests/ssh-keys.nix | 2 +- third_party/nixpkgs/nixos/tests/sudo.nix | 4 + third_party/nixpkgs/nixos/tests/sway.nix | 29 +- ...ystemd-networkd-ipv6-prefix-delegation.nix | 19 +- third_party/nixpkgs/nixos/tests/unifi.nix | 3 +- third_party/nixpkgs/nixos/tests/wine.nix | 2 +- .../nixpkgs/nixos/tests/wpa_supplicant.nix | 19 +- third_party/nixpkgs/nixos/tests/xxh.nix | 67 + .../accessibility/contrast/default.nix | 28 +- .../accessibility/squeekboard/default.nix | 20 +- .../audio/ChowCentaur/default.nix | 53 + .../applications/audio/audacity/default.nix | 4 +- .../pkgs/applications/audio/cozy/default.nix | 4 +- .../applications/audio/cyanrip/default.nix | 4 +- .../applications/audio/dfasma/default.nix | 2 +- .../audio/easyeffects/default.nix | 18 +- .../pkgs/applications/audio/fomp/default.nix | 4 +- .../audio/freewheeling/default.nix | 4 +- .../applications/audio/ft2-clone/default.nix | 4 +- .../audio/game-music-emu/default.nix | 2 +- .../audio/hybridreverb2/default.nix | 2 +- .../applications/audio/jamesdsp/default.nix | 64 + .../audio/milkytracker/default.nix | 6 + .../pkgs/applications/audio/munt/default.nix | 50 - .../applications/audio/munt/libmt32emu.nix | 38 + .../applications/audio/munt/mt32emu-qt.nix | 75 + .../audio/munt/mt32emu-smf2wav.nix | 50 + .../applications/audio/pt2-clone/default.nix | 4 +- .../applications/audio/ptcollab/default.nix | 4 +- .../applications/audio/reaper/default.nix | 6 +- .../pkgs/applications/audio/redux/default.nix | 49 + .../audio/schismtracker/default.nix | 4 +- .../applications/audio/sidplayfp/default.nix | 4 +- .../pkgs/applications/audio/snd/default.nix | 4 +- .../applications/audio/songrec/default.nix | 9 +- .../audio/squishyball/default.nix | 30 +- .../applications/audio/strawberry/default.nix | 1 + .../pkgs/applications/audio/tauon/default.nix | 22 +- .../applications/backup/vorta/default.nix | 4 +- .../applications/blockchains/besu/default.nix | 29 + .../blockchains/bisq-desktop/default.nix | 4 +- .../blockchains/btcpayserver/default.nix | 16 +- .../blockchains/btcpayserver/deps.nix | 559 +- .../blockchains/electrs/default.nix | 6 +- .../applications/blockchains/ergo/default.nix | 4 +- .../pkgs/applications/blockchains/erigon.nix | 2 +- .../blockchains/fulcrum/default.nix | 36 + .../ledger-live-desktop/default.nix | 4 +- .../blockchains/lightning-loop/default.nix | 6 +- .../applications/blockchains/lnd/default.nix | 6 +- .../blockchains/nbxplorer/default.nix | 8 +- .../blockchains/nbxplorer/deps.nix | 12 +- .../blockchains/trezor-suite/default.nix | 6 +- .../editors/android-studio/default.nix | 12 +- .../editors/deadpixi-sam/default.nix | 2 + .../emacs/elisp-packages/elpa-generated.nix | 276 +- .../emacs/elisp-packages/nongnu-generated.nix | 320 +- .../elisp-packages/recipes-archive-melpa.json | 2783 +++--- .../applications/editors/heme/default.nix | 29 - .../applications/editors/jetbrains/common.nix | 6 +- .../editors/jetbrains/default.nix | 32 +- .../applications/editors/jove/default.nix | 2 +- .../applications/editors/lite-xl/default.nix | 4 +- .../editors/monodevelop/default.nix | 81 - ...10fb3f6dce121df538e36f21d8c2eeb0a6e3.patch | 57 - .../editors/neovim/neovide/default.nix | 14 +- .../neovim/neovide/skia-externals.json | 12 +- .../applications/editors/poke/default.nix | 21 +- .../editors/texstudio/default.nix | 4 +- .../applications/editors/tiled/default.nix | 8 +- .../pkgs/applications/editors/vim/common.nix | 4 +- .../applications/editors/vscode/generic.nix | 9 +- .../applications/editors/vscode/vscode.nix | 12 +- .../applications/editors/vscode/vscodium.nix | 10 +- .../applications/finance/odoo/default.nix | 9 +- .../applications/graphics/ImageMagick/7.0.nix | 18 +- .../graphics/darktable/default.nix | 5 +- .../applications/graphics/deskew/default.nix | 20 +- .../applications/graphics/drawio/default.nix | 4 +- .../graphics/evilpixie/default.nix | 4 +- .../applications/graphics/glabels/default.nix | 2 +- .../graphics/graphicsmagick/default.nix | 17 +- .../applications/graphics/hydrus/default.nix | 4 +- .../graphics/imlibsetroot/default.nix | 19 +- .../graphics/inkscape/default.nix | 8 + .../applications/graphics/menyoki/default.nix | 6 +- .../applications/graphics/pdfcpu/default.nix | 2 +- .../graphics/pixinsight/default.nix | 132 + .../applications/graphics/tev/default.nix | 9 +- .../graphics/vengi-tools/default.nix | 57 +- .../test-voxconvert-all-formats.nix | 15 + .../vengi-tools/test-voxconvert-roundtrip.nix | 15 - .../nixpkgs/pkgs/applications/kde/fetch.sh | 2 +- .../nixpkgs/pkgs/applications/kde/srcs.nix | 1840 ++-- .../misc/1password-gui/default.nix | 4 +- .../applications/misc/1password/default.nix | 4 +- .../misc/ArchiSteamFarm/default.nix | 4 +- .../ArchiSteamFarm/deps-aarch64-linux.nix | 2 +- .../misc/ArchiSteamFarm/deps-x86_64-linux.nix | 2 +- .../misc/ArchiSteamFarm/web-ui/default.nix | 4 +- .../ArchiSteamFarm/web-ui/node-packages.nix | 1610 ++-- .../applications/misc/batsignal/default.nix | 4 +- .../pkgs/applications/misc/charm/default.nix | 2 +- .../pkgs/applications/misc/clight/clightd.nix | 4 +- .../pkgs/applications/misc/cloak/default.nix | 6 +- .../applications/misc/cointop/default.nix | 4 +- .../pkgs/applications/misc/dasel/default.nix | 2 +- .../applications/misc/dbeaver/default.nix | 6 +- .../pkgs/applications/misc/edgetx/default.nix | 47 + .../misc/electrum-grs/default.nix | 129 + .../applications/misc/electrum/default.nix | 7 +- .../pkgs/applications/misc/electrum/ltc.nix | 5 + .../applications/misc/etesync-dav/default.nix | 30 +- .../applications/misc/expenses/default.nix | 2 +- .../pkgs/applications/misc/fnott/default.nix | 4 +- .../pkgs/applications/misc/fslint/default.nix | 41 - .../pkgs/applications/misc/fuzzel/default.nix | 4 +- .../applications/misc/gallery-dl/default.nix | 4 +- .../pkgs/applications/misc/gksu/default.nix | 53 - .../misc/gksu/gksu-2.0.2-glib-2.31.patch | 29 - .../default.nix | 32 +- .../pkgs/applications/misc/gpxsee/default.nix | 4 +- .../applications/misc/gxmessage/default.nix | 6 +- .../pkgs/applications/misc/hello/default.nix | 4 +- .../applications/misc/hivemind/default.nix | 10 +- .../pkgs/applications/misc/hugo/default.nix | 6 +- .../misc/inherd-quake/default.nix | 6 +- .../misc/leetcode-cli/default.nix | 41 + .../applications/misc/librecad/default.nix | 9 + .../applications/misc/limesctl/default.nix | 2 +- .../pkgs/applications/misc/llama/default.nix | 2 +- .../applications/misc/mediaelch/default.nix | 11 +- .../applications/misc/megacmd/default.nix | 15 +- .../pkgs/applications/misc/mepo/default.nix | 17 +- .../misc/moonlight-qt/default.nix | 4 +- .../pkgs/applications/misc/mupdf/default.nix | 32 +- .../misc/neo4j-desktop/default.nix | 4 +- .../misc/numberstation/default.nix | 4 +- .../applications/misc/nwg-menu/default.nix | 2 +- .../applications/misc/nwg-panel/default.nix | 4 +- .../applications/misc/obsidian/default.nix | 4 +- .../applications/misc/octoprint/default.nix | 4 +- .../applications/misc/openrgb/default.nix | 3 + .../applications/misc/osmium-tool/default.nix | 4 +- .../pkgs/applications/misc/p2pool/default.nix | 11 +- .../pkgs/applications/misc/pdfmod/default.nix | 49 - .../misc/pdfsam-basic/default.nix | 4 +- .../applications/misc/pdfstudio/default.nix | 12 +- .../pkgs/applications/misc/phoc/default.nix | 4 +- .../misc/prusa-slicer/super-slicer.nix | 4 +- .../pkgs/applications/misc/pueue/default.nix | 6 +- .../applications/misc/pure-maps/default.nix | 15 +- .../misc/qMasterPassword/default.nix | 20 +- .../pkgs/applications/misc/qcad/default.nix | 5 +- .../pkgs/applications/misc/ratt/default.nix | 2 +- .../misc/remarkable/rmapi/default.nix | 4 +- .../applications/misc/rofi-emoji/default.nix | 4 +- .../misc/rofi-file-browser/default.nix | 4 +- .../pkgs/applications/misc/rofi/default.nix | 4 +- .../pkgs/applications/misc/rofi/wayland.nix | 4 +- .../pkgs/applications/misc/skate/default.nix | 2 +- .../pkgs/applications/misc/slides/default.nix | 2 +- .../misc/snapmaker-luban/default.nix | 4 +- .../misc/spicetify-cli/default.nix | 4 +- .../misc/spotify-tray/default.nix | 10 +- .../applications/misc/subsurface/default.nix | 3 +- .../misc/swaynotificationcenter/default.nix | 43 + .../misc/taskwarrior-tui/default.nix | 6 +- .../pkgs/applications/misc/ticker/default.nix | 2 +- .../misc/todoist-electron/default.nix | 8 +- .../applications/misc/tty-share/default.nix | 4 +- .../applications/misc/urlscan/default.nix | 4 +- .../applications/misc/weather/default.nix | 6 +- .../pkgs/applications/misc/wike/default.nix | 4 +- .../pkgs/applications/misc/wtf/default.nix | 6 +- .../applications/misc/xdg-launch/default.nix | 4 +- .../pkgs/applications/misc/xmrig/default.nix | 4 +- .../pkgs/applications/misc/xplr/default.nix | 6 +- .../pkgs/applications/misc/yambar/default.nix | 4 +- .../pkgs/applications/misc/yarssr/default.nix | 81 - .../applications/misc/zathura/default.nix | 2 +- .../applications/misc/zathura/wrapper.nix | 2 +- .../pkgs/applications/misc/zettlr/default.nix | 4 +- .../networking/aether/default.nix | 30 +- .../networking/breitbandmessung/default.nix | 153 + .../networking/browsers/brave/default.nix | 4 +- .../networking/browsers/chromium/common.nix | 23 - .../networking/browsers/chromium/default.nix | 4 +- ...-ozone-wayland-fix-surface_augmenter.patch | 31 - .../browsers/chromium/upstream-info.json | 70 +- .../networking/browsers/falkon/default.nix | 12 +- .../browsers/firefox-bin/release_sources.nix | 786 +- .../networking/browsers/firefox/common.nix | 5 +- .../firefox/fix-build-with-wayland-1.20.patch | 13 - .../networking/browsers/firefox/packages.nix | 8 +- .../browsers/google-chrome/default.nix | 6 +- .../networking/browsers/lagrange/default.nix | 4 +- .../networking/browsers/nyxt/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/clusterctl/default.nix | 6 +- .../networking/cluster/cmctl/default.nix | 38 + .../networking/cluster/driftctl/default.nix | 6 +- .../networking/cluster/flink/default.nix | 4 +- .../networking/cluster/fluxcd/default.nix | 8 +- .../networking/cluster/glooctl/default.nix | 36 + .../networking/cluster/helm/default.nix | 4 +- .../networking/cluster/helmsman/default.nix | 2 +- .../networking/cluster/k0sctl/default.nix | 2 +- .../networking/cluster/k9s/default.nix | 2 +- .../cluster/kube-capacity/default.nix | 2 +- .../cluster/kubebuilder/default.nix | 6 +- .../networking/cluster/kuma/default.nix | 2 +- .../networking/cluster/linkerd/edge.nix | 6 +- .../networking/cluster/nerdctl/default.nix | 6 +- .../cluster/nomad-autoscaler/default.nix | 22 +- .../networking/cluster/nomad/1.0.nix | 11 - .../networking/cluster/nomad/1.1.nix | 2 +- .../networking/cluster/nomad/1.2.nix | 2 +- .../networking/cluster/nomad/generic.nix | 15 +- .../cluster/nomad/genericModule.nix | 54 - .../networking/cluster/starboard/default.nix | 6 +- .../networking/cluster/stern/default.nix | 6 +- .../networking/cluster/talosctl/default.nix | 4 +- .../networking/cluster/tanka/default.nix | 6 +- .../cluster/tektoncd-cli/default.nix | 14 +- .../cluster/terraform-providers/default.nix | 68 +- .../terraform-providers/providers.json | 323 +- .../terraform-providers/update-all-providers | 2 +- .../terraform-providers/update-provider | 21 +- .../networking/cluster/terraform/default.nix | 59 +- .../networking/cluster/terragrunt/default.nix | 4 +- .../networking/cluster/tilt/default.nix | 4 +- .../networking/cluster/vcluster/default.nix | 4 +- .../networking/cluster/werf/default.nix | 6 +- .../networking/dnscontrol/default.nix | 6 +- .../networking/feedreaders/photon/default.nix | 2 +- .../networking/flexget/default.nix | 4 +- .../networking/gmailctl/default.nix | 2 +- .../instant-messengers/bluejeans/default.nix | 4 +- .../instant-messengers/chatty/default.nix | 7 +- .../instant-messengers/coyim/default.nix | 1 + .../instant-messengers/discord/default.nix | 23 +- .../element/element-desktop-package.json | 9 +- .../instant-messengers/element/pin.json | 8 +- .../instant-messengers/jami/daemon.nix | 4 +- .../jitsi-meet-electron/default.nix | 4 +- .../mattermost-desktop/default.nix | 166 +- .../rocketchat-desktop/default.nix | 4 +- .../instant-messengers/schildichat/pin.json | 8 +- .../signal-desktop/default.nix | 4 +- .../instant-messengers/slack/default.nix | 54 +- .../instant-messengers/slack/update.sh | 11 +- .../instant-messengers/teams/default.nix | 235 +- .../telegram/kotatogram-desktop/tg_owt.nix | 4 +- .../telegram/tdesktop/default.nix | 2 +- .../networking/irc/irssi/default.nix | 20 +- .../networking/irc/irssi/fish/default.nix | 2 +- ...num-type-stream-operators-for-Qt-5.1.patch | 37 - .../networking/irc/quassel/default.nix | 16 +- .../networking/mailreaders/aerc/default.nix | 2 +- .../mailreaders/hasmail/default.nix | 2 +- .../mailreaders/himalaya/default.nix | 6 +- .../thunderbird-bin/release_sources.nix | 522 +- .../mailreaders/thunderbird/packages.nix | 4 +- .../mailreaders/tutanota-desktop/default.nix | 4 +- .../applications/networking/n8n/default.nix | 2 + .../networking/n8n/generate-dependencies.sh | 1 + .../networking/n8n/node-packages.nix | 382 +- .../networking/nextcloud-client/default.nix | 4 +- .../networking/remote/teamviewer/default.nix | 4 +- .../remote/vmware-horizon-client/default.nix | 111 +- .../networking/seahub/default.nix | 74 + .../networking/seaweedfs/default.nix | 6 +- .../networking/syncthing/default.nix | 6 +- .../applications/office/foliate/default.nix | 4 +- .../applications/office/gnumeric/default.nix | 4 +- .../office/impressive/default.nix | 70 - .../applications/office/jabref/default.nix | 4 +- .../applications/office/jameica/default.nix | 8 +- .../office/libreoffice/darwin.nix | 51 + .../applications/office/morgen/default.nix | 59 + .../applications/office/qownnotes/default.nix | 4 +- .../applications/office/scribus/unstable.nix | 5 + .../applications/office/skrooge/default.nix | 4 +- .../office/super-productivity/default.nix | 4 +- .../office/timekeeper/default.nix | 44 - ...sole-logger-instead-of-rolling-files.patch | 53 +- .../applications/office/trilium/default.nix | 6 +- .../applications/office/vnote/default.nix | 4 +- .../applications/office/zanshin/default.nix | 4 +- .../applications/radio/freedv/default.nix | 10 +- .../applications/radio/gnuradio/default.nix | 4 +- .../applications/radio/sdrangel/default.nix | 4 +- .../science/astronomy/gravit/default.nix | 14 +- .../science/biology/bowtie2/default.nix | 4 +- .../science/biology/hisat2/default.nix | 4 +- .../science/biology/kallisto/default.nix | 4 +- .../science/biology/repseek/default.nix | 27 + .../science/electronics/alliance/default.nix | 4 + .../science/electronics/eagle/eagle7.nix | 2 +- .../science/electronics/verilator/default.nix | 20 +- .../science/logic/anders/default.nix | 24 + .../science/logic/coq/default.nix | 1 + .../science/logic/key/default.nix | 95 +- .../science/logic/lean/default.nix | 6 +- .../vowpal-wabbit/default.nix | 4 +- .../applications/science/math/gfm/default.nix | 55 - .../science/math/rofi-calc/default.nix | 4 +- .../science/math/sage/default.nix | 19 +- ...xternal-software-when-all-of-sage-is.patch | 46 + ...3-optional-tests-when-all-of-sage-is.patch | 26 - .../patches/do-not-test-find-library.patch | 21 +- .../fonttools-deprecation-warnings.patch | 39 - .../sage/patches/linbox-1.7-upgrade.patch | 58 + .../sphinx-docbuild-subprocesses.patch | 12 +- .../sage/python-modules/sage-docbuild.nix | 28 + .../math/sage/python-modules/sage-setup.nix | 28 + .../science/math/sage/sage-env.nix | 11 +- .../science/math/sage/sage-src.nix | 72 +- .../science/math/sage/sage-with-env.nix | 6 +- .../applications/science/math/sage/sage.nix | 3 +- .../science/math/sage/sage_docbuild.nix | 20 - .../science/math/sage/sagedoc.nix | 4 +- .../science/math/sage/sagelib.nix | 52 +- .../science/math/scilab-bin/default.nix | 4 +- .../science/math/singular/default.nix | 77 +- ...le-docs-for-optional-unpackaged-deps.patch | 112 - .../math/singular/redhat-aarch64.patch | 38 - .../use-older-ax-prog-cc-for-build.patch | 194 - .../math/singular/vspace-MAX_PROCESS.patch | 35 - .../science/math/tilp2/default.nix | 57 - .../science/misc/bada-bib/default.nix | 78 + .../science/misc/cwltool/default.nix | 4 +- .../science/misc/foldingathome/control.nix | 2 +- .../science/misc/foldingathome/viewer.nix | 2 +- .../science/misc/sasview/default.nix | 103 +- .../science/misc/sasview/local_config.patch | 22 - .../science/misc/sasview/pyparsing-fix.patch | 13 - .../science/physics/shtns/default.nix | 22 + .../terminal-emulators/eterm/default.nix | 2 +- .../terminal-emulators/foot/default.nix | 5 +- .../terminal-emulators/hyper/default.nix | 6 +- .../kermit-terminal/default.nix | 41 + .../terminal-emulators/kitty/default.nix | 4 +- .../rxvt-unicode/default.nix | 33 +- .../version-management/cvs2svn/default.nix | 4 +- .../git-and-tools/gh/default.nix | 6 +- .../git-and-tools/git-branchless/default.nix | 6 +- .../git-and-tools/git/default.nix | 4 +- .../git-and-tools/gitui/default.nix | 24 +- .../git-and-tools/glab/default.nix | 2 +- .../git-and-tools/glitter/default.nix | 6 +- .../git-and-tools/stgit/default.nix | 4 +- .../version-management/gitea/default.nix | 4 +- .../version-management/gitlab/data.json | 12 +- .../gitlab/gitaly/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../gitlab/rubyEnv/Gemfile.lock | 2 +- .../version-management/gogs/default.nix | 6 +- .../version-management/got/default.nix | 6 +- .../version-management/mercurial/default.nix | 6 +- .../version-management/rcs/default.nix | 10 +- .../version-management/sourcehut/dispatch.nix | 2 +- .../version-management/tortoisehg/default.nix | 82 +- .../version-management/yadm/default.nix | 102 +- .../video/ffmpeg-normalize/default.nix | 4 +- .../controller-topology-project/default.nix | 35 + .../video/kodi/addons/controllers/default.nix | 22 - .../applications/video/mkvtoolnix/default.nix | 4 +- .../applications/video/mplayer/default.nix | 14 +- .../mplayer/svn-r38199-ffmpeg44fix.patch | 22 - .../applications/video/obs-studio/default.nix | 4 +- .../video/plex-media-player/default.nix | 6 +- .../applications/video/sub-batch/default.nix | 6 +- .../applications/video/ustreamer/default.nix | 4 +- .../pkgs/applications/video/vdr/default.nix | 4 +- .../pkgs/applications/video/vlc/default.nix | 4 +- .../applications/video/xplayer/default.nix | 2 +- .../virtualization/charliecloud/default.nix | 4 +- .../cloud-hypervisor/default.nix | 9 +- .../virtualization/cri-o/default.nix | 4 +- .../virtualization/lima/default.nix | 6 +- .../virtualization/podman-compose/default.nix | 2 +- .../virtualization/qemu/default.nix | 93 +- .../virtualization/qemu/sigrtminmax.patch | 30 - .../virtualization/singularity/default.nix | 4 +- .../virtualization/virtualbox/default.nix | 1 + .../virtualization/x11docker/default.nix | 4 +- .../window-managers/dwl/default.nix | 26 +- .../window-managers/i3/status-rust.nix | 13 +- .../window-managers/icewm/default.nix | 2 +- .../window-managers/labwc/default.nix | 30 +- ...x-the-version-constraint-for-wlroots.patch | 29 + .../window-managers/phosh/default.nix | 4 +- .../window-managers/picom/default.nix | 4 +- .../window-managers/picom/picom-next.nix | 6 +- .../window-managers/river/default.nix | 16 +- .../window-managers/spectrwm/default.nix | 4 +- .../window-managers/weston/default.nix | 8 +- .../build-fhs-userenv/chrootenv/default.nix | 2 +- .../chrootenv/{ => src}/chrootenv.c | 0 .../chrootenv/{ => src}/meson.build | 0 .../pkgs/build-support/docker/default.nix | 4 +- .../build-support/fetchgithub/default.nix | 15 +- .../pkgs/build-support/fetchpatch/default.nix | 21 +- .../nixpkgs/pkgs/build-support/go/garble.nix | 18 +- .../pkgs/build-support/kernel/make-initrd.sh | 2 +- .../build-support/libredirect/default.nix | 6 +- .../build-support/libredirect/libredirect.c | 121 + .../pkgs/build-support/libredirect/test.c | 66 + .../build-support/setup-hooks/make-wrapper.sh | 78 +- .../data/fonts/cantarell-fonts/default.nix | 31 +- .../pkgs/data/fonts/cm-unicode/default.nix | 2 +- .../pkgs/data/fonts/cozette/default.nix | 4 +- .../pkgs/data/fonts/crimson/default.nix | 2 +- .../pkgs/data/fonts/dejavu-fonts/default.nix | 2 +- .../pkgs/data/fonts/encode-sans/default.nix | 2 +- .../pkgs/data/fonts/ipaexfont/default.nix | 8 +- .../pkgs/data/fonts/ipafont/default.nix | 4 +- .../pkgs/data/fonts/julia-mono/default.nix | 4 +- .../pkgs/data/fonts/noto-fonts/default.nix | 8 +- .../data/icons/papirus-icon-theme/default.nix | 4 +- .../data/icons/phinger-cursors/default.nix | 28 + .../icons/tela-circle-icon-theme/default.nix | 8 +- .../pkgs/data/misc/ddccontrol-db/default.nix | 4 +- .../nixpkgs/pkgs/data/misc/hackage/pin.json | 8 +- .../pkgs/data/misc/mime-types/default.nix | 21 - .../pkgs/data/misc/poppler-data/default.nix | 22 +- .../v2ray-domain-list-community/default.nix | 4 +- .../pkgs/data/misc/v2ray-geoip/default.nix | 6 +- .../stylesheets/xslt/docbook-xsl/default.nix | 3 +- .../default.nix | 21 +- .../themes/graphite-kde-theme/default.nix | 41 + .../kde-rounded-corners/default.nix | 38 + .../pkgs/data/themes/marwaita/default.nix | 4 +- .../pkgs/desktops/cdesktopenv/default.nix | 2 + .../gnome-2/bindings/libglademm/default.nix | 17 - .../nixpkgs/pkgs/desktops/gnome-2/default.nix | 5 +- .../pkgs/desktops/gnome/core/gdm/default.nix | 4 +- .../gnome/core/gnome-desktop/default.nix | 4 +- .../desktops/gnome/core/gnome-session/ctl.nix | 4 +- .../gnome/core/gnome-session/default.nix | 98 +- .../gnome/core/gnome-session/fix-paths.patch | 15 +- .../gnome/core/gnome-shell/default.nix | 4 +- .../desktops/gnome/core/mutter/default.nix | 4 +- .../extensions/dash-to-panel/default.nix | 31 - .../desktops/gnome/extensions/extensions.json | 46 +- .../gnome/extensions/manuallyPackaged.nix | 1 - .../gnome/extensions/pop-shell/default.nix | 10 + .../gnome/extensions/pop-shell/fix-gjs.patch | 34 - .../gnome/games/gnome-2048/default.nix | 54 + .../desktops/gnome/games/tali/default.nix | 4 +- .../pkgs/desktops/gnome/misc/gitg/default.nix | 12 +- .../pkgs/desktops/mate/mate-panel/default.nix | 4 +- .../pkgs/desktops/mate/mate-tweak/default.nix | 4 +- .../add-packagekit-backend-option.patch | 240 - .../pantheon/apps/appcenter/default.nix | 11 - .../apps/elementary-calculator/default.nix | 1 - .../apps/elementary-calendar/default.nix | 29 +- .../apps/elementary-camera/default.nix | 42 +- .../pantheon/apps/elementary-code/default.nix | 29 +- .../apps/elementary-feedback/default.nix | 2 - .../apps/elementary-files/default.nix | 2 - .../apps/elementary-music/default.nix | 61 +- .../apps/elementary-photos/default.nix | 23 +- .../apps/elementary-screenshot/default.nix | 2 +- .../apps/elementary-terminal/default.nix | 2 +- .../apps/elementary-videos/default.nix | 11 +- .../pantheon/apps/sideload/default.nix | 2 - .../about/add-wallpaper-option.patch | 82 + .../apps/switchboard-plugs/about/default.nix | 16 +- .../about/fix-background-path.patch | 13 - .../artwork/elementary-gtk-theme/default.nix | 2 +- .../artwork/elementary-icon-theme/default.nix | 2 +- .../pkgs/desktops/pantheon/default.nix | 18 +- .../elementary-default-settings/default.nix | 3 +- .../io.elementary.appcenter.dockitem | 2 + .../plank-dockitems.gschema.override | 2 +- .../elementary-gsettings-schemas/default.nix | 1 - .../desktop/elementary-onboarding/default.nix | 2 - .../desktop/file-roller-contract/default.nix | 9 +- .../gnome-bluetooth-contract/default.nix | 9 +- .../wingpanel-indicators/power/default.nix | 4 +- .../desktops/pantheon/granite/default.nix | 9 +- .../wingpanel-indicator-ayatana/default.nix | 7 + .../3rdparty/addons/bismuth/default.nix | 4 +- .../nixpkgs/pkgs/desktops/xfce/default.nix | 2 +- .../xfce4-cpufreq-plugin/default.nix | 4 +- .../xfce4-cpugraph-plugin/default.nix | 4 +- .../xfce4-sensors-plugin/default.nix | 4 +- .../beam-modules/erlang-ls/default.nix | 4 +- .../beam-modules/erlang-ls/rebar-deps.nix | 17 +- .../development/compilers/ats2/default.nix | 4 + .../development/compilers/crystal/default.nix | 18 +- .../development/compilers/flutter/default.nix | 8 +- .../flutter/patches/disable-auto-update.patch | 16 +- .../flutter/patches/move-cache.patch | 18 +- .../development/compilers/fpc/lazarus.nix | 4 + .../compilers/gforth/boot-forth.nix | 24 + .../development/compilers/gforth/default.nix | 33 +- .../development/compilers/gforth/swig.nix | 16 + .../pkgs/development/compilers/ghc/8.10.7.nix | 9 + .../pkgs/development/compilers/ghc/9.0.2.nix | 17 +- .../pkgs/development/compilers/ghc/9.2.1.nix | 17 +- .../compilers/ghc/cabal-paths.patch | 99 + .../compilers/go/{1.15.nix => 1.18.nix} | 39 +- .../compilers/go/go_no_vendor_checks.patch | 23 - .../compilers/go/skip-chown-tests-1.16.patch | 42 + .../go/skip-external-network-tests-1.15.patch | 13 - .../compilers/go/ssl-cert-file-1.15.patch | 76 - .../development/compilers/hip/default.nix | 6 +- .../compilers/jetbrains-jdk/default.nix | 5 +- .../development/compilers/julia/1.7-bin.nix | 4 +- .../compilers/llvm/12/libcxx/default.nix | 6 - .../compilers/llvm/13/libcxx/default.nix | 6 - .../compilers/llvm/git/libcxx/default.nix | 6 - .../compilers/mlton/from-git-source.nix | 3 + .../compilers/openjdk/darwin/8.nix | 2 +- .../compilers/openjdk/openjfx/11.nix | 4 +- .../compilers/openjdk/openjfx/15.nix | 4 +- .../compilers/rust/{1_57.nix => 1_58.nix} | 30 +- .../development/compilers/rust/clippy.nix | 4 - .../development/compilers/swift/default.nix | 123 +- .../development/compilers/uasm/default.nix | 50 + .../development/compilers/unison/default.nix | 2 +- .../coq-modules/coq-elpi/default.nix | 3 + .../coq-modules/coqeal/default.nix | 2 +- .../coq-modules/dpdgraph/default.nix | 2 + .../coq-modules/extructures/default.nix | 2 + .../development/coq-modules/flocq/default.nix | 3 +- .../coq-modules/fourcolor/default.nix | 3 + .../coq-modules/hierarchy-builder/default.nix | 2 + .../coq-modules/interval/default.nix | 3 +- .../coq-modules/mathcomp-abel/default.nix | 2 +- .../coq-modules/mathcomp-analysis/default.nix | 2 + .../coq-modules/mathcomp-finmap/default.nix | 2 +- .../coq-modules/mathcomp-word/default.nix | 2 +- .../coq-modules/mathcomp/default.nix | 4 +- .../coq-modules/multinomials/default.nix | 3 +- .../coq-modules/odd-order/default.nix | 3 + .../embedded/arduino/arduino-core/default.nix | 22 +- .../guile-modules/guile-gnome/default.nix | 70 - .../guile-modules/guile-xcb/default.nix | 12 +- .../haskell-modules/configuration-arm.nix | 3 + .../haskell-modules/configuration-common.nix | 12 +- .../configuration-ghc-9.0.x.nix | 24 +- .../configuration-ghc-9.2.x.nix | 41 +- .../configuration-hackage2nix/broken.yaml | 10 +- .../configuration-hackage2nix/main.yaml | 7 +- .../transitive-broken.yaml | 32 +- .../haskell-modules/configuration-nix.nix | 137 +- .../haskell-modules/hackage-packages.nix | 2331 +++-- .../haskell-modules/with-packages-wrapper.nix | 15 + .../development/idris-modules/default.nix | 9 +- .../development/idris-modules/protobuf.nix | 25 - .../development/interpreters/bats/default.nix | 38 +- .../interpreters/clojure/babashka.nix | 4 +- .../interpreters/clojure/default.nix | 4 +- .../development/interpreters/dart/default.nix | 12 +- .../development/interpreters/love/0.10.nix | 4 +- .../interpreters/lunatic/default.nix | 6 +- .../interpreters/nextflow/default.nix | 56 + .../interpreters/python/cpython/default.nix | 9 +- .../interpreters/python/default.nix | 28 +- .../update-python-libraries.py | 12 +- .../interpreters/quickjs/default.nix | 1 + .../development/interpreters/rakudo/zef.nix | 4 +- .../development/interpreters/ruby/default.nix | 3 +- .../interpreters/spidermonkey/68.nix | 104 - .../interpreters/spidermonkey/91.nix | 4 +- .../interpreters/trealla/default.nix | 4 +- .../interpreters/wasmtime/default.nix | 4 +- .../libraries/LAStools/default.nix | 6 +- .../development/libraries/SDL2_ttf/2.0.15.nix | 25 + .../libraries/SDL2_ttf/default.nix | 8 +- .../abseil-cpp/{default.nix => 202103.nix} | 2 +- .../libraries/abseil-cpp/202111.nix | 36 + .../development/libraries/ace/default.nix | 4 +- .../libraries/aqbanking/gwenhywfar.nix | 4 +- .../libraries/arrow-cpp/default.nix | 30 +- .../0001-Remove-deprecated-scons-call.patch | 24 + ...002-Fix-compatibility-with-new-SCons.patch | 31 + .../libraries/audio/roc-toolkit/default.nix | 11 +- .../libraries/audio/rtmidi/default.nix | 32 +- .../audio/vamp-plugin-sdk/default.nix | 4 + .../libraries/boehm-gc/default.nix | 4 - .../development/libraries/catch2/default.nix | 4 +- .../development/libraries/celt/generic.nix | 2 +- .../libraries/chromaprint/default.nix | 4 +- .../libraries/crypto++/default.nix | 31 +- .../libraries/dbus-cplusplus/default.nix | 4 +- .../development/libraries/dlib/default.nix | 4 +- .../libraries/double-conversion/default.nix | 4 +- .../libraries/easyloggingpp/default.nix | 4 +- .../development/libraries/expat/default.nix | 4 +- .../development/libraries/faad2/default.nix | 2 +- .../libraries/farstream/default.nix | 11 +- .../development/libraries/fcft/default.nix | 4 +- .../development/libraries/fcgi/default.nix | 2 +- .../libraries/fflas-ffpack/default.nix | 6 +- .../libraries/ffmpeg-full/default.nix | 24 +- .../libraries/ffmpegthumbnailer/default.nix | 6 +- .../development/libraries/ffms/default.nix | 4 +- .../development/libraries/fftw/default.nix | 14 +- .../development/libraries/flann/default.nix | 2 +- .../development/libraries/flatpak/default.nix | 2 +- .../development/libraries/folks/default.nix | 14 +- .../development/libraries/fplll/default.nix | 7 +- .../development/libraries/gdal/default.nix | 6 +- .../development/libraries/gettext/default.nix | 8 +- .../development/libraries/giblib/default.nix | 37 - .../development/libraries/givaro/default.nix | 4 +- .../development/libraries/gjs/default.nix | 4 +- .../development/libraries/glib/default.nix | 9 +- .../libraries/glibc/2.33-master.patch.gz | Bin 69704 -> 147266 bytes .../development/libraries/glibc/common.nix | 4 +- .../libraries/gnome-sharp/default.nix | 45 - .../libraries/gnome-sharp/fix-mono-path.patch | 13 - .../development/libraries/gnutls/default.nix | 8 +- .../gobject-introspection/default.nix | 9 + .../libraries/gstreamer/bad/default.nix | 57 +- .../bad/fix_pkgconfig_includedir.patch | 15 - .../libraries/gstreamer/base/default.nix | 10 +- .../base/fix_pkgconfig_includedir.patch | 15 - .../libraries/gstreamer/core/default.nix | 8 +- .../core/fix_pkgconfig_includedir.patch | 17 - .../libraries/gstreamer/devtools/default.nix | 10 +- .../devtools/fix_pkgconfig_includedir.patch | 15 - .../libraries/gstreamer/ges/default.nix | 8 +- .../ges/fix_pkgconfig_includedir.patch | 15 - .../libraries/gstreamer/good/default.nix | 4 +- .../libraries/gstreamer/libav/default.nix | 6 +- .../gstreamer/rtsp-server/default.nix | 16 +- .../fix_pkgconfig_includedir.patch | 15 - .../libraries/gstreamer/ugly/default.nix | 23 +- .../libraries/gstreamer/vaapi/default.nix | 4 +- .../development/libraries/gtk-sharp/2.0.nix | 12 +- .../development/libraries/gtk-sharp/3.0.nix | 12 +- .../development/libraries/gupnp/default.nix | 4 +- .../libraries/harfbuzz/default.nix | 4 +- .../development/libraries/hidapi/default.nix | 4 +- .../development/libraries/idnkit/default.nix | 7 +- .../development/libraries/imlib2/default.nix | 18 +- .../libraries/intel-gmmlib/default.nix | 4 +- .../java/commons/fileupload/default.nix | 6 +- .../libraries/java/gwt-dragdrop/default.nix | 27 - .../libraries/java/gwt-widgets/default.nix | 25 - .../libraries/jitterentropy/default.nix | 30 +- .../jitterentropy/reproducible-manpages.patch | 13 - .../development/libraries/judy/cross.patch | 22 + .../development/libraries/judy/default.nix | 10 +- .../extra-cmake-modules/setup-hook.sh | 27 +- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +- ...Fix-Linux-build-error-with-musl-libc.patch | 32 - .../krb5-Fix-typo-in-musl-build-fix.patch | 28 - .../development/libraries/kerberos/krb5.nix | 16 +- .../libraries/leatherman/default.nix | 4 +- .../libraries/libamqpcpp/default.nix | 4 +- .../libraries/libcangjie/default.nix | 11 +- .../libraries/libesmtp/default.nix | 27 +- .../development/libraries/libf2c/default.nix | 4 + .../development/libraries/libgksu/default.nix | 86 - .../libgksu/libgksu-2.0.0-fbsd.patch | 60 - .../libgksu-2.0.12-automake-1.11.2.patch | 25 - .../libgksu-2.0.12-fix-make-3.82.patch | 19 - .../libgksu/libgksu-2.0.12-notests.patch | 26 - .../libgksu-2.0.12-revert-forkpty.patch | 359 - .../libgksu/libgksu-2.0.7-libs.patch | 76 - .../libgksu/libgksu-2.0.7-polinguas.patch | 40 - .../libraries/libgphoto2/default.nix | 4 +- .../development/libraries/libical/default.nix | 4 +- .../libraries/libinput/default.nix | 114 +- .../libraries/libnatpmp/default.nix | 11 +- .../libraries/libnats-c/default.nix | 6 +- .../libraries/libosmium/default.nix | 4 +- .../libraries/libplacebo/default.nix | 4 +- .../libraries/libproxy/default.nix | 10 +- .../libraries/libredwg/default.nix | 4 +- .../development/libraries/librsvg/default.nix | 4 +- .../libraries/librtlsdr/default.nix | 2 +- .../libraries/libshumate/default.nix | 17 +- .../libraries/libtorrent-rasterbar/1.1.nix | 1 + .../libraries/libunibreak/default.nix | 4 +- .../development/libraries/liburcu/default.nix | 4 +- .../pkgs/development/libraries/libwpe/fdo.nix | 4 +- .../development/libraries/libxc/default.nix | 4 +- .../development/libraries/linbox/default.nix | 18 +- .../linbox/patches/linbox-pr256-part2.patch | 13 - .../libraries/liquidfun/default.nix | 33 +- .../development/libraries/live555/default.nix | 7 + .../development/libraries/lzlib/default.nix | 12 +- .../libraries/mapbox-gl-qml/default.nix | 4 +- .../development/libraries/mbedtls/default.nix | 4 +- .../development/libraries/mesa/default.nix | 4 +- .../development/libraries/mlt/default.nix | 4 +- .../development/libraries/ncurses/default.nix | 1 + .../pkgs/development/libraries/neon/0.29.nix | 49 - ...igure.patch => darwin-fix-configure.patch} | 0 .../development/libraries/neon/default.nix | 2 +- .../development/libraries/nghttp3/default.nix | 8 +- .../development/libraries/ngtcp2/default.nix | 13 +- .../development/libraries/ntrack/default.nix | 4 +- .../development/libraries/nuspell/default.nix | 4 +- .../libraries/openal-soft/default.nix | 5 +- .../development/libraries/openbabel/2.nix | 4 +- .../libraries/openh264/default.nix | 10 +- .../development/libraries/p11-kit/default.nix | 55 +- .../development/libraries/pcre2/default.nix | 4 +- .../pipewire/0050-pipewire-pulse-path.patch | 10 +- .../0090-pipewire-config-template-paths.patch | 32 +- .../libraries/pipewire/default.nix | 19 +- .../libraries/pipewire/wireplumber.nix | 13 +- .../development/libraries/poppler/default.nix | 4 +- .../development/libraries/protobuf/3.16.nix | 4 +- .../development/libraries/protobuf/3.18.nix | 4 +- .../development/libraries/protobuf/3.19.nix | 4 +- .../libraries/protolock/default.nix | 2 +- .../libraries/protozero/default.nix | 8 +- .../development/libraries/qpdf/default.nix | 4 +- .../development/libraries/qt-5/5.15/srcs.nix | 4 +- .../libraries/qt-5/modules/qtwebengine.nix | 5 +- .../development/libraries/rocksdb/default.nix | 4 +- .../development/libraries/s2n-tls/default.nix | 4 +- .../science/astronomy/indilib/default.nix | 4 +- .../libraries/science/math/lcalc/default.nix | 92 +- .../science/math/lcalc/makefile.patch | 113 - .../science/math/primecount/default.nix | 8 + .../science/math/scalapack/default.nix | 32 +- .../libraries/sentry-native/default.nix | 4 +- .../development/libraries/simgear/default.nix | 4 +- .../development/libraries/smarty3/default.nix | 4 +- .../development/libraries/soci/default.nix | 9 + .../libraries/sofia-sip/default.nix | 4 +- .../development/libraries/sope/default.nix | 4 +- .../development/libraries/spice/default.nix | 6 + .../development/libraries/srt/default.nix | 4 +- .../development/libraries/tdb/default.nix | 4 +- .../development/libraries/tdlib/default.nix | 6 +- .../libraries/tracker-miners/default.nix | 1 - .../development/libraries/tracker/default.nix | 5 +- .../libraries/wayland/protocols.nix | 4 +- .../libraries/waylandpp/default.nix | 4 +- .../libraries/webkitgtk/default.nix | 4 +- .../libraries/webrtc-audio-processing/0.3.nix | 26 + .../webrtc-audio-processing/default.nix | 33 +- .../development/libraries/wlroots/0.14.nix | 4 +- .../development/libraries/wlroots/0.15.nix | 10 +- ...-fix-assertion-using-hide-in-destroy.patch | 43 + .../libraries/wxwidgets/2.8/default.nix | 119 +- .../libraries/wxwidgets/2.9/default.nix | 153 +- .../libraries/wxwidgets/3.0/default.nix | 167 +- .../libraries/wxwidgets/3.0/mac.nix | 98 +- .../development/libraries/x264/default.nix | 2 +- .../development/libraries/x265/default.nix | 167 +- .../development/libraries/xapian/default.nix | 2 +- .../development/libraries/xbase/default.nix | 6 +- .../libraries/zeitgeist/default.nix | 16 +- .../development/libraries/zlib/default.nix | 6 +- .../barebones-quicklisp-expression.sh | 6 +- .../from-quicklisp}/urls-from-page.sh | 2 +- .../float-features.nix | 30 + .../quicklisp-to-nix-output/lisp-binary.nix | 37 + .../quasiquote-2_dot_0.nix | 31 + .../lisp-modules/quicklisp-to-nix-systems.txt | 2 + .../lisp-modules/quicklisp-to-nix.nix | 38 + .../development/node-packages/default.nix | 4 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 8087 +++++++++-------- .../ocaml-modules/apron/default.nix | 2 +- .../ocaml-modules/astring/default.nix | 2 +- .../development/ocaml-modules/bap/default.nix | 6 +- .../ocaml-modules/batteries/default.nix | 7 +- .../ocaml-modules/benchmark/default.nix | 7 +- .../ocaml-modules/bigarray-compat/default.nix | 2 +- .../development/ocaml-modules/bos/default.nix | 3 +- .../ocaml-modules/cairo2/default.nix | 5 +- .../ocaml-modules/camlpdf/default.nix | 3 +- .../ocaml-modules/cpdf/default.nix | 9 +- .../development/ocaml-modules/dum/default.nix | 2 +- .../ocaml-modules/elina/default.nix | 2 +- .../ocaml-modules/erm_xmpp/default.nix | 2 +- .../ocaml-modules/expat/default.nix | 2 +- .../ocaml-modules/farfadet/default.nix | 2 +- .../ocaml-modules/frontc/default.nix | 4 +- .../ocaml-modules/functory/default.nix | 4 +- .../ocaml-modules/inotify/default.nix | 2 +- .../ocaml-modules/janestreet/default.nix | 4 +- .../ocaml-modules/jsonm/default.nix | 7 +- .../ocaml-modules/lablgtk-extras/default.nix | 2 +- .../ocaml-modules/labltk/default.nix | 2 +- .../ocaml-modules/lwt_react/default.nix | 4 +- .../ocaml-modules/mlgmpidl/default.nix | 2 +- .../ocaml-modules/mtime/default.nix | 3 +- .../ocaml-modules/nocrypto/default.nix | 2 +- .../ocaml-modules/notty/default.nix | 2 +- .../development/ocaml-modules/num/default.nix | 2 +- .../ocaml-modules/ocamlnet/default.nix | 2 +- .../ocaml-modules/ocp-ocamlres/default.nix | 2 +- .../ocaml-modules/ocsigen-server/default.nix | 6 +- .../ocaml-modules/phylogenetics/default.nix | 9 +- .../ocaml-modules/pprint/default.nix | 4 +- .../ocaml-modules/ppxfind/default.nix | 29 - .../ocaml-modules/printbox/default.nix | 12 +- .../ocaml-modules/printbox/text.nix | 14 + .../ocaml-modules/process/default.nix | 2 +- .../ocaml-modules/ptime/default.nix | 2 +- .../ocaml-modules/rope/default.nix | 3 +- .../ocaml-modules/rresult/default.nix | 2 +- .../ocaml-modules/sosa/default.nix | 2 +- .../ocaml-modules/stdcompat/default.nix | 2 + .../ocaml-modules/topkg/default.nix | 2 +- .../ocaml-modules/wasm/default.nix | 2 +- .../ocaml-modules/webbrowser/default.nix | 2 +- .../perl-modules/generic/default.nix | 74 +- .../php-packages/maxminddb/default.nix | 5 +- .../php-packages/pdo_sqlsrv/default.nix | 4 +- .../php-packages/sqlsrv/default.nix | 4 +- .../php-packages/xdebug/default.nix | 4 +- .../pure-modules/audio/default.nix | 5 +- .../pure-modules/avahi/default.nix | 5 +- .../development/pure-modules/csv/default.nix | 5 +- .../development/pure-modules/doc/default.nix | 5 +- .../pure-modules/fastcgi/default.nix | 5 +- .../pure-modules/faust/default.nix | 5 +- .../development/pure-modules/ffi/default.nix | 5 +- .../development/pure-modules/gen/default.nix | 5 +- .../development/pure-modules/gl/default.nix | 5 +- .../development/pure-modules/glpk/default.nix | 5 +- .../pure-modules/gplot/default.nix | 5 +- .../development/pure-modules/gsl/default.nix | 5 +- .../development/pure-modules/gtk/default.nix | 5 +- .../pure-modules/liblo/default.nix | 5 +- .../development/pure-modules/lilv/default.nix | 5 +- .../development/pure-modules/lv2/default.nix | 5 +- .../development/pure-modules/midi/default.nix | 5 +- .../development/pure-modules/mpfr/default.nix | 5 +- .../pure-modules/octave/default.nix | 5 +- .../development/pure-modules/odbc/default.nix | 5 +- .../pure-modules/pandoc/default.nix | 5 +- .../pure-modules/rational/default.nix | 5 +- .../pure-modules/readline/default.nix | 5 +- .../pure-modules/sockets/default.nix | 5 +- .../development/pure-modules/sql3/default.nix | 5 +- .../pure-modules/stldict/default.nix | 5 +- .../pure-modules/stllib/default.nix | 3 +- .../development/pure-modules/tk/default.nix | 5 +- .../development/pure-modules/xml/default.nix | 5 +- .../python-modules/Pygments/default.nix | 4 +- .../python-modules/absl-py/default.nix | 4 +- .../adafruit-platformdetect/default.nix | 4 +- .../python-modules/adax-local/default.nix | 43 + .../python-modules/adguardhome/default.nix | 17 +- .../python-modules/advantage-air/default.nix | 26 +- .../python-modules/afdko/default.nix | 9 +- .../python-modules/afsapi/default.nix | 4 +- .../python-modules/ailment/default.nix | 4 +- .../python-modules/aioaseko/default.nix | 39 + .../python-modules/aiobotocore/default.nix | 6 +- .../python-modules/aioconsole/default.nix | 4 +- .../python-modules/aiodiscover/default.nix | 12 +- .../python-modules/aioesphomeapi/default.nix | 4 +- .../python-modules/aiogithubapi/default.nix | 4 +- .../aiohttp-remotes/default.nix | 8 +- .../python-modules/aiohue/default.nix | 4 +- .../python-modules/aiohwenergy/default.nix | 4 +- .../python-modules/aioitertools/default.nix | 29 +- .../python-modules/aiolookin/default.nix | 4 +- .../python-modules/aiomusiccast/default.nix | 6 +- .../python-modules/aionanoleaf/default.nix | 4 +- .../python-modules/aiooncue/default.nix | 44 + .../python-modules/aioredis/default.nix | 4 +- .../python-modules/aiosenseme/default.nix | 39 + .../python-modules/aioshelly/default.nix | 4 +- .../python-modules/aiosignal/default.nix | 4 +- .../python-modules/aiosteamist/default.nix | 51 + .../python-modules/aiounifi/default.nix | 8 +- .../python-modules/aiowebostv/default.nix | 39 + .../aladdin-connect/default.nix | 4 +- .../python-modules/altair/default.nix | 16 +- .../python-modules/amcrest/default.nix | 4 +- .../python-modules/androidtv/default.nix | 29 +- .../python-modules/angr/default.nix | 4 +- .../python-modules/angrop/default.nix | 4 +- .../python-modules/anonip/default.nix | 35 +- .../python-modules/ansible/core.nix | 8 +- .../python-modules/anyjson/default.nix | 22 - .../python-modules/apache-airflow/default.nix | 4 +- .../python-modules/apache-beam/default.nix | 9 + .../python-modules/apipkg/default.nix | 4 +- .../python-modules/apprise/default.nix | 60 +- .../python-modules/approvaltests/default.nix | 23 +- .../appthreat-vulnerability-db/default.nix | 68 + .../python-modules/apsw/default.nix | 4 +- .../python-modules/archinfo/default.nix | 4 +- .../python-modules/aresponses/default.nix | 18 +- .../python-modules/argcomplete/default.nix | 4 +- .../argon2-cffi-bindings/default.nix | 35 + .../python-modules/argon2_cffi/default.nix | 11 +- .../python-modules/arviz/default.nix | 35 +- .../python-modules/asdf/default.nix | 4 +- .../python-modules/astroid/default.nix | 4 +- .../astropy-extension-helpers/default.nix | 5 + .../python-modules/astropy/default.nix | 58 +- .../python-modules/astroquery/default.nix | 4 +- .../async-upnp-client/default.nix | 12 +- .../async_generator/default.nix | 10 +- .../python-modules/async_timeout/default.nix | 4 +- .../python-modules/asyncio-dgram/default.nix | 4 +- .../python-modules/asyncio_mqtt/default.nix | 4 +- .../python-modules/asyncpg/default.nix | 23 +- .../python-modules/asyncssh/default.nix | 26 +- .../python-modules/asyncstdlib/default.nix | 4 +- .../python-modules/asysocks/default.nix | 18 +- .../atlassian-python-api/default.nix | 22 +- .../python-modules/atpublic/default.nix | 14 +- .../python-modules/aurorapy/default.nix | 43 + .../python-modules/awesomeversion/default.nix | 4 +- .../aws-sam-translator/default.nix | 17 +- .../python-modules/awscrt/default.nix | 4 +- .../python-modules/azure-batch/default.nix | 4 +- .../azure-mgmt-compute/default.nix | 4 +- .../azure-mgmt-iothub/default.nix | 4 +- .../default.nix | 4 +- .../python-modules/basemap/default.nix | 6 +- .../python-modules/bip_utils/default.nix | 4 +- .../python-modules/bitarray/default.nix | 4 +- .../python-modules/bleak/default.nix | 4 +- .../boost-histogram/default.nix | 6 +- .../python-modules/boschshcpy/default.nix | 4 +- .../python-modules/boto3/default.nix | 4 +- .../python-modules/botocore/default.nix | 4 +- .../python-modules/breathe/default.nix | 44 +- .../python-modules/brotli/default.nix | 4 +- .../python-modules/cachelib/default.nix | 4 +- .../python-modules/cachetools/default.nix | 6 +- .../python-modules/carrot/default.nix | 22 - .../python-modules/cartopy/default.nix | 19 +- .../casa-formats-io/default.nix | 5 +- .../python-modules/casbin/default.nix | 4 +- .../python-modules/cattrs/default.nix | 23 +- .../python-modules/cchardet/default.nix | 20 +- .../python-modules/cdcs/default.nix | 4 +- .../python-modules/censys/default.nix | 4 +- .../python-modules/cffsubr/default.nix | 40 + .../python-modules/cfn-flip/default.nix | 48 +- .../python-modules/cfn-lint/default.nix | 15 +- .../python-modules/chalice/default.nix | 4 +- .../python-modules/cheroot/default.nix | 30 +- .../python-modules/chiapos/default.nix | 4 +- .../python-modules/chiavdf/default.nix | 4 +- .../python-modules/chirpstack-api/default.nix | 25 +- .../circuit-webhook/default.nix | 32 + .../python-modules/claripy/default.nix | 4 +- .../python-modules/cle/default.nix | 4 +- .../click-completion/default.nix | 28 +- .../click-configfile/default.nix | 15 +- .../python-modules/clickhouse-cli/default.nix | 4 +- .../python-modules/cliff/default.nix | 14 + .../python-modules/clint/default.nix | 10 +- .../python-modules/cloudpickle/default.nix | 4 +- .../python-modules/cloudsplaining/default.nix | 4 +- .../python-modules/cocotb/default.nix | 4 +- .../python-modules/commentjson/default.nix | 6 +- .../python-modules/compreffor/default.nix | 45 + .../python-modules/configargparse/default.nix | 6 +- .../python-modules/configshell/default.nix | 29 +- .../python-modules/confuse/default.nix | 23 +- .../python-modules/connexion/default.nix | 4 +- .../python-modules/coverage/default.nix | 7 +- .../python-modules/croniter/default.nix | 15 +- .../python-modules/csvw/default.nix | 23 +- .../python-modules/cwcwidth/default.nix | 4 +- .../python-modules/dash/default.nix | 8 +- .../python-modules/dask/default.nix | 17 +- .../python-modules/databases/default.nix | 5 +- .../python-modules/databricks-cli/default.nix | 4 +- .../databricks-connect/default.nix | 4 +- .../python-modules/datasets/default.nix | 4 +- .../python-modules/datasette/default.nix | 9 +- .../python-modules/dbutils/default.nix | 16 +- .../python-modules/deap/default.nix | 10 +- .../python-modules/decopatch/default.nix | 25 +- .../python-modules/decorator/default.nix | 4 +- .../deep-translator/default.nix | 4 +- .../python-modules/deezer-python/default.nix | 4 +- .../python-modules/demjson/default.nix | 34 - .../devolo-home-control-api/default.nix | 14 +- .../python-modules/diagrams/default.nix | 4 +- .../python-modules/diff-cover/default.nix | 22 +- .../python-modules/discogs-client/default.nix | 11 +- .../python-modules/discovery30303/default.nix | 49 + .../python-modules/distlib/default.nix | 4 +- .../python-modules/distributed/default.nix | 4 +- .../python-modules/dj-email-url/default.nix | 4 +- .../django-auth-ldap/default.nix | 14 +- .../django-timezone-field/default.nix | 4 +- .../django-widget-tweaks/default.nix | 4 +- .../development/python-modules/django/2.nix | 4 +- .../development/python-modules/django/3.nix | 4 +- .../development/python-modules/django/4.nix | 107 + .../django/django_4_set_geos_gdal_lib.patch | 26 + .../django_classytags/default.nix | 4 +- .../django_reversion/default.nix | 4 +- .../python-modules/djangoql/default.nix | 4 +- .../python-modules/dm-haiku/default.nix | 2 + .../python-modules/dm-sonnet/default.nix | 1 + .../python-modules/dnspython/default.nix | 24 +- .../python-modules/doc8/default.nix | 5 + .../python-modules/dpath/default.nix | 4 +- .../python-modules/dragonfly/default.nix | 6 +- .../python-modules/drms/default.nix | 5 + .../python-modules/dropbox/default.nix | 4 +- .../python-modules/dsmr-parser/default.nix | 4 +- .../python-modules/dufte/default.nix | 4 +- .../python-modules/eebrightbox/default.nix | 58 - .../python-modules/elasticsearch/default.nix | 4 +- .../python-modules/elegy/default.nix | 3 + .../python-modules/emoji/default.nix | 4 +- .../python-modules/empty-files/default.nix | 33 + .../python-modules/enlighten/default.nix | 4 +- .../python-modules/environs/default.nix | 4 +- .../python-modules/eth-typing/default.nix | 4 +- .../python-modules/eth-utils/default.nix | 4 +- .../python-modules/exchangelib/default.nix | 4 +- .../python-modules/faker/default.nix | 4 +- .../python-modules/fakeredis/default.nix | 44 +- .../faraday-plugins/default.nix | 4 +- .../python-modules/fastnumbers/default.nix | 5 + .../python-modules/feedgenerator/default.nix | 8 +- .../python-modules/filelock/default.nix | 4 +- .../python-modules/filetype/default.nix | 4 +- .../python-modules/fiona/default.nix | 4 +- .../python-modules/flake8-bugbear/default.nix | 44 + .../python-modules/flask-admin/default.nix | 5 +- .../flask-appbuilder/default.nix | 21 +- .../python-modules/flask-paginate/default.nix | 4 +- .../python-modules/flask/default.nix | 5 + .../python-modules/flax/default.nix | 7 +- .../python-modules/flexmock/default.nix | 32 +- .../flowlogs_reader/default.nix | 50 +- .../development/python-modules/flufl/i18n.nix | 11 +- .../development/python-modules/flufl/lock.nix | 7 +- .../python-modules/flux-led/default.nix | 4 +- .../python-modules/folium/default.nix | 61 +- .../python-modules/fonttools/default.nix | 4 +- .../python-modules/forecast-solar/default.nix | 2 + .../python-modules/fpylll/default.nix | 19 +- .../fritzconnection/default.nix | 4 +- .../python-modules/frozendict/default.nix | 29 +- .../python-modules/funcsigs/default.nix | 9 +- .../python-modules/furo/default.nix | 4 +- .../python-modules/gaphas/default.nix | 4 +- .../garages-amsterdam/default.nix | 19 +- .../garminconnect-aio/default.nix | 10 +- .../default.nix | 22 +- .../python-modules/gast/default.nix | 26 +- .../python-modules/gdown/default.nix | 4 +- .../python-modules/gehomesdk/default.nix | 4 +- .../python-modules/geometric/default.nix | 33 + .../gevent-socketio/default.nix | 35 +- .../gevent-websocket/default.nix | 20 +- .../python-modules/gevent/default.nix | 39 +- .../geventhttpclient/default.nix | 23 +- .../python-modules/gigalixir/default.nix | 4 +- .../python-modules/gipc/default.nix | 4 +- .../python-modules/glances-api/default.nix | 9 +- .../python-modules/glean-parser/default.nix | 4 +- .../python-modules/glean-sdk/default.nix | 12 +- .../fix-spawned-process-environment.patch | 20 - .../python-modules/globus-sdk/default.nix | 4 +- .../google-api-python-client/default.nix | 4 +- .../python-modules/google-auth/default.nix | 5 + .../google-cloud-bigtable/default.nix | 4 +- .../google-cloud-kms/default.nix | 4 +- .../google-cloud-logging/default.nix | 4 +- .../google-cloud-spanner/default.nix | 4 +- .../google-cloud-storage/default.nix | 1 + .../google-cloud-texttospeech/default.nix | 4 +- .../google-nest-sdm/default.nix | 18 +- .../python-modules/google-re2/default.nix | 4 +- .../google-resumable-media/default.nix | 4 +- .../python-modules/googlemaps/default.nix | 4 +- .../python-modules/grapheme/default.nix | 33 + .../python-modules/graphene/default.nix | 20 +- .../python-modules/graphql-core/default.nix | 4 +- .../python-modules/greeclimate/default.nix | 6 + .../python-modules/growattserver/default.nix | 4 +- .../python-modules/gruut/default.nix | 9 +- .../python-modules/gssapi/default.nix | 2 +- .../python-modules/gst-python/default.nix | 4 +- .../python-modules/gym/default.nix | 6 +- .../development/python-modules/h2/default.nix | 16 +- .../python-modules/h5py/default.nix | 3 +- .../python-modules/ha-av/default.nix | 4 +- .../python-modules/habanero/default.nix | 16 +- .../python-modules/hahomematic/default.nix | 4 +- .../python-modules/hass-nabucasa/default.nix | 4 +- .../python-modules/hdlparse/default.nix | 22 - .../python-modules/heatzypy/default.nix | 4 +- .../python-modules/homematicip/default.nix | 14 +- .../python-modules/html-sanitizer/default.nix | 4 +- .../httpagentparser/default.nix | 4 +- .../python-modules/httpbin/default.nix | 48 +- .../python-modules/httpcore/default.nix | 4 +- .../python-modules/httpx-ntlm/default.nix | 16 +- .../python-modules/httpx-socks/default.nix | 4 +- .../python-modules/httpx/default.nix | 25 +- .../python-modules/huey/default.nix | 4 +- .../python-modules/hwi/default.nix | 3 +- .../python-modules/hypercorn/default.nix | 10 +- .../python-modules/hyperion-py/default.nix | 5 + .../python-modules/hypothesis/default.nix | 28 +- .../python-modules/hypothesmith/default.nix | 4 +- .../python-modules/i-pi/default.nix | 2 +- .../python-modules/icmplib/default.nix | 4 +- .../python-modules/identify/default.nix | 4 +- .../python-modules/ilua/default.nix | 40 + .../python-modules/imageio-ffmpeg/default.nix | 6 +- .../python-modules/imageio/default.nix | 5 +- .../python-modules/img2pdf/default.nix | 10 + .../python-modules/importlab/default.nix | 33 + .../importlib-metadata/default.nix | 4 +- .../python-modules/inflect/default.nix | 4 +- .../python-modules/influxdb/default.nix | 20 +- .../python-modules/inquirer/default.nix | 50 +- .../python-modules/intellifire4py/default.nix | 50 + .../python-modules/ipykernel/default.nix | 4 +- .../python-modules/ipyparallel/default.nix | 4 +- .../python-modules/ipython/default.nix | 76 +- .../python-modules/ipyvuetify/default.nix | 4 +- .../python-modules/irctokens/default.nix | 4 +- .../python-modules/isort/default.nix | 4 +- .../python-modules/janus/default.nix | 4 +- .../jaraco_collections/default.nix | 4 +- .../jaraco_functools/default.nix | 4 +- .../python-modules/jax/default.nix | 4 +- .../development/python-modules/jaxlib/bin.nix | 25 +- .../development/python-modules/jc/default.nix | 4 +- .../python-modules/jdatetime/default.nix | 4 +- .../python-modules/jellyfish/default.nix | 4 +- .../jenkins-job-builder/default.nix | 4 +- .../python-modules/jira/default.nix | 4 +- .../python-modules/jmp/default.nix | 4 +- .../johnnycanencrypt/default.nix | 6 +- .../python-modules/josepy/default.nix | 33 +- .../python-modules/jpylyzer/default.nix | 4 +- .../development/python-modules/jq/default.nix | 4 +- .../python-modules/jsonlines/default.nix | 4 +- .../python-modules/jsonschema/default.nix | 53 +- .../jupyter-repo2docker/default.nix | 4 +- .../python-modules/jupyterhub/default.nix | 2 + .../python-modules/jupyterlab-git/default.nix | 4 +- .../jupyterlab-widgets/default.nix | 4 +- .../python-modules/jupyterlab/default.nix | 4 +- .../python-modules/jupytext/default.nix | 4 +- .../kaldi-active-grammar/default.nix | 4 +- .../python-modules/labelbox/default.nix | 4 +- .../{lark-parser => lark}/default.nix | 13 +- .../lazy-object-proxy/default.nix | 4 +- .../python-modules/lektor/default.nix | 4 +- .../python-modules/librosa/default.nix | 4 +- .../python-modules/libtmux/default.nix | 33 +- .../python-modules/libusb1/default.nix | 4 +- .../python-modules/lightwave2/default.nix | 4 +- .../python-modules/limits/default.nix | 4 +- .../python-modules/limnoria/default.nix | 4 +- .../python-modules/llvmlite/default.nix | 4 +- .../locationsharinglib/default.nix | 3 +- .../python-modules/loguru/default.nix | 17 +- .../python-modules/loo-py/default.nix | 4 +- .../python-modules/lupupy/default.nix | 4 +- .../python-modules/mailchecker/default.nix | 4 +- .../python-modules/manimpango/default.nix | 4 +- .../marshmallow-sqlalchemy/default.nix | 4 +- .../python-modules/mat2/default.nix | 9 +- .../python-modules/mat2/fix_poppler.patch | 14 + .../python-modules/matrix-nio/default.nix | 3 +- .../python-modules/mautrix/default.nix | 4 +- .../python-modules/md-toc/default.nix | 4 +- .../python-modules/md2gemini/default.nix | 4 +- .../python-modules/meross-iot/default.nix | 4 +- .../python-modules/meshio/default.nix | 4 +- .../python-modules/meshtastic/default.nix | 4 +- .../python-modules/mezzanine/default.nix | 4 +- .../python-modules/mill-local/default.nix | 4 +- .../python-modules/minikerberos/default.nix | 4 +- .../python-modules/mistletoe/default.nix | 4 +- .../python-modules/mistune/common.nix | 4 +- .../python-modules/mistune/default.nix | 5 +- .../python-modules/mlxtend/default.nix | 4 +- .../python-modules/mocket/default.nix | 6 +- .../python-modules/mongomock/default.nix | 4 +- .../python-modules/monty/default.nix | 4 +- .../python-modules/moonraker-api/default.nix | 6 + .../python-modules/motionblinds/default.nix | 4 +- .../python-modules/moto/default.nix | 48 +- .../python-modules/mpd2/default.nix | 4 +- .../python-modules/mpi4py/default.nix | 10 +- .../python-modules/multiset/default.nix | 4 +- .../mypy-boto3-builder/default.nix | 4 +- .../python-modules/mypy-boto3-s3/default.nix | 4 +- .../python-modules/mypy-protobuf/default.nix | 4 +- .../python-modules/nagiosplugin/default.nix | 40 +- .../python-modules/nameparser/default.nix | 4 +- .../default.nix | 30 +- .../python-modules/nbclassic/default.nix | 14 +- .../python-modules/nbclient/default.nix | 6 +- .../python-modules/nbconvert/default.nix | 4 +- .../python-modules/nbsmoke/default.nix | 4 +- .../python-modules/nengo/default.nix | 4 +- .../python-modules/nibabel/default.nix | 4 +- .../python-modules/nltk/default.nix | 22 +- .../python-modules/nose/default.nix | 13 + .../python-modules/notebook/default.nix | 4 +- .../python-modules/numba/default.nix | 4 +- .../python-modules/numexpr/default.nix | 31 +- .../python-modules/numpy/default.nix | 9 +- .../python-modules/nunavut/default.nix | 4 +- .../python-modules/objax/default.nix | 4 +- .../python-modules/oci/default.nix | 4 +- .../development/python-modules/od/default.nix | 4 +- .../python-modules/oletools/default.nix | 5 + .../python-modules/openai/default.nix | 4 +- .../openapi-schema-validator/default.nix | 18 +- .../python-modules/openrazer/daemon.nix | 6 +- .../python-modules/opensimplex/default.nix | 15 +- .../openstackdocstheme/default.nix | 37 + .../python-modules/optax/default.nix | 3 +- .../python-modules/oscrypto/default.nix | 3 + .../python-modules/oslo-log/default.nix | 11 +- .../python-modules/osqp/default.nix | 9 +- .../python-modules/ovoenergy/default.nix | 4 +- .../python-modules/p1monitor/default.nix | 16 +- .../packageurl-python/default.nix | 4 +- .../python-modules/pandas/default.nix | 4 +- .../python-modules/papermill/default.nix | 4 +- .../python-modules/papis/default.nix | 121 +- .../python-modules/paramiko/default.nix | 4 +- .../python-modules/patrowl4py/default.nix | 4 +- .../python-modules/pdm-pep517/default.nix | 4 +- .../python-modules/pelican/default.nix | 4 +- .../python-modules/pep257/default.nix | 4 +- .../python-modules/pep517/default.nix | 15 +- .../python-modules/perfplot/default.nix | 14 +- .../python-modules/pex/default.nix | 4 +- .../python-modules/pg8000/default.nix | 4 +- .../python-modules/phonemizer/default.nix | 4 +- .../python-modules/phonenumbers/default.nix | 4 +- .../python-modules/pijuice/default.nix | 14 +- .../python-modules/pikepdf/default.nix | 4 +- .../python-modules/pillow/default.nix | 4 +- .../python-modules/pip-tools/default.nix | 4 +- .../python-modules/pipx/default.nix | 6 +- .../python-modules/pivy/default.nix | 4 +- .../python-modules/plexapi/default.nix | 4 +- .../python-modules/plotly/default.nix | 4 +- .../python-modules/plugwise/default.nix | 4 +- .../python-modules/plumbum/default.nix | 60 +- .../python-modules/policy-sentry/default.nix | 4 +- .../python-modules/pontos/default.nix | 15 +- .../python-modules/pony/default.nix | 4 +- .../python-modules/portend/default.nix | 4 +- .../python-modules/portpicker/default.nix | 4 +- .../python-modules/pot/default.nix | 4 +- .../python-modules/prance/default.nix | 9 +- .../python-modules/prettytable/default.nix | 4 +- .../python-modules/primecountpy/default.nix | 33 + .../python-modules/progressbar2/default.nix | 4 +- .../python-modules/prompt-toolkit/default.nix | 4 +- .../python-modules/psutil/default.nix | 4 +- .../python-modules/psycopg2/default.nix | 4 +- .../python-modules/pubnub/default.nix | 4 +- .../python-modules/pulsectl/default.nix | 4 +- .../python-modules/pvo/default.nix | 4 +- .../py-synologydsm-api/default.nix | 4 +- .../pyTelegramBotAPI/default.nix | 4 +- .../python-modules/pyamg/default.nix | 4 +- .../python-modules/pyatag/default.nix | 4 +- .../python-modules/pyatmo/default.nix | 4 +- .../python-modules/pyatv/default.nix | 22 +- .../python-modules/pyaussiebb/default.nix | 53 + .../python-modules/pybind11/default.nix | 24 +- .../python-modules/pycallgraph/default.nix | 28 - .../python-modules/pycfmodel/default.nix | 48 + .../python-modules/pychromecast/default.nix | 4 +- .../python-modules/pycountry/default.nix | 4 +- .../pycryptodome-test-vectors/default.nix | 4 +- .../python-modules/pydaikin/default.nix | 6 +- .../python-modules/pydash/default.nix | 37 +- .../python-modules/pydot/default.nix | 44 +- .../python-modules/pydy/default.nix | 4 +- .../python-modules/pyerfa/default.nix | 4 +- .../python-modules/pyexcel-io/default.nix | 4 +- .../python-modules/pyezviz/default.nix | 4 +- .../python-modules/pyface/default.nix | 4 +- .../python-modules/pyfakefs/default.nix | 4 +- .../python-modules/pyfcm/default.nix | 4 +- .../python-modules/pyflunearyou/default.nix | 5 + .../python-modules/pyfritzhome/default.nix | 14 +- .../python-modules/pygame-gui/default.nix | 12 +- .../python-modules/pygame/default.nix | 4 +- .../python-modules/pygit2/default.nix | 4 +- .../python-modules/pygraphviz/default.nix | 4 +- .../python-modules/pyhamcrest/default.nix | 4 +- .../python-modules/pyhocon/default.nix | 4 +- .../python-modules/pyhumps/default.nix | 47 + .../python-modules/pyinsteon/default.nix | 4 +- .../python-modules/pyisy/default.nix | 4 +- .../python-modules/pykeyatome/default.nix | 4 +- .../python-modules/pylast/default.nix | 4 +- .../python-modules/pylint-django/default.nix | 4 +- .../python-modules/pylitterbot/default.nix | 4 +- .../python-modules/pylsp-mypy/default.nix | 4 +- .../pylutron-caseta/default.nix | 4 +- .../python-modules/pymatgen/default.nix | 21 +- .../python-modules/pymavlink/default.nix | 4 +- .../python-modules/pymazda/default.nix | 4 +- .../python-modules/pymc3/default.nix | 3 + .../python-modules/pymupdf/default.nix | 4 +- .../python-modules/pymysensors/default.nix | 4 +- .../python-modules/pynacl/default.nix | 15 +- .../python-modules/pynamodb/default.nix | 4 +- .../python-modules/pynetbox/default.nix | 4 +- .../python-modules/pynina/default.nix | 13 +- .../python-modules/pynuki/default.nix | 21 +- .../python-modules/pyopencl/default.nix | 36 +- .../python-modules/pyopenssl/default.nix | 6 +- .../python-modules/pyparsing/default.nix | 63 +- .../python-modules/pypck/default.nix | 12 +- .../python-modules/pyphen/default.nix | 10 +- .../python-modules/pypinyin/default.nix | 4 +- .../python-modules/pypytools/default.nix | 53 + .../python-modules/pyquil/default.nix | 9 +- .../python-modules/pyqvrpro/default.nix | 47 + .../python-modules/pyrfxtrx/default.nix | 9 +- .../python-modules/pyrogram/default.nix | 4 +- .../python-modules/pysdl2/default.nix | 4 +- .../python-modules/pyshp/default.nix | 4 +- .../python-modules/pysiaalarm/default.nix | 7 +- .../python-modules/pyskyqremote/default.nix | 4 +- .../python-modules/pysml/default.nix | 10 +- .../pytest-arraydiff/default.nix | 31 +- .../python-modules/pytest-asyncio/default.nix | 15 +- .../python-modules/pytest-bdd/default.nix | 44 +- .../python-modules/pytest-cases/default.nix | 4 +- .../python-modules/pytest-celery/default.nix | 27 +- .../pytest-celery/no-celery.patch | 9 - .../python-modules/pytest-cov/default.nix | 7 +- .../python-modules/pytest-django/default.nix | 4 +- .../python-modules/pytest-httpbin/default.nix | 49 +- .../pytest-httpserver/default.nix | 4 +- .../pytest-localserver/default.nix | 4 +- .../python-modules/pytest-mock/default.nix | 6 + .../pytest-mypy-plugins/default.nix | 44 +- .../python-modules/pytest-raisin/default.nix | 4 +- .../pytest-randomly/default.nix | 8 +- .../pytest-regressions/default.nix | 46 +- .../pytest-remotedata/default.nix | 38 +- .../pytest-subprocess/default.nix | 4 +- .../pytest-subtests/default.nix | 22 +- .../python-modules/pytest-timeout/default.nix | 4 +- .../python-dbusmock/default.nix | 8 +- .../python-modules/python-gitlab/default.nix | 4 +- .../python-modules/python-i18n/default.nix | 24 + .../python-modules/python-ipmi/default.nix | 4 +- .../python-modules/python-louvain/default.nix | 4 +- .../python-lsp-black/default.nix | 4 +- .../python-lsp-server/default.nix | 10 +- .../python-manilaclient/default.nix | 4 +- .../python-modules/python-nest/default.nix | 36 +- .../python-openstackclient/default.nix | 14 + .../python-modules/python-snap7/default.nix | 4 +- .../python-modules/python-socks/default.nix | 4 +- .../python-telegram-bot/default.nix | 4 +- .../python-modules/python-utils/default.nix | 7 +- .../python-modules/pythonocc-core/default.nix | 27 +- .../python-modules/pytibber/default.nix | 8 +- .../python-modules/pytile/default.nix | 4 +- .../pytorch-lightning/default.nix | 4 +- .../pytorch-metric-learning/default.nix | 4 +- .../python-modules/pytorch/default.nix | 6 +- .../python-modules/pytradfri/default.nix | 11 +- .../python-modules/pytrends/default.nix | 4 +- .../python-modules/pyvex/default.nix | 4 +- .../python-modules/pyvlx/default.nix | 20 +- .../python-modules/pywayland/default.nix | 4 +- .../pyweatherflowrest/default.nix | 4 +- .../python-modules/pywemo/default.nix | 4 +- .../python-modules/pywizlight/default.nix | 4 +- .../python-modules/pywlroots/default.nix | 4 +- .../python-modules/qdarkstyle/default.nix | 4 +- .../python-modules/qiling/default.nix | 4 +- .../python-modules/qiskit-aer/default.nix | 4 +- .../python-modules/qiskit-finance/default.nix | 4 +- .../qiskit-ibmq-provider/default.nix | 4 +- .../python-modules/qiskit-ignis/default.nix | 4 +- .../qiskit-machine-learning/default.nix | 4 +- .../python-modules/qiskit-nature/default.nix | 4 +- .../qiskit-optimization/default.nix | 4 +- .../python-modules/qiskit-terra/default.nix | 4 +- .../python-modules/qiskit/default.nix | 4 +- .../python-modules/qt5reactor/default.nix | 37 + .../python-modules/qtpy/default.nix | 46 +- .../python-modules/quantities/default.nix | 4 +- .../python-modules/qutip/default.nix | 4 +- .../python-modules/radish-bdd/default.nix | 4 +- .../railroad-diagrams/default.nix | 26 + .../python-modules/rdflib/default.nix | 18 +- .../python-modules/readchar/default.nix | 34 +- .../readme_renderer/default.nix | 5 + .../python-modules/renault-api/default.nix | 4 +- .../python-modules/reolink/default.nix | 4 +- .../python-modules/reportlab/default.nix | 4 +- .../python-modules/repoze_who/default.nix | 4 +- .../python-modules/requests-cache/default.nix | 5 +- .../python-modules/requests-file/default.nix | 34 +- .../requests-http-signature/default.nix | 14 +- .../requests-kerberos/default.nix | 31 +- .../requests-unixsocket/default.nix | 27 +- .../python-modules/requests/default.nix | 23 +- .../requirements-parser/default.nix | 37 +- .../python-modules/resolvelib/default.nix | 4 + .../python-modules/responses/default.nix | 19 +- .../python-modules/respx/default.nix | 4 +- .../python-modules/retworkx/default.nix | 6 +- .../python-modules/rfc3986/default.nix | 27 +- .../python-modules/rflink/default.nix | 13 +- .../python-modules/rlp/default.nix | 4 +- .../default.nix | 4 +- .../robotstatuschecker/default.nix | 4 +- .../python-modules/rokuecp/default.nix | 23 +- .../python-modules/roonapi/default.nix | 4 +- .../python-modules/rtsp-to-webrtc/default.nix | 43 + .../ruamel-yaml-clib/default.nix | 5 +- .../python-modules/ruamel-yaml/default.nix | 4 +- .../python-modules/rxv/default.nix | 7 + .../python-modules/s3fs/default.nix | 4 +- .../python-modules/sagemaker/default.nix | 4 +- .../python-modules/sanic-testing/default.nix | 4 +- .../python-modules/sanic/default.nix | 27 +- .../sapi-python-client/default.nix | 4 +- .../python-modules/scikit-fmm/default.nix | 4 +- .../scikit-survival/default.nix | 2 + .../python-modules/scikit-tda/default.nix | 6 +- .../python-modules/seatconnect/default.nix | 6 +- .../python-modules/secp256k1/default.nix | 3 +- .../python-modules/sendgrid/default.nix | 4 +- .../python-modules/sentry-sdk/default.nix | 6 +- .../python-modules/setupmeta/default.nix | 13 +- .../setuptools-rust/default.nix | 7 +- .../python-modules/setuptools-scm/default.nix | 4 +- .../python-modules/shtab/default.nix | 7 +- .../simplisafe-python/default.nix | 6 +- .../python-modules/skein/skeinjar.nix | 4 +- .../python-modules/skein/skeinrepo.nix | 4 +- .../python-modules/skodaconnect/default.nix | 6 +- .../python-modules/slack-sdk/default.nix | 4 +- .../python-modules/smmap/default.nix | 4 +- .../snowflake-connector-python/default.nix | 4 +- .../python-modules/soco/default.nix | 6 +- .../python-modules/softlayer/default.nix | 4 +- .../spacy-transformers/default.nix | 2 +- .../python-modules/spacy/default.nix | 5 + .../python-modules/spectral-cube/default.nix | 7 + .../sphinx-copybutton/default.nix | 4 +- .../python-modules/sphinx-jinja/default.nix | 4 +- .../python-modules/sphinx/default.nix | 15 +- .../sphinxcontrib-apidoc/default.nix | 34 + .../sphinxcontrib-applehelp/default.nix | 5 +- .../sphinxcontrib-devhelp/default.nix | 5 +- .../sphinxcontrib-htmlhelp/default.nix | 5 +- .../sphinxcontrib-jsmath/default.nix | 5 +- .../sphinxcontrib-qthelp/default.nix | 5 +- .../sphinxcontrib-serializinghtml/default.nix | 5 +- .../python-modules/spyder-kernels/default.nix | 4 +- .../python-modules/spyder/default.nix | 4 +- .../sqlalchemy-utils/default.nix | 4 +- .../python-modules/sqlalchemy/default.nix | 4 +- .../python-modules/sqlite-utils/default.nix | 4 +- .../python-modules/sqlitedict/default.nix | 20 +- .../python-modules/srpenergy/default.nix | 4 +- .../python-modules/sshtunnel/default.nix | 12 +- .../python-modules/sslyze/default.nix | 4 +- .../python-modules/starlette/default.nix | 2 - .../python-modules/staticjinja/default.nix | 2 +- .../python-modules/statmake/default.nix | 58 + .../python-modules/statsmodels/default.nix | 4 +- .../python-modules/structlog/default.nix | 4 +- .../python-modules/stups-pierone/default.nix | 4 +- .../python-modules/subarulink/default.nix | 4 +- .../python-modules/svglib/default.nix | 4 +- .../python-modules/sybil/default.nix | 10 +- .../python-modules/systembridge/default.nix | 4 +- .../python-modules/tablib/default.nix | 4 +- .../python-modules/tailscale/default.nix | 4 +- .../python-modules/tappy/default.nix | 4 +- .../teamcity-messages/default.nix | 40 + .../python-modules/tempora/default.nix | 4 +- .../tensorflow-probability/default.nix | 55 +- .../tensorflow-tensorboard/default.nix | 3 +- .../python-modules/terminaltables/default.nix | 4 +- .../python-modules/test-tube/default.nix | 4 +- .../python-modules/testfixtures/default.nix | 3 + .../python-modules/textacy/default.nix | 1 + .../python-modules/textfsm/default.nix | 4 +- .../python-modules/thinc/default.nix | 18 +- .../python-modules/tiledb/default.nix | 4 +- .../python-modules/timetagger/default.nix | 43 +- .../python-modules/titlecase/default.nix | 7 + .../python-modules/tmb/default.nix | 21 +- .../python-modules/toggl-cli/default.nix | 4 +- .../python-modules/tomli/default.nix | 7 + .../python-modules/tomlkit/default.nix | 4 +- .../python-modules/torchvision/default.nix | 4 +- .../development/python-modules/tornado/4.nix | 2 +- .../python-modules/tox/default.nix | 4 +- .../python-modules/tqdm/default.nix | 5 + .../python-modules/transformers/default.nix | 4 +- .../transmission-rpc/default.nix | 22 +- .../python-modules/treeo/default.nix | 13 +- .../python-modules/treex/default.nix | 7 +- .../python-modules/treq/default.nix | 4 +- .../python-modules/trimesh/default.nix | 4 +- .../python-modules/ttls/default.nix | 46 + .../python-modules/ttp/default.nix | 10 +- .../python-modules/tumpa/default.nix | 4 +- .../python-modules/twentemilieu/default.nix | 3 +- .../python-modules/twilio/default.nix | 4 +- .../python-modules/twine/default.nix | 4 +- .../python-modules/txzmq/default.nix | 36 + .../python-modules/typeguard/default.nix | 4 +- .../types-decorator/default.nix | 4 +- .../python-modules/types-futures/default.nix | 4 +- .../python-modules/types-protobuf/default.nix | 4 +- .../python-modules/types-requests/default.nix | 4 +- .../types-setuptools/default.nix | 4 +- .../types-typed-ast/default.nix | 4 +- .../python-modules/types-urllib3/default.nix | 4 +- .../python-modules/ufo2ft/default.nix | 62 + .../ufo2ft/fonttools-cu2qu.patch | 126 + .../python-modules/ufoLib2/default.nix | 40 + .../python-modules/ujson/default.nix | 4 +- .../python-modules/uncertainties/default.nix | 4 +- .../python-modules/unittest2/default.nix | 10 +- .../python-modules/upb-lib/default.nix | 4 +- .../python-modules/uproot/default.nix | 4 +- .../python-modules/urllib3/default.nix | 9 +- .../python-modules/userpath/default.nix | 2 +- .../python-modules/uvicorn/default.nix | 4 +- .../python-modules/velbus-aio/default.nix | 4 +- .../python-modules/versiontag/default.nix | 5 + .../python-modules/virtualenv/default.nix | 4 +- .../python-modules/vispy/default.nix | 4 +- .../python-modules/vivisect/default.nix | 4 +- .../python-modules/vowpalwabbit/default.nix | 4 +- .../waitress-django/default.nix | 11 +- .../python-modules/waitress-django/setup.py | 2 +- .../python-modules/wandb/default.nix | 18 +- .../python-modules/warcio/default.nix | 56 + .../python-modules/warlock/default.nix | 42 +- .../python-modules/warrant-lite/default.nix | 49 + .../python-modules/wasmer/default.nix | 15 +- .../wazeroutecalculator/default.nix | 4 +- .../python-modules/weasyprint/default.nix | 4 +- .../python-modules/webargs/default.nix | 4 +- .../websocket-client/default.nix | 4 +- .../python-modules/websockets/default.nix | 18 +- .../python-modules/webtest/default.nix | 10 +- .../python-modules/weconnect-mqtt/default.nix | 6 +- .../python-modules/weconnect/default.nix | 6 +- .../development/python-modules/werkzeug/1.nix | 62 + .../python-modules/wheel/default.nix | 6 +- .../python-modules/whodap/default.nix | 4 +- .../python-modules/whois/default.nix | 19 +- .../python-modules/wled/default.nix | 4 +- .../python-modules/wtf-peewee/default.nix | 9 + .../python-modules/xdis/default.nix | 4 +- .../python-modules/xknx/default.nix | 4 +- .../python-modules/xlib/default.nix | 23 +- .../python-modules/xml2rfc/default.nix | 4 +- .../yalesmartalarmclient/default.nix | 4 +- .../python-modules/yalexs/default.nix | 4 +- .../python-modules/yangson/default.nix | 4 +- .../python-modules/yfinance/default.nix | 4 +- .../youtube-search-python/default.nix | 4 +- .../python-modules/yowsup/default.nix | 4 +- .../python-modules/zeroc-ice/default.nix | 4 +- .../python-modules/zeroconf/default.nix | 4 +- .../python-modules/zetup/default.nix | 4 + .../python-modules/zigpy-zigate/default.nix | 4 +- .../python-modules/zimports/default.nix | 6 +- .../python-modules/zipp/default.nix | 22 +- .../zope-deferredimport/default.nix | 4 +- .../zwave-js-server-python/default.nix | 4 +- .../python2-modules/coverage/default.nix | 25 + .../python2-modules/pygtk/default.nix | 6 +- .../python2-modules/pyparsing/default.nix | 45 + .../pkgs/development/r-modules/default.nix | 10 +- .../ruby-modules/bundler/default.nix | 4 +- .../ruby-modules/gem/nix-bundle-install.rb | 4 +- .../pkgs/development/tools/air/default.nix | 6 +- .../development/tools/ammonite/default.nix | 6 +- .../tools/analysis/bingrep/default.nix | 6 +- .../tools/analysis/binlore/default.nix | 4 +- .../tools/analysis/cccc/default.nix | 9 +- .../tools/analysis/checkov/default.nix | 6 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/eresi/default.nix | 4 +- .../tools/analysis/ikos/default.nix | 4 +- .../tools/analysis/qcachegrind/default.nix | 8 +- .../tools/analysis/radare2/default.nix | 8 +- .../tools/analysis/spin/default.nix | 50 +- .../tools/analysis/tflint/default.nix | 2 +- .../tools/analysis/tfsec/default.nix | 4 +- .../tools/analysis/yallback/default.nix | 4 +- .../tools/appthreat-depscan/default.nix | 52 + .../development/tools/ashpd-demo/default.nix | 16 +- .../development/tools/aws-sam-cli/default.nix | 5 +- .../tools/bazel-watcher/default.nix | 2 +- .../pkgs/development/tools/buf/default.nix | 20 +- .../bazel/bazel-remote/default.nix | 2 +- .../bazel/bazel_0_26/default.nix | 4 +- .../build-managers/bazel/bazel_3/default.nix | 4 + .../build-managers/bazel/bazel_4/default.nix | 4 + .../tools/build-managers/cmake/default.nix | 4 +- .../tools/build-managers/sbt/default.nix | 4 +- .../build-managers/scala-cli/default.nix | 6 +- .../development/tools/buildah/default.nix | 4 +- .../development/tools/buildpack/default.nix | 2 +- .../pkgs/development/tools/butane/default.nix | 4 +- .../development/tools/checkmate/default.nix | 2 +- .../pkgs/development/tools/chefdk/default.nix | 5 +- .../tools/confluent-cli/default.nix | 42 + .../development/tools/conftest/default.nix | 2 +- .../buildkite-agent/default.nix | 2 +- .../github-runner/default.nix | 51 +- .../patches/prevent-self-update.patch | 25 - .../gocd-agent/default.nix | 2 +- .../gocd-server/default.nix | 2 +- .../laminar/default.nix | 4 +- .../pkgs/development/tools/convco/default.nix | 21 +- .../pkgs/development/tools/corgi/default.nix | 7 +- .../database/beekeeper-studio/default.nix | 8 +- .../database/clickhouse-backup/default.nix | 2 +- .../tools/database/dbmate/default.nix | 6 +- .../tools/database/sqlfluff/default.nix | 4 +- .../database/timescaledb-tune/default.nix | 7 +- .../timescaledb-tune/fixMinMaxConn.diff | 13 + .../pkgs/development/tools/datree/default.nix | 2 +- .../development/tools/ddosify/default.nix | 2 +- .../pkgs/development/tools/deis/default.nix | 36 - .../development/tools/deisctl/default.nix | 30 - .../pkgs/development/tools/doctl/default.nix | 4 +- .../pkgs/development/tools/dstp/default.nix | 4 +- .../pkgs/development/tools/dyff/default.nix | 2 +- .../development/tools/earthly/default.nix | 8 +- .../tools/ec2-metadata-mock/default.nix | 2 +- .../development/tools/electron/default.nix | 77 +- .../development/tools/electron/generic.nix | 8 +- .../pkgs/development/tools/ent/default.nix | 40 + .../development/tools/esbuild/default.nix | 4 +- .../pkgs/development/tools/evans/default.nix | 6 +- .../development/tools/faas-cli/default.nix | 6 +- .../pkgs/development/tools/fq/default.nix | 4 +- .../pkgs/development/tools/frugal/default.nix | 4 +- .../pkgs/development/tools/ginkgo/default.nix | 27 +- .../development/tools/github/bump/default.nix | 2 +- .../development/tools/go-swagger/default.nix | 6 +- .../tools/gocode-gomod/default.nix | 2 + .../development/tools/gocyclo/default.nix | 23 +- .../pkgs/development/tools/gokart/default.nix | 6 +- .../pkgs/development/tools/gopls/default.nix | 2 +- .../development/tools/gotests/default.nix | 26 +- .../pkgs/development/tools/gotests/deps.nix | 12 - .../pkgs/development/tools/gron/default.nix | 2 +- .../haskell-language-server/withWrapper.nix | 9 +- .../tools/haskell/hyper-haskell/server.nix | 3 +- .../pkgs/development/tools/heroku/default.nix | 4 +- .../development/tools/java/sawjap/default.nix | 2 +- .../tools/java/visualvm/default.nix | 4 +- .../pkgs/development/tools/jless/default.nix | 22 + .../pkgs/development/tools/just/default.nix | 7 +- .../pkgs/development/tools/kcli/default.nix | 2 +- .../development/tools/konstraint/default.nix | 6 +- .../development/tools/kubepug/default.nix | 4 +- .../tools/misc/binutils/default.nix | 3 +- .../misc/binutils/windres-locate-gcc.patch | 19 + .../tools/misc/blackfire/php-probe.nix | 4 +- .../development/tools/misc/cgdb/default.nix | 4 +- .../tools/misc/circleci-cli/default.nix | 2 +- .../tools/misc/clojure-lsp/default.nix | 17 +- .../tools/misc/direvent/default.nix | 4 +- .../development/tools/misc/distcc/default.nix | 4 +- .../development/tools/misc/epm/default.nix | 36 +- .../development/tools/misc/k2tf/default.nix | 2 +- .../tools/misc/kconfig-frontends/default.nix | 5 +- .../tools/misc/luarocks/default.upstream | 1 - .../tools/misc/macdylibbundler/default.nix | 4 +- .../development/tools/misc/pahole/default.nix | 8 +- .../tools/misc/patchelf/unstable.nix | 2 +- .../pkgs/development/tools/misc/premake/3.nix | 9 +- .../tools/misc/premake/default.nix | 9 +- .../tools/misc/reviewdog/default.nix | 6 +- .../tools/misc/terracognita/default.nix | 2 +- .../development/tools/misc/texinfo/common.nix | 2 +- .../tools/misc/uncrustify/default.nix | 9 +- .../tools/misc/universal-ctags/default.nix | 3 +- .../pkgs/development/tools/mold/default.nix | 4 +- .../tools/ocaml/camlidl/default.nix | 3 + .../tools/ocaml/camlp4/default.nix | 3 + .../pkgs/development/tools/ocaml/dune/2.nix | 4 +- .../tools/ocaml/findlib/default.nix | 10 +- .../tools/ocaml/js_of_ocaml/ocamlbuild.nix | 2 +- .../tools/ocaml/ocp-build/default.nix | 8 +- .../tools/omnisharp-roslyn/create-deps.sh | 6 +- .../tools/omnisharp-roslyn/default.nix | 33 +- .../tools/omnisharp-roslyn/deps.nix | 1522 ++-- .../pkgs/development/tools/packer/default.nix | 7 +- .../tools/parsing/re2c/default.nix | 11 +- .../tools/parsing/tree-sitter/default.nix | 3 +- .../parsing/tree-sitter/grammars/default.nix | 2 +- .../grammars/tree-sitter-cmake.json | 8 +- .../grammars/tree-sitter-commonlisp.json | 8 +- .../tree-sitter/grammars/tree-sitter-elm.json | 8 +- .../grammars/tree-sitter-heex.json | 8 +- .../grammars/tree-sitter-latex.json | 8 +- .../tree-sitter/grammars/tree-sitter-lua.json | 8 +- .../grammars/tree-sitter-norg.json | 8 +- .../grammars/tree-sitter-org-nvim.json | 11 + .../tree-sitter/grammars/tree-sitter-org.json | 11 - .../tree-sitter/grammars/tree-sitter-php.json | 8 +- .../grammars/tree-sitter-python.json | 8 +- .../tree-sitter/grammars/tree-sitter-r.json | 8 +- .../grammars/tree-sitter-rust.json | 8 +- .../grammars/tree-sitter-scss.json | 8 +- .../grammars/tree-sitter-supercollider.json | 8 +- .../grammars/tree-sitter-tlaplus.json | 8 +- .../tree-sitter/grammars/tree-sitter-vim.json | 8 +- .../tools/parsing/tree-sitter/update.nix | 4 +- .../pkgs/development/tools/pet/default.nix | 2 +- .../pkgs/development/tools/pipenv/default.nix | 4 +- .../tools/proto-contrib/default.nix | 2 +- .../tools/protoc-gen-twirp_php/default.nix | 2 +- .../protoc-gen-twirp_typescript/default.nix | 2 +- .../tools/purescript/spago/spago.nix | 6 +- .../development/tools/rnix-lsp/default.nix | 10 +- .../tools/rust/bindgen/default.nix | 114 +- .../tools/rust/bindgen/unwrapped.nix | 63 + .../development/tools/rust/bindgen/wrapper.sh | 4 +- .../tools/rust/cargo-cache/default.nix | 6 +- .../tools/rust/cargo-deny/default.nix | 8 +- .../tools/rust/cargo-fuzz/default.nix | 8 +- .../tools/rust/cargo-make/default.nix | 6 +- .../tools/rust/cargo-msrv/default.nix | 6 +- .../tools/rust/cargo-spellcheck/default.nix | 7 +- .../tools/rust/cargo-xbuild/default.nix | 6 +- .../tools/rust/rust-analyzer/default.nix | 6 +- .../development/tools/scalafmt/default.nix | 4 +- .../pkgs/development/tools/selene/default.nix | 6 +- .../tools/selenium/selendroid/default.nix | 12 +- .../development/tools/sentry-cli/default.nix | 6 +- .../pkgs/development/tools/skjold/default.nix | 79 + .../pkgs/development/tools/skopeo/default.nix | 4 +- .../pkgs/development/tools/stylua/default.nix | 6 +- .../sumneko-lua-language-server/default.nix | 4 +- .../development/tools/symfony-cli/default.nix | 6 +- .../pkgs/development/tools/typos/default.nix | 6 +- .../development/tools/vgo2nix/default.nix | 3 +- .../development/tools/vultr-cli/default.nix | 4 +- .../pkgs/development/tools/wabt/default.nix | 4 +- .../tools/wasm-bindgen-cli/default.nix | 6 +- .../development/tools/wrangler/default.nix | 6 +- .../yarn2nix-moretea/yarn2nix/default.nix | 14 +- .../pkgs/development/tools/yq-go/default.nix | 6 +- .../pkgs/development/web/bloomrpc/default.nix | 42 + .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/development/web/deno/default.nix | 6 +- .../pkgs/development/web/nodejs/nodejs.nix | 6 +- .../nixpkgs/pkgs/games/7kaa/default.nix | 79 + .../nixpkgs/pkgs/games/alephone/default.nix | 4 +- .../nixpkgs/pkgs/games/anki/default.nix | 5 + .../nixpkgs/pkgs/games/cl-wordle/default.nix | 24 + .../pkgs/games/cl-wordle/rust-1-57.diff | 13 + .../nixpkgs/pkgs/games/crawl/default.nix | 4 +- .../nixpkgs/pkgs/games/egoboo/default.nix | 2 +- .../nixpkgs/pkgs/games/fheroes2/default.nix | 4 +- .../nixpkgs/pkgs/games/flare/default.nix | 4 +- .../nixpkgs/pkgs/games/flare/engine.nix | 6 +- third_party/nixpkgs/pkgs/games/flare/game.nix | 6 +- .../nixpkgs/pkgs/games/freedink/default.nix | 2 +- .../nixpkgs/pkgs/games/linthesia/default.nix | 38 + .../pkgs/games/minecraft-servers/update.py | 3 +- .../nixpkgs/pkgs/games/minetest/default.nix | 59 +- .../pkgs/games/minetest/disable_fixup.patch | 10 - .../minetest/fix_wordsize_confusion.patch | 10 - .../nixpkgs/pkgs/games/openttd/nml.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 15 +- .../polymc/0001-pick-latest-java-first.patch | 48 - .../nixpkgs/pkgs/games/polymc/default.nix | 22 +- .../nixpkgs/pkgs/games/steam/fhsenv.nix | 2 +- .../nixpkgs/pkgs/games/toppler/default.nix | 57 +- .../nixpkgs/pkgs/games/uchess/default.nix | 2 +- .../nixpkgs/pkgs/games/vassal/default.nix | 4 +- .../pkgs/games/vintagestory/default.nix | 4 +- .../misc/arm-trusted-firmware/default.nix | 2 +- .../nixpkgs/pkgs/misc/beep/default.nix | 4 +- .../nixpkgs/pkgs/misc/cups/default.nix | 6 +- .../pkgs/misc/cups/drivers/hl1110/default.nix | 3 +- .../misc/cups/drivers/hl1210w/default.nix | 3 +- .../misc/cups/drivers/hl3140cw/default.nix | 3 +- .../misc/cups/drivers/hll2340dw/default.nix | 3 +- .../misc/drivers/epson-escpr2/default.nix | 6 +- .../misc/emulators/dolphin-emu/master.nix | 8 +- .../misc/emulators/dosbox-staging/default.nix | 60 +- .../pkgs/misc/emulators/dosbox/default.nix | 68 +- .../misc/emulators/duckstation/default.nix | 6 +- .../pkgs/misc/emulators/mgba/default.nix | 4 +- .../pkgs/misc/emulators/retroarch/default.nix | 4 +- ...gine-IntelJITEvents-only-use-ITTAPI_.patch | 62 + .../pkgs/misc/emulators/rpcs3/default.nix | 25 +- .../pkgs/misc/emulators/rpcs3/update.sh | 31 +- .../pkgs/misc/emulators/ruffle/default.nix | 6 +- .../pkgs/misc/emulators/vice/default.nix | 4 +- .../nixpkgs/pkgs/misc/emulators/wine/base.nix | 8 - .../pkgs/misc/emulators/wine/default.nix | 22 +- .../pkgs/misc/emulators/wine/sources.nix | 10 +- .../misc/emulators/wxmupen64plus/default.nix | 32 - .../gnash/0001-fix-build-with-ffmepg-4.patch | 57 - .../nixpkgs/pkgs/misc/gnash/default.nix | 132 - .../pkgs/misc/kitty-themes/default.nix | 27 + .../nixpkgs/pkgs/misc/logging/beats/7.x.nix | 2 +- .../nixpkgs/pkgs/misc/scrcpy/default.nix | 6 +- .../pkgs/misc/tmux-plugins/default.nix | 12 +- .../nixpkgs/pkgs/misc/vim-plugins/aliases.nix | 1 - .../pkgs/misc/vim-plugins/generated.nix | 1136 +-- .../pkgs/misc/vim-plugins/overrides.nix | 69 +- .../patches/sniprun/fix-paths.patch | 36 + .../pkgs/misc/vim-plugins/vim-plugin-names | 14 +- .../_maintainers/update-bin-srcs-lib.sh | 8 +- .../pkgs/misc/vscode-extensions/default.nix | 184 +- .../ms-dotnettools-csharp/default.nix | 26 +- .../rt-deps-bin-srcs.json | 66 +- .../ms-dotnettools-csharp/update-bin-srcs | 2 +- .../misc/vscode-extensions/python/default.nix | 10 +- .../vscode-extensions/vscode-lldb/default.nix | 8 +- .../nixpkgs/pkgs/misc/wiki-tui/default.nix | 6 +- .../pkgs/os-specific/darwin/duti/default.nix | 2 +- .../os-specific/darwin/mysides/default.nix | 36 + .../darwin/usr-include/default.nix | 23 - .../alsa-lib/alsa-plugin-conf-multilib.patch | 232 + .../linux/alsa-project/alsa-lib/default.nix | 8 + .../os-specific/linux/amdgpu-pro/default.nix | 2 + .../pkgs/os-specific/linux/anbox/default.nix | 6 +- .../os-specific/linux/busybox/default.nix | 4 + .../os-specific/linux/cryptsetup/default.nix | 1 + .../os-specific/linux/displaylink/default.nix | 15 +- .../pkgs/os-specific/linux/dpdk/default.nix | 41 +- .../pkgs/os-specific/linux/evdi/default.nix | 10 +- .../os-specific/linux/firejail/default.nix | 7 +- .../fbuilder-call-firejail-on-path.patch | 18 +- .../firejail/mount-nix-dir-on-overlay.patch | 8 +- .../linux/firejail/remove-link-check.patch | 48 - .../os-specific/linux/fnotifystat/default.nix | 28 +- .../linux/gogoclient/config-paths.patch | 39 - .../os-specific/linux/gogoclient/default.nix | 41 - .../linux/gogoclient/gcc46-include-fix.patch | 22 - .../pkgs/os-specific/linux/greetd/default.nix | 2 +- .../os-specific/linux/ipvsadm/default.nix | 4 + .../linux/kernel-headers/default.nix | 4 +- .../linux/kernel/common-config.nix | 2 + .../linux/kernel/hardened/patches.json | 50 +- .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-4.4.nix | 4 +- .../os-specific/linux/kernel/linux-4.9.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.16.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../linux/kernel/linux-testing-bcachefs.nix | 6 +- .../os-specific/linux/kernel/linux-xanmod.nix | 4 +- .../os-specific/linux/kernel/linux-zen.nix | 4 +- ...0001-Remove-unused-function-after_eq.patch | 28 + .../os-specific/linux/keyutils/default.nix | 4 + .../os-specific/linux/libpsm2/default.nix | 4 +- .../pkgs/os-specific/linux/lsirec/default.nix | 36 + .../os-specific/linux/microcode/intel.nix | 4 +- .../linux/nixos-rebuild/nixos-rebuild.sh | 2 +- .../os-specific/linux/numatop/default.nix | 31 +- .../os-specific/linux/nvidia-x11/builder.sh | 3 +- .../os-specific/linux/nvidia-x11/default.nix | 9 +- .../os-specific/linux/nvidia-x11/generic.nix | 2 +- .../os-specific/linux/openvswitch/default.nix | 4 +- .../pkgs/os-specific/linux/pam/default.nix | 6 +- .../linux/pam/suid-wrapper-path.patch | 6 + .../os-specific/linux/procdump/default.nix | 14 +- .../os-specific/linux/rdma-core/default.nix | 4 +- .../os-specific/linux/sgx/samples/default.nix | 109 + .../os-specific/linux/sgx/sdk/default.nix | 24 +- .../os-specific/linux/sgx/sdk/samples.nix | 63 - .../pkgs/os-specific/linux/shadow/default.nix | 2 +- .../os-specific/linux/sysstat/default.nix | 4 +- .../os-specific/linux/systemd/default.nix | 24 +- .../os-specific/linux/util-linux/default.nix | 4 +- .../os-specific/linux/wlgreet/default.nix | 12 +- .../pkgs/os-specific/solo5/default.nix | 13 +- .../nixpkgs/pkgs/servers/alps/default.nix | 2 +- .../pkgs/servers/blockbook/default.nix | 2 +- .../pkgs/servers/calibre-web/default.nix | 4 +- .../nixpkgs/pkgs/servers/dns/bind/default.nix | 5 +- .../dns/bind/dont-keep-configure-flags.patch | 34 +- .../servers/dns/bind/remove-mkdir-var.patch | 12 - .../pkgs/servers/dns/knot-dns/default.nix | 4 +- .../nixpkgs/pkgs/servers/fcgiwrap/default.nix | 2 +- .../nixpkgs/pkgs/servers/firebird/default.nix | 10 +- .../pkgs/servers/foundationdb/cmake.nix | 2 +- .../pkgs/servers/foundationdb/default.nix | 3 +- .../pkgs/servers/gemini/agate/default.nix | 6 +- .../pkgs/servers/gemini/gmid/default.nix | 12 +- .../pkgs/servers/gemini/gmnisrv/default.nix | 6 +- .../nixpkgs/pkgs/servers/h2/default.nix | 14 +- .../pkgs/servers/headscale/default.nix | 8 +- .../pkgs/servers/heisenbridge/default.nix | 4 +- .../home-assistant/component-packages.nix | 75 +- .../pkgs/servers/home-assistant/default.nix | 74 +- .../pkgs/servers/home-assistant/frontend.nix | 10 +- .../pkgs/servers/home-assistant/tests.nix | 7 +- .../apache-modules/mod_fastcgi/default.nix | 10 - .../servers/http/gitlab-pages/default.nix | 6 +- .../pkgs/servers/http/nginx/modules.nix | 15 + .../nixpkgs/pkgs/servers/hydron/default.nix | 2 +- .../pkgs/servers/hylafaxplus/default.nix | 4 + .../pkgs/servers/irc/atheme/default.nix | 4 +- .../pkgs/servers/irc/ergochat/default.nix | 4 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 4 +- .../nixpkgs/pkgs/servers/jackett/deps.nix | 2 +- .../pkgs/servers/janus-gateway/default.nix | 4 +- .../nixpkgs/pkgs/servers/klipper/default.nix | 6 +- .../pkgs/servers/limesurvey/default.nix | 9 +- .../nixpkgs/pkgs/servers/livepeer/default.nix | 2 +- .../pkgs/servers/mail/dovecot/default.nix | 4 +- .../dovecot/plugins/pigeonhole/default.nix | 4 +- .../pkgs/servers/mail/dspam/default.nix | 4 +- .../pkgs/servers/mail/mailman/hyperkitty.nix | 3 + .../nixpkgs/pkgs/servers/mastodon/gemset.nix | 6 +- .../pkgs/servers/mastodon/package.json | 2 +- .../nixpkgs/pkgs/servers/mastodon/source.nix | 4 +- .../nixpkgs/pkgs/servers/mastodon/version.nix | 2 +- .../pkgs/servers/mastodon/version.patch | 2 +- .../nixpkgs/pkgs/servers/mastodon/yarn.nix | 3158 +++---- .../pkgs/servers/matrix-conduit/default.nix | 28 +- .../plugins/shared-secret-auth.nix | 14 +- .../servers/matrix-synapse/tools/synadm.nix | 4 +- .../pkgs/servers/mattermost/default.nix | 10 +- .../pkgs/servers/mautrix-whatsapp/default.nix | 4 +- .../pkgs/servers/mediatomb/default.nix | 28 - .../pkgs/servers/misc/navidrome/default.nix | 6 +- .../pkgs/servers/misc/virtiofsd/default.nix | 25 + .../servers/monitoring/grafana/default.nix | 12 +- .../pkgs/servers/monitoring/munin/default.nix | 4 + .../monitoring/prometheus/alertmanager.nix | 18 +- .../prometheus/postgres-exporter.nix | 8 +- .../monitoring/prometheus/redis-exporter.nix | 6 +- .../servers/monitoring/telegraf/default.nix | 4 +- .../pkgs/servers/monitoring/zabbix/agent.nix | 4 + .../servers/mx-puppet-discord/default.nix | 8 +- .../servers/mx-puppet-discord/generate.sh | 7 +- .../mx-puppet-discord/node-composition.nix | 2 +- .../mx-puppet-discord/node-packages.nix | 473 +- .../pkgs/servers/nextcloud/default.nix | 12 +- .../nosql/apache-jena/fuseki-binary.upstream | 4 - .../pkgs/servers/oauth2-proxy/default.nix | 2 +- .../nixpkgs/pkgs/servers/plex/default.nix | 2 + third_party/nixpkgs/pkgs/servers/plex/raw.nix | 6 +- .../nixpkgs/pkgs/servers/prowlarr/default.nix | 8 +- .../nixpkgs/pkgs/servers/radicale/3.x.nix | 6 +- .../pkgs/servers/roon-bridge/default.nix | 67 +- .../pkgs/servers/roon-server/default.nix | 4 +- .../nixpkgs/pkgs/servers/sabnzbd/default.nix | 5 +- .../nixpkgs/pkgs/servers/samba/4.x.nix | 4 +- .../pkgs/servers/seafile-server/default.nix | 12 +- .../nixpkgs/pkgs/servers/serviio/default.nix | 4 +- .../pkgs/servers/shellinabox/default.nix | 50 - .../shellinabox/shellinabox-minus.patch | 28 - .../pkgs/servers/sickbeard/sickgear.nix | 4 +- .../pkgs/servers/soft-serve/default.nix | 7 +- .../softether/{4.29.nix => default.nix} | 22 +- .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 2 +- .../servers/sql/mariadb/connector-c/3_2.nix | 4 +- .../sql/mariadb/connector-c/default.nix | 5 +- .../pkgs/servers/sql/mariadb/default.nix | 8 +- .../nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix | 7 +- .../nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix | 15 +- .../pkgs/servers/sql/proxysql/default.nix | 4 + .../nixpkgs/pkgs/servers/t-rex/default.nix | 8 +- .../pkgs/servers/tailscale/default.nix | 4 +- .../nixpkgs/pkgs/servers/tautulli/default.nix | 4 +- .../nixpkgs/pkgs/servers/teleport/default.nix | 12 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 6 +- .../nixpkgs/pkgs/servers/unifi/default.nix | 5 + .../pkgs/servers/unpackerr/default.nix | 8 +- .../nixpkgs/pkgs/servers/varnish/default.nix | 8 +- .../servers/web-apps/ethercalc/default.nix | 27 + .../servers/web-apps/ethercalc/generate.sh | 15 + .../ethercalc/node-packages-generated.nix | 2086 +++++ .../web-apps/ethercalc/node-packages.json | 3 + .../web-apps/ethercalc/node-packages.nix | 17 + .../servers/web-apps/plausible/default.nix | 4 +- .../servers/web-apps/plausible/package.json | 2 +- .../pkgs/servers/web-apps/plausible/yarn.lock | 2405 +++-- .../pkgs/servers/web-apps/plausible/yarn.nix | 1792 ++-- .../servers/web-apps/rss-bridge/default.nix | 4 +- .../pkgs/servers/web-apps/wiki-js/default.nix | 4 +- .../servers/web-apps/wordpress/default.nix | 4 +- .../pkgs/servers/x11/xorg/overrides.nix | 12 +- .../pkgs/servers/zigbee2mqtt/default.nix | 4 +- .../servers/zigbee2mqtt/node-packages.nix | 2965 +++--- .../nixpkgs/pkgs/shells/fish/default.nix | 3 + .../pkgs/shells/fish/tests-pcre2-update.patch | 7 + .../nixpkgs/pkgs/shells/oil/default.nix | 4 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +- .../pkgs/shells/zsh/zsh-history/default.nix | 2 +- .../shells/zsh/zsh-powerlevel10k/default.nix | 8 +- third_party/nixpkgs/pkgs/stdenv/adapters.nix | 21 + .../stdenv/darwin/make-bootstrap-tools.nix | 3 +- .../pkgs/stdenv/generic/check-meta.nix | 11 +- .../nixpkgs/pkgs/stdenv/generic/setup.sh | 8 +- third_party/nixpkgs/pkgs/test/default.nix | 2 + .../pkgs/test/make-wrapper/default.nix | 136 + .../nixpkgs/pkgs/tools/X11/obconf/default.nix | 38 +- .../pkgs/tools/admin/afterburn/default.nix | 6 +- .../tools/admin/amazon-ec2-utils/default.nix | 45 +- .../default.nix | 6 +- .../pkgs/tools/admin/aws-vault/default.nix | 2 +- .../pkgs/tools/admin/awscli/default.nix | 4 +- .../pkgs/tools/admin/azure-cli/default.nix | 2 + .../tools/admin/azure-cli/python-packages.nix | 15 +- .../pkgs/tools/admin/eksctl/default.nix | 6 +- .../tools/admin/fits-cloudctl/default.nix | 2 +- .../nixpkgs/pkgs/tools/admin/gixy/default.nix | 21 +- .../pkgs/tools/admin/meshcentral/default.nix | 4 +- .../pkgs/tools/admin/meshcentral/package.json | 4 +- .../pkgs/tools/admin/meshcentral/yarn.lock | 715 +- .../pkgs/tools/admin/meshcentral/yarn.nix | 672 +- .../admin/realvnc-vnc-viewer/default.nix | 6 +- .../pkgs/tools/admin/scaleway-cli/default.nix | 2 +- .../pkgs/tools/admin/stripe-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/syft/default.nix | 9 +- .../pkgs/tools/admin/trinsic-cli/default.nix | 4 +- .../pkgs/tools/admin/trivy/default.nix | 6 +- .../pkgs/tools/archivers/7zz/default.nix | 24 +- .../pkgs/tools/archivers/unzip/default.nix | 2 +- .../pkgs/tools/audio/abcm2ps/default.nix | 19 +- .../pkgs/tools/audio/abcmidi/default.nix | 4 +- .../tools/audio/mpris-scrobbler/default.nix | 7 +- .../nixpkgs/pkgs/tools/audio/tts/default.nix | 35 +- .../pkgs/tools/audio/yabridge/default.nix | 21 +- .../yabridge/hardcode-dependencies.patch | 8 +- .../pkgs/tools/audio/yabridgectl/default.nix | 2 +- .../libyabridge-from-nix-profiles.patch | 15 +- .../pkgs/tools/backup/btrbk/default.nix | 7 +- .../discordchatexporter-cli/default.nix | 4 +- .../backup/discordchatexporter-cli/deps.nix | 4 +- .../pkgs/tools/backup/gh2md/default.nix | 27 + .../pkgs/tools/backup/kopia/default.nix | 10 +- .../tools/backup/percona-xtrabackup/8_0.nix | 2 +- .../percona-xtrabackup}/abi-check.patch | 0 .../pkgs/tools/cd-dvd/dvdisaster/default.nix | 21 +- .../pkgs/tools/compression/lzip/default.nix | 9 +- .../tools/compression/lziprecover/default.nix | 31 + .../pkgs/tools/compression/nx2elf/default.nix | 12 +- .../pkgs/tools/compression/zstd/default.nix | 4 +- .../filesystems/bcachefs-tools/default.nix | 6 +- .../tools/filesystems/e2fsprogs/default.nix | 5 +- .../filesystems/fuse-overlayfs/default.nix | 4 +- .../pkgs/tools/filesystems/garage/default.nix | 26 + .../pkgs/tools/filesystems/mtpfs/default.nix | 1 + .../tools/filesystems/snapraid/default.nix | 4 +- .../tools/graphics/findimagedupes/default.nix | 70 + .../pkgs/tools/graphics/grim/default.nix | 9 +- .../pkgs/tools/graphics/netpbm/default.nix | 6 +- .../pkgs/tools/graphics/pikchr/default.nix | 6 +- .../pkgs/tools/graphics/scrot/default.nix | 35 +- .../pkgs/tools/graphics/svgbob/default.nix | 6 +- .../pkgs/tools/graphics/unpaper/default.nix | 4 +- .../pkgs/tools/graphics/vips/default.nix | 4 +- .../fcitx-engines/fcitx-libpinyin/default.nix | 4 +- .../tools/inputmethods/fcitx5/default.nix | 4 +- .../inputmethods/fcitx5/fcitx5-chewing.nix | 40 + .../fcitx5/fcitx5-chinese-addons.nix | 6 +- .../inputmethods/fcitx5/fcitx5-configtool.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 +- .../inputmethods/fcitx5/fcitx5-hangul.nix | 40 + .../tools/inputmethods/fcitx5/fcitx5-lua.nix | 6 +- .../tools/inputmethods/fcitx5/fcitx5-m17n.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-qt.nix | 6 +- .../tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 +- .../fcitx5/fcitx5-table-extra.nix | 4 +- .../fcitx5/fcitx5-table-other.nix | 4 +- .../inputmethods/fcitx5/fcitx5-unikey.nix | 17 +- .../pkgs/tools/inputmethods/fcitx5/update.py | 20 +- .../pkgs/tools/inputmethods/kime/default.nix | 6 +- .../inputmethods/remote-touchpad/default.nix | 6 +- .../pkgs/tools/misc/apt-offline/default.nix | 6 +- .../pkgs/tools/misc/bdf2sfd/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/bfr/default.nix | 2 +- .../tools/misc/cloud-sql-proxy/default.nix | 6 +- .../pkgs/tools/misc/ddccontrol/default.nix | 21 +- .../pkgs/tools/misc/ddcutil/default.nix | 4 +- .../pkgs/tools/misc/diffoscope/default.nix | 9 +- .../nixpkgs/pkgs/tools/misc/duf/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/ent/default.nix | 2 +- .../pkgs/tools/misc/esphome/dashboard.nix | 5 +- .../pkgs/tools/misc/esphome/default.nix | 7 +- .../pkgs/tools/misc/etcher/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/fd/default.nix | 6 +- .../pkgs/tools/misc/fdtools/default.nix | 4 +- .../pkgs/tools/misc/git-town/default.nix | 4 +- .../pkgs/tools/misc/goreleaser/default.nix | 6 +- .../pkgs/tools/misc/gotify-cli/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/grub/2.0x.nix | 7 + .../nixpkgs/pkgs/tools/misc/h/default.nix | 4 +- .../tools/misc/hyperledger-fabric/default.nix | 2 +- .../pkgs/tools/misc/lookatme/default.nix | 57 + .../tools/misc/lottieconverter/default.nix | 1 + .../misc}/mailman-rss/default.nix | 0 .../pkgs/tools/misc/marlin-calc/default.nix | 1 + .../nautilus-open-any-terminal/default.nix | 64 + .../hardcode-gsettings.patch | 32 + .../misc/opentelemetry-collector/contrib.nix | 45 + .../misc/opentelemetry-collector/default.nix | 40 +- .../pkgs/tools/misc/osm2pgsql/default.nix | 4 +- .../misc/phoronix-test-suite/default.nix | 4 +- .../pkgs/tools/misc/pmbootstrap/default.nix | 6 +- .../pkgs/tools/misc/remind/default.nix | 4 +- .../pkgs/tools/misc/rpcsvc-proto/default.nix | 4 +- .../pkgs/tools/misc/rpi-imager/default.nix | 4 +- .../pkgs/tools/misc/rpm-ostree/default.nix | 4 +- .../pkgs/tools/misc/screen/default.nix | 36 +- .../nixpkgs/pkgs/tools/misc/sfeed/default.nix | 4 +- .../pkgs/tools/misc/sharedown/default.nix | 36 +- .../pkgs/tools/misc/sharedown/update.sh | 14 +- .../pkgs/tools/misc/sharedown/yarn.lock | 385 +- .../pkgs/tools/misc/sharedown/yarndeps.nix | 1006 +- .../pkgs/tools/misc/shunit2/default.nix | 74 +- .../pkgs/tools/misc/steampipe/default.nix | 7 +- .../pkgs/tools/misc/topicctl/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/txr/default.nix | 18 +- .../nixpkgs/pkgs/tools/misc/tz/default.nix | 2 +- .../pkgs/tools/misc/unparam/default.nix | 27 + .../pkgs/tools/misc/vector/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/viddy/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/vivid/default.nix | 6 +- .../pkgs/tools/misc/yt-dlp/default.nix | 4 +- .../tools/misc/yubikey-manager/default.nix | 4 +- .../tools/networking/boundary/default.nix | 8 +- .../pkgs/tools/networking/checkip/default.nix | 2 +- .../pkgs/tools/networking/chisel/default.nix | 6 +- .../pkgs/tools/networking/connman/connman.nix | 8 +- .../pkgs/tools/networking/corerad/default.nix | 6 +- .../pkgs/tools/networking/croc/default.nix | 9 +- .../pkgs/tools/networking/davix/default.nix | 4 +- .../pkgs/tools/networking/dhcpcd/default.nix | 21 +- .../pkgs/tools/networking/dibbler/default.nix | 4 +- .../tools/networking/dnstwist/default.nix | 4 +- .../pkgs/tools/networking/dogdns/default.nix | 21 +- .../pkgs/tools/networking/drill/default.nix | 6 +- .../tools/networking/fakeroute/default.nix | 2 +- .../pkgs/tools/networking/flannel/default.nix | 4 +- .../pkgs/tools/networking/godns/default.nix | 2 +- .../tools/networking/godspeed/default.nix | 2 +- .../pkgs/tools/networking/gping/default.nix | 20 +- .../pkgs/tools/networking/haproxy/default.nix | 6 +- .../pkgs/tools/networking/horst/default.nix | 4 +- .../pkgs/tools/networking/httpie/default.nix | 5 +- .../pkgs/tools/networking/i2p/default.nix | 4 +- .../pkgs/tools/networking/i2pd/default.nix | 7 + .../tools/networking/innernet/default.nix | 6 +- .../pkgs/tools/networking/lftp/default.nix | 7 +- .../tools/networking/mailutils/default.nix | 54 +- .../tools/networking/modemmanager/default.nix | 4 +- .../pkgs/tools/networking/mqttui/default.nix | 6 +- .../pkgs/tools/networking/n2n/default.nix | 4 +- .../pkgs/tools/networking/nebula/default.nix | 4 +- .../pkgs/tools/networking/netboot/default.nix | 4 + .../networking/networkmanager/default.nix | 4 +- .../networkmanager/l2tp/default.nix | 4 +- .../networkmanager/openvpn/default.nix | 4 +- .../tools/networking/opensnitch/daemon.nix | 11 +- .../tools/networking/opensnitch/go-mod.patch | 24 - .../pkgs/tools/networking/opensnitch/ui.nix | 9 +- .../tools/networking/shadowfox/default.nix | 2 +- .../networking/shadowsocks-rust/default.nix | 6 +- .../tools/networking/subfinder/default.nix | 2 +- .../tools/networking/tcpreplay/default.nix | 4 +- .../networking/telepresence2/default.nix | 6 +- .../tools/networking/tendermint/default.nix | 6 +- .../tools/networking/traceroute/default.nix | 2 +- .../networking/wg-netmanager/default.nix | 30 + .../pkgs/tools/networking/wifite2/default.nix | 25 +- .../pkgs/tools/networking/xh/default.nix | 6 +- .../pkgs/tools/networking/xxh/default.nix | 26 + .../tools/networking/yggdrasil/default.nix | 6 +- .../pkgs/tools/nix/alejandra/default.nix | 25 + .../nixpkgs/pkgs/tools/nix/statix/default.nix | 6 +- .../tools/package-management/apt/default.nix | 4 +- .../tools/package-management/nfpm/default.nix | 2 +- .../tools/package-management/nix/common.nix | 8 +- .../tools/package-management/nix/default.nix | 13 +- .../package-management/packagekit/default.nix | 125 +- .../package-management/pdm/check-update.patch | 12 + .../tools/package-management/pdm/default.nix | 106 + .../tools/package-management/rpm/default.nix | 9 +- .../pkgs/tools/security/aide/default.nix | 4 +- .../pkgs/tools/security/cariddi/default.nix | 2 +- .../pkgs/tools/security/cfripper/default.nix | 56 + .../pkgs/tools/security/chipsec/default.nix | 22 +- .../pkgs/tools/security/cosign/default.nix | 9 +- .../pkgs/tools/security/dalfox/default.nix | 2 +- .../pkgs/tools/security/dontgo403/default.nix | 25 + .../pkgs/tools/security/eid-mw/default.nix | 2 +- .../pkgs/tools/security/encryptr/default.nix | 57 - .../pkgs/tools/security/exploitdb/default.nix | 4 +- .../pkgs/tools/security/extrude/default.nix | 25 + .../pkgs/tools/security/fail2ban/default.nix | 20 +- .../tools/security/faraday-cli/default.nix | 19 +- .../pkgs/tools/security/gau/default.nix | 2 +- .../pkgs/tools/security/ghidra/build.nix | 7 +- .../nixpkgs/pkgs/tools/security/gnupg/23.nix | 7 + .../pkgs/tools/security/gopass/default.nix | 4 +- .../pkgs/tools/security/gopass/summon.nix | 39 + .../pkgs/tools/security/gpgstats/default.nix | 33 - .../pkgs/tools/security/haveged/default.nix | 34 +- .../pkgs/tools/security/httpx/default.nix | 2 +- .../pkgs/tools/security/ipscan/default.nix | 4 +- .../pkgs/tools/security/jadx/default.nix | 6 +- .../pkgs/tools/security/keybase/default.nix | 19 +- .../pkgs/tools/security/keybase/gui.nix | 8 +- .../pkgs/tools/security/keybase/kbfs.nix | 15 +- .../tools/security/kube-hunter/default.nix | 4 +- .../pkgs/tools/security/kubescape/default.nix | 6 +- .../pkgs/tools/security/kubesec/default.nix | 2 +- .../pkgs/tools/security/lmp/default.nix | 2 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 58 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 78 +- .../pkgs/tools/security/naabu/default.nix | 2 +- .../pkgs/tools/security/nmap/default.nix | 5 +- .../pkgs/tools/security/nuclei/default.nix | 2 +- .../pkgs/tools/security/orjail/default.nix | 55 + .../pkgs/tools/security/otpauth/default.nix | 6 +- .../0001-Set-base-to-an-empty-value.patch | 43 + .../pass/extensions/audit/default.nix | 8 +- .../tools/security/passphrase2pgp/default.nix | 2 +- .../pkgs/tools/security/pbis/default.nix | 2 +- .../security/pinentry-bemenu/default.nix | 25 + .../pkgs/tools/security/rng-tools/default.nix | 60 +- .../pkgs/tools/security/rnp/cmake_nogit.patch | 51 - .../pkgs/tools/security/rnp/default.nix | 6 +- .../pkgs/tools/security/saml2aws/default.nix | 6 +- .../pkgs/tools/security/scorecard/default.nix | 2 +- .../pkgs/tools/security/secp256k1/default.nix | 8 +- .../tools/security/snallygaster/default.nix | 4 +- .../pkgs/tools/security/spire/default.nix | 6 +- .../pkgs/tools/security/step-ca/default.nix | 6 +- .../pkgs/tools/security/step-cli/default.nix | 6 +- .../pkgs/tools/security/sudo/default.nix | 4 +- .../thc-hydra/darwin-remove-ldflag.patch | 13 + .../pkgs/tools/security/thc-hydra/default.nix | 6 +- .../pkgs/tools/security/traitor/default.nix | 4 +- .../pkgs/tools/security/vault/default.nix | 6 +- .../tools/security/vaultwarden/default.nix | 6 +- .../pkgs/tools/security/vulnix/default.nix | 4 +- .../tools/security/yubikey-agent/default.nix | 2 +- .../yubikey-touch-detector/default.nix | 2 +- .../pkgs/tools/system/bottom/default.nix | 6 +- .../pkgs/tools/system/collectd/data.nix | 10 +- .../pkgs/tools/system/collectd/plugins.nix | 6 +- .../pkgs/tools/system/ddrescue/default.nix | 4 +- .../pkgs/tools/system/fakechroot/default.nix | 9 +- .../pkgs/tools/system/fakeroot/default.nix | 65 +- .../nixpkgs/pkgs/tools/system/gdu/default.nix | 6 +- .../pkgs/tools/system/goreman/default.nix | 24 +- .../pkgs/tools/system/gotop/default.nix | 2 +- .../pkgs/tools/system/iops/default.nix | 29 - .../pkgs/tools/system/proot/default.nix | 13 +- .../pkgs/tools/system/thinkfan/default.nix | 4 +- .../pkgs/tools/text/chroma/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/chroma/src.json | 8 +- .../pkgs/tools/text/difftastic/default.nix | 17 +- .../pkgs/tools/text/gpt2tc/default.nix | 2 +- .../pkgs/tools/text/kdiff3/default.nix | 26 +- .../pkgs/tools/text/link-grammar/default.nix | 4 +- .../tools/text/mdbook-mermaid/default.nix | 6 +- .../pkgs/tools/text/patchutils/generic.nix | 3 + .../nixpkgs/pkgs/tools/text/ugrep/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 6 +- .../asciidoctor-with-extensions/Gemfile | 1 + .../asciidoctor-with-extensions/Gemfile.lock | 23 +- .../asciidoctor-with-extensions/default.nix | 3 +- .../asciidoctor-with-extensions/gemset.nix | 47 +- .../typesetting/asciidoctor/Gemfile.lock | 12 +- .../tools/typesetting/asciidoctor/gemset.nix | 24 +- .../pkgs/tools/typesetting/sile/default.nix | 4 +- .../pkgs/tools/video/dvgrab/default.nix | 2 +- .../pkgs/tools/video/mjpegtools/default.nix | 2 +- .../pkgs/tools/video/rav1e/default.nix | 6 +- .../virtualization/cloud-init/default.nix | 12 + .../virtualization/ec2-utils/default.nix | 47 - .../google-guest-agent/default.nix | 53 + .../disable-etc-mutation.patch | 54 + .../google-guest-agent/fix-paths.patch | 43 + .../google-guest-configs/default.nix | 52 + .../google-guest-configs/fix-paths.patch | 61 + .../default.nix | 28 +- .../virtualization/linode-cli/default.nix | 8 +- .../pkgs/tools/wayland/swayr/default.nix | 6 +- .../pkgs/tools/wayland/wluma/default.nix | 2 +- .../nixpkgs/pkgs/top-level/aliases.nix | 2177 ++--- .../nixpkgs/pkgs/top-level/all-packages.nix | 762 +- .../pkgs/top-level/darwin-packages.nix | 2 - .../pkgs/top-level/haskell-packages.nix | 8 +- .../nixpkgs/pkgs/top-level/kodi-packages.nix | 28 +- .../nixpkgs/pkgs/top-level/linux-kernels.nix | 2 + .../nixpkgs/pkgs/top-level/make-tarball.nix | 2 +- .../nixpkgs-basic-release-checks.nix | 22 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 8 +- .../pkgs/top-level/packages-config.nix | 10 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 51 +- .../nixpkgs/pkgs/top-level/python-aliases.nix | 9 + .../pkgs/top-level/python-packages.nix | 122 +- .../pkgs/top-level/python2-packages.nix | 8 +- .../pkgs/top-level/release-haskell.nix | 10 +- .../nixpkgs/pkgs/top-level/release-small.nix | 25 +- .../nixpkgs/pkgs/top-level/release.nix | 1 + .../nixpkgs/pkgs/top-level/ruby-packages.nix | 5 +- .../nixpkgs/pkgs/top-level/wine-packages.nix | 8 - 2465 files changed, 44949 insertions(+), 32581 deletions(-) delete mode 100644 third_party/nixpkgs/nixos/modules/programs/tilp2.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/desktops/pantheon/files.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/headscale.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/wg-netmanager.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/web-servers/shellinabox.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix create mode 100644 third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix create mode 100644 third_party/nixpkgs/nixos/modules/system/etc/test.nix create mode 100644 third_party/nixpkgs/nixos/modules/tasks/filesystems/apfs.nix delete mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash create mode 100644 third_party/nixpkgs/nixos/tests/apfs.nix create mode 100644 third_party/nixpkgs/nixos/tests/breitbandmessung.nix mode change 100644 => 100755 third_party/nixpkgs/nixos/tests/google-oslogin/server.py create mode 100644 third_party/nixpkgs/nixos/tests/moosefs.nix create mode 100644 third_party/nixpkgs/nixos/tests/noto-fonts.nix create mode 100644 third_party/nixpkgs/nixos/tests/retroarch.nix create mode 100644 third_party/nixpkgs/nixos/tests/xxh.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/ChowCentaur/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/munt/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/redux/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/heme/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch rename third_party/nixpkgs/pkgs/applications/misc/{gnome-passwordsafe => gnome-secrets}/default.nix (69%) create mode 100644 third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/pdfmod/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/impressive/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/darwin.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/morgen/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/timekeeper/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-setup.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/sage_docbuild.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/singular/redhat-aarch64.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/misc/sasview/local_config.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/misc/sasview/pyparsing-fix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/physics/shtns/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/terminal-emulators/kermit-terminal/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/kodi/addons/controllers/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/qemu/sigrtminmax.patch create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch rename third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/{ => src}/chrootenv.c (100%) rename third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/{ => src}/meson.build (100%) create mode 100644 third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix delete mode 100644 third_party/nixpkgs/pkgs/data/misc/mime-types/default.nix rename third_party/nixpkgs/pkgs/data/themes/{graphite => graphite-gtk-theme}/default.nix (76%) create mode 100644 third_party/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-2/bindings/libglademm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem create mode 100644 third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/gforth/swig.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/cabal-paths.patch rename third_party/nixpkgs/pkgs/development/compilers/go/{1.15.nix => 1.18.nix} (90%) delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/skip-chown-tests-1.16.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch rename third_party/nixpkgs/pkgs/development/compilers/rust/{1_57.nix => 1_58.nix} (58%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/idris-modules/protobuf.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix rename third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/{default.nix => 202103.nix} (94%) create mode 100644 third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/judy/cross.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/neon/0.29.nix rename third_party/nixpkgs/pkgs/development/libraries/neon/{0.29.6-darwin-fix-configure.patch => darwin-fix-configure.patch} (100%) delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/makefile.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch rename third_party/nixpkgs/pkgs/{build-support/upstream-updater => development/lisp-modules/from-quicklisp}/urls-from-page.sh (99%) create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/adax-local/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiosenseme/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/anyjson/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/carrot/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/circuit-webhook/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django/4.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/eebrightbox/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{garminconnect-ha => garminconnect}/default.nix (54%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/grapheme/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hdlparse/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{lark-parser => lark}/default.nix (81%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mat2/fix_poppler.patch rename third_party/nixpkgs/pkgs/development/python-modules/{asyncio-nats-client => nats-py}/default.nix (56%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyaussiebb/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/no-celery.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/warrant-lite/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix create mode 100644 third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff delete mode 100644 third_party/nixpkgs/pkgs/development/tools/deis/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ent/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/gotests/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/jless/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/binutils/windres-locate-gcc.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.upstream create mode 100644 third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json delete mode 100644 third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/skjold/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/7kaa/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/cl-wordle/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/cl-wordle/rust-1-57.diff create mode 100644 third_party/nixpkgs/pkgs/games/linthesia/default.nix delete mode 100644 third_party/nixpkgs/pkgs/games/minetest/disable_fixup.patch delete mode 100644 third_party/nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch delete mode 100644 third_party/nixpkgs/pkgs/games/polymc/0001-pick-latest-java-first.patch create mode 100644 third_party/nixpkgs/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch delete mode 100644 third_party/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch delete mode 100644 third_party/nixpkgs/pkgs/misc/gnash/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/darwin/mysides/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/darwin/usr-include/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firejail/remove-link-check.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/config-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/sgx/samples/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/samples.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/dns/bind/remove-mkdir-var.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/mediatomb/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream delete mode 100644 third_party/nixpkgs/pkgs/servers/shellinabox/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/shellinabox/shellinabox-minus.patch rename third_party/nixpkgs/pkgs/servers/softether/{4.29.nix => default.nix} (65%) create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/default.nix create mode 100755 third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/generate.sh create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.json create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix create mode 100644 third_party/nixpkgs/pkgs/shells/fish/tests-pcre2-update.patch create mode 100644 third_party/nixpkgs/pkgs/test/make-wrapper/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/backup/gh2md/default.nix rename third_party/nixpkgs/pkgs/{servers/sql/mysql => tools/backup/percona-xtrabackup}/abi-check.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/findimagedupes/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix create mode 100644 third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/lookatme/default.nix rename third_party/nixpkgs/pkgs/{development/python-modules => tools/misc}/mailman-rss/default.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/unparam/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/opensnitch/go-mod.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/xxh/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/pdm/check-update.patch create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/extrude/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/gopass/summon.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/gpgstats/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/orjail/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/rnp/cmake_nogit.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/system/iops/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/ec2-utils/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch rename third_party/nixpkgs/pkgs/tools/virtualization/{google-compute-engine-oslogin => google-guest-oslogin}/default.nix (60%) diff --git a/third_party/nixpkgs/.editorconfig b/third_party/nixpkgs/.editorconfig index b780def5d1..532bb48243 100644 --- a/third_party/nixpkgs/.editorconfig +++ b/third_party/nixpkgs/.editorconfig @@ -67,10 +67,6 @@ indent_style = unset insert_final_newline = unset trim_trailing_whitespace = unset -[pkgs/build-support/upstream-updater/**] -indent_style = unset -trim_trailing_whitespace = unset - [pkgs/development/compilers/elm/registry.dat] end_of_line = unset insert_final_newline = unset diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index 72c09a19c0..f1535526c2 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -13,10 +13,10 @@ assignees: '' - [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs) current version: diff --git a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml index 33ebb6f14a..9de57d6e3d 100644 --- a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -21,7 +21,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.name "github-actions[bot]" pushd pkgs/applications/networking/cluster/terraform-providers - ./update-all-providers + ./update-all-providers --no-build git commit -m "${{ steps.setup.outputs.title }}" providers.json popd - name: create PR diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index 6d72bd0deb..974f874793 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -319,10 +319,14 @@ For information about how to run the updates, execute `nix-shell maintainers/scr ## Phases {#sec-stdenv-phases} -The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm. +`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder. + +This generic command invokes a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. +While inside an interactive `nix-shell`, if you wanted to run all phases in the order they would be run in an actual build, you can invoke `genericBuild` yourself. + ### Controlling phases {#ssec-controlling-phases} There are a number of variables that control what phases are executed and in what order: diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index 29dffa9fa4..c48d6c68e5 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -21,35 +21,13 @@ nixos = import ./nixos/lib { lib = final; }; - nixosSystem = { modules, ... } @ args: + nixosSystem = args: import ./nixos/lib/eval-config.nix (args // { - modules = - let - moduleDeclarationFile = - let - # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't - # mean that the evaluator always keeps track of its position. If there - # are too many levels of indirection, the position gets lost at some point. - intermediatePos = builtins.unsafeGetAttrPos "modules" args; - in - if intermediatePos == null then null else intermediatePos.file; - - # Add the invoking file as error message location for modules - # that don't have their own locations; presumably inline modules. - addModuleDeclarationFile = - m: if moduleDeclarationFile == null then m else { - _file = moduleDeclarationFile; - imports = [ m ]; - }; - - in - map addModuleDeclarationFile modules ++ [ - { - system.nixos.versionSuffix = - ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; - system.nixos.revision = final.mkIf (self ? rev) self.rev; - } - ]; + modules = args.modules ++ [ { + system.nixos.versionSuffix = + ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; + system.nixos.revision = final.mkIf (self ? rev) self.rev; + } ]; }); }); diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index dafdd98f49..a88947b458 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -276,7 +276,7 @@ rec { /* Like `mapAttrsRecursive', but it takes an additional predicate - function that tells it whether to recursive into an attribute + function that tells it whether to recurse into an attribute set. If it returns false, `mapAttrsRecursiveCond' does not recurse, but does apply the map function. If it returns true, it does recurse, and does not apply the map function. diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 2684225388..3e43733ad2 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -111,8 +111,8 @@ let cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource pathIsRegularFile pathIsGitRepo; - inherit (self.modules) evalModules unifyModuleSyntax - applyIfFunction mergeModules + inherit (self.modules) evalModules setDefaultModuleLocation + unifyModuleSyntax applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 160b684330..aa3fa7c6e5 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -465,6 +465,11 @@ in mkLicense lset) ({ spdxId = "imagemagick"; }; + imlib2 = { + spdxId = "Imlib2"; + fullName = "Imlib2 License"; + }; + inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; url = "https://compcert.org/doc/LICENSE.txt"; @@ -592,6 +597,11 @@ in mkLicense lset) ({ fullName = "MIT License"; }; + mitAdvertising = { + spdxId = "MIT-advertising"; + fullName = "Enlightenment License (e16)"; + }; + mpl10 = { spdxId = "MPL-1.0"; fullName = "Mozilla Public License 1.0"; diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index c68bbfcaa3..f1125aca0a 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -334,6 +334,10 @@ rec { in modulesPath: initialModules: args: filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); + /* Wrap a module with a default location for reporting errors. */ + setDefaultModuleLocation = file: m: + { _file = file; imports = [ m ]; }; + /* Massage a module into canonical form, that is, a set consisting of ‘options’, ‘config’ and ‘imports’ attributes. */ unifyModuleSyntax = file: key: m: @@ -534,11 +538,9 @@ rec { correspond to the definition of 'loc' in 'opt.file'. */ mergeOptionDecls = let - packSubmodule = file: m: - { _file = file; imports = [ m ]; }; coerceOption = file: opt: - if isFunction opt then packSubmodule file opt - else packSubmodule file { options = opt; }; + if isFunction opt then setDefaultModuleLocation file opt + else setDefaultModuleLocation file { options = opt; }; in loc: opts: foldl' (res: opt: let t = res.type; @@ -568,7 +570,7 @@ rec { getSubModules = opt.options.type.getSubModules or null; submodules = - if getSubModules != null then map (packSubmodule opt._file) getSubModules ++ res.options + if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options else if opt.options ? options then map (coerceOption opt._file) options' ++ res.options else res.options; in opt.options // res // diff --git a/third_party/nixpkgs/lib/sources.nix b/third_party/nixpkgs/lib/sources.nix index ae2df72352..343449d9a6 100644 --- a/third_party/nixpkgs/lib/sources.nix +++ b/third_party/nixpkgs/lib/sources.nix @@ -20,17 +20,26 @@ let readFile ; - # Returns the type of a path: regular (for file), symlink, or directory - pathType = p: getAttr (baseNameOf p) (readDir (dirOf p)); + /* + Returns the type of a path: regular (for file), symlink, or directory. + */ + pathType = path: getAttr (baseNameOf path) (readDir (dirOf path)); - # Returns true if the path exists and is a directory, false otherwise - pathIsDirectory = p: if pathExists p then (pathType p) == "directory" else false; + /* + Returns true if the path exists and is a directory, false otherwise. + */ + pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false; - # Returns true if the path exists and is a regular file, false otherwise - pathIsRegularFile = p: if pathExists p then (pathType p) == "regular" else false; + /* + Returns true if the path exists and is a regular file, false otherwise. + */ + pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false; - # Bring in a path as a source, filtering out all Subversion and CVS - # directories, as well as backup files (*~). + /* + A basic filter for `cleanSourceWith` that removes + directories of version control system, backup files (*~) + and some generated files. + */ cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! ( # Filter out version control software files/directories (baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || @@ -48,43 +57,48 @@ let (type == "unknown") ); - # Filters a source tree removing version control files and directories using cleanSourceWith - # - # Example: - # cleanSource ./. + /* + Filters a source tree removing version control files and directories using cleanSourceFilter. + + Example: + cleanSource ./. + */ cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; }; - # Like `builtins.filterSource`, except it will compose with itself, - # allowing you to chain multiple calls together without any - # intermediate copies being put in the nix store. - # - # lib.cleanSourceWith { - # filter = f; - # src = lib.cleanSourceWith { - # filter = g; - # src = ./.; - # }; - # } - # # Succeeds! - # - # builtins.filterSource f (builtins.filterSource g ./.) - # # Fails! - # - # Parameters: - # - # src: A path or cleanSourceWith result to filter and/or rename. - # - # filter: A function (path -> type -> bool) - # Optional with default value: constant true (include everything) - # The function will be combined with the && operator such - # that src.filter is called lazily. - # For implementing a filter, see - # https://nixos.org/nix/manual/#builtin-filterSource - # - # name: Optional name to use as part of the store path. - # This defaults to `src.name` or otherwise `"source"`. - # - cleanSourceWith = { filter ? _path: _type: true, src, name ? null }: + /* + Like `builtins.filterSource`, except it will compose with itself, + allowing you to chain multiple calls together without any + intermediate copies being put in the nix store. + + Example: + lib.cleanSourceWith { + filter = f; + src = lib.cleanSourceWith { + filter = g; + src = ./.; + }; + } + # Succeeds! + + builtins.filterSource f (builtins.filterSource g ./.) + # Fails! + + */ + cleanSourceWith = + { + # A path or cleanSourceWith result to filter and/or rename. + src, + # Optional with default value: constant true (include everything) + # The function will be combined with the && operator such + # that src.filter is called lazily. + # For implementing a filter, see + # https://nixos.org/nix/manual/#builtin-filterSource + # Type: A function (path -> type -> bool) + filter ? _path: _type: true, + # Optional name to use as part of the store path. + # This defaults to `src.name` or otherwise `"source"`. + name ? null + }: let orig = toSourceAttributes src; in fromSourceAttributes { @@ -116,9 +130,11 @@ let satisfiesSubpathInvariant = src ? satisfiesSubpathInvariant && src.satisfiesSubpathInvariant; }; - # Filter sources by a list of regular expressions. - # - # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]` + /* + Filter sources by a list of regular expressions. + + Example: src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"] + */ sourceByRegex = src: regexes: let isFiltered = src ? _isLibCleanSourceWith; @@ -153,8 +169,11 @@ let pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success; - # Get the commit id of a git repo - # Example: commitIdFromGitRepo + /* + Get the commit id of a git repo. + + Example: commitIdFromGitRepo + */ commitIdFromGitRepo = let readCommitFromFile = file: path: let fileName = toString path + "/" + file; diff --git a/third_party/nixpkgs/lib/trivial.nix b/third_party/nixpkgs/lib/trivial.nix index 575aaf6a7a..c68bac902e 100644 --- a/third_party/nixpkgs/lib/trivial.nix +++ b/third_party/nixpkgs/lib/trivial.nix @@ -61,11 +61,11 @@ rec { pipe = val: functions: let reverseApply = x: f: f x; in builtins.foldl' reverseApply val functions; - /* note please don’t add a function like `compose = flip pipe`. - This would confuse users, because the order of the functions - in the list is not clear. With pipe, it’s obvious that it - goes first-to-last. With `compose`, not so much. - */ + + # note please don’t add a function like `compose = flip pipe`. + # This would confuse users, because the order of the functions + # in the list is not clear. With pipe, it’s obvious that it + # goes first-to-last. With `compose`, not so much. ## Named versions corresponding to some builtin operators. diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 6ae60956ae..7fb0eb2175 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -513,12 +513,6 @@ githubId = 38869148; name = "Alex Eyre"; }; - algorith = { - email = "dries_van_daele@telenet.be"; - github = "DriesVanDaele"; - githubId = 1141488; - name = "Dries Van Daele"; - }; alibabzo = { email = "alistair.bill@gmail.com"; github = "alibabzo"; @@ -1185,14 +1179,14 @@ name = "Artturi N"; }; azahi = { - email = "azahi@teknik.io"; - matrix = "@azahi:matrix.org"; + name = "Azat Bahawi"; + email = "azat@bahawi.net"; + matrix = "@azahi:azahi.cc"; github = "azahi"; githubId = 22211000; - name = "Azat Bahawi"; keys = [{ - longkeyid = "rsa2048/0xB40FCB6608BBE3B6"; - fingerprint = "E9F3 483F 31C7 29B4 4CA2 7C38 B40F CB66 08BB E3B6"; + longkeyid = "rsa4096/0xC8C6BDDB3847F72B"; + fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; }]; }; ayazhafiz = { @@ -2309,6 +2303,13 @@ githubId = 5561189; name = "Cody Opel"; }; + Cogitri = { + email = "oss@cogitri.dev"; + github = "Cogitri"; + githubId = 8766773; + matrix = "@cogitri:cogitri.dev"; + name = "Rasmus Thomsen"; + }; cohei = { email = "a.d.xvii.kal.mai@gmail.com"; github = "cohei"; @@ -2381,6 +2382,13 @@ githubId = 11145016; name = "J.C."; }; + congee = { + email = "changshengwu@pm.me"; + matrix = "@congeec:matrix.org"; + github = "congee"; + name = "Changsheng Wu"; + githubId = 2083950; + }; contrun = { email = "uuuuuu@protonmail.com"; github = "contrun"; @@ -3735,6 +3743,12 @@ githubId = 222467; name = "Dmitry Ivanov"; }; + Etjean = { + email = "et.jean@outlook.fr"; + github = "Etjean"; + githubId = 32169529; + name = "Etienne Jean"; + }; etu = { email = "elis@hirwing.se"; matrix = "@etu:semi.social"; @@ -4395,6 +4409,12 @@ githubId = 27668; name = "Tobias Pflug"; }; + gin66 = { + email = "jochen@kiemes.de"; + github = "gin66"; + githubId = 5549373; + name = "Jochen Kiemes"; + }; giogadi = { email = "lgtorres42@gmail.com"; github = "giogadi"; @@ -4474,7 +4494,7 @@ gordias = { name = "Gordias"; email = "gordias@disroot.org"; - github = "NotGordias"; + github = "gordiasdot"; githubId = 94724133; keys = [{ longkeyid = "ed25519/0x5D47284830FAA4FA"; @@ -5455,6 +5475,12 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jc = { + name = "Josh Cooper"; + email = "josh@cooper.is"; + github = "joshua-cooper"; + githubId = 35612334; + }; jceb = { name = "jceb"; email = "jceb@e-jc.de"; @@ -5583,6 +5609,16 @@ githubId = 143075; name = "James Felix Black"; }; + jfchevrette = { + email = "jfchevrette@gmail.com"; + github = "jfchevrette"; + githubId = 3001; + name = "Jean-Francois Chevrette"; + keys = [{ + longkeyid = "rsa4096/0x67A0585801290DC6"; + fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; + }]; + }; jflanglois = { email = "yourstruly@julienlanglois.me"; github = "jflanglois"; @@ -6536,6 +6572,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kradalby = { + name = "Kristoffer Dalby"; + email = "kristoffer@dalby.cc"; + github = "kradalby"; + githubId = 98431; + }; kraem = { email = "me@kraem.xyz"; github = "kraem"; @@ -7516,16 +7558,6 @@ githubId = 29855073; name = "Michael Colicchia"; }; - matdsoupe = { - github = "matdsoupe"; - githubId = 44469426; - name = "Matheus de Souza Pessanha"; - email = "matheus_pessanha2001@outlook.com"; - keys = [{ - longkeyid = "rsa4096/0x2671964AB1E06A08"; - fingerprint = "2F32 CFEF E11A D73B A740 FA47 2671 964A B1E0 6A08"; - }]; - }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -7926,6 +7958,12 @@ fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; }]; }; + mihnea-s = { + email = "mihn.stn@gmail.com"; + github = "mihnea-s"; + githubId = 43088426; + name = "Mihnea Stoian"; + }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; @@ -8552,6 +8590,12 @@ githubId = 3747396; name = "Nathan Isom"; }; + nelsonjeppesen = { + email = "nix@jeppesen.io"; + github = "NelsonJeppesen"; + githubId = 50854675; + name = "Nelson Jeppesen"; + }; neonfuz = { email = "neonfuz@gmail.com"; github = "neonfuz"; @@ -11564,6 +11608,13 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio G."; + email = "5861043+superherointj@users.noreply.github.com"; + matrix = "@superherointj:matrix.org"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -11804,6 +11855,13 @@ githubId = 863327; name = "Tyler Benster"; }; + tboerger = { + email = "thomas@webhippie.de"; + matrix = "@tboerger:matrix.org"; + github = "tboerger"; + githubId = 156964; + name = "Thomas Boerger"; + }; tcbravo = { email = "tomas.bravo@protonmail.ch"; github = "tcbravo"; @@ -12163,6 +12221,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; + matrix = "@toastal:matrix.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -13612,10 +13671,10 @@ github = "nagisa"; githubId = 679122; }; - yevhenshymotiuk = { + yshym = { name = "Yevhen Shymotiuk"; - email = "yevhenshymotiuk@gmail.com"; - github = "yevhenshymotiuk"; + email = "yshym@pm.me"; + github = "yshym"; githubId = 44244245; }; hmenke = { @@ -13739,6 +13798,16 @@ github = "zeri42"; githubId = 68825133; }; + zoedsoupe = { + github = "zoedsoupe"; + githubId = 44469426; + name = "Zoey de Souza Pessanha"; + email = "zoey.spessanha@outlook.com"; + keys = [{ + longkeyid = "rsa4096/0x1E1E889CDBD6A315"; + fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; + }]; + }; zombiezen = { name = "Ross Light"; email = "ross@zombiezen.com"; @@ -13802,4 +13871,16 @@ fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; }]; }; + ameer = { + name = "Ameer Taweel"; + email = "ameertaweel2002@gmail.com"; + github = "AmeerTaweel"; + githubId = 20538273; + }; + nigelgbanks = { + name = "Nigel Banks"; + email = "nigel.g.banks@gmail.com"; + github = "nigelgbanks"; + githubId = 487373; + }; } diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 361be88045..5b70a7b1e6 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -278,6 +278,13 @@ with lib.maintainers; { scope = "Maintain SageMath and the dependencies that are likely to break it."; }; + sphinx = { + members = [ + SuperSandro2000 + ]; + scope = "Maintain Sphinx related packages."; + }; + serokell = { # Verify additions by approval of an already existing member of the team. members = [ diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index e99f786b33..544b1e1389 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -79,6 +79,12 @@ services.filebeat. + + + apfs, + a kernel module for mounting the Apple File System (APFS). + + FRRouting, a @@ -162,6 +168,13 @@ services.baget. + + + moosefs, fault + tolerant petabyte distributed file system. Available as + moosefs. + + prosody-filer, @@ -169,6 +182,13 @@ services.prosody-filer. + + + ethercalc, + an online collaborative spreadsheet. Available as + services.ethercalc. + + timetagger, @@ -185,6 +205,15 @@ services.rstudio-server. + + + headscale, + an Open Source implementation of the + Tailscale + Control Server. Available as + services.headscale + +
@@ -211,6 +240,19 @@ haskellPackages.callPackage). + + + pkgs.ghc.withPackages as well as + haskellPackages.ghcWithPackages etc. now + needs be overridden directly, as opposed to overriding the + result of calling it. Additionally, the + withLLVM parameter has been renamed to + useLLVM. So instead of + (ghc.withPackages (p: [])).override { withLLVM = true; }, + one needs to use + (ghc.withPackages.override { useLLVM = true; }) (p: []). + + pkgs.emacsPackages.orgPackages is removed @@ -228,6 +270,23 @@ removed due to it being an outdated version. + + + The DHCP server (services.dhcpd4, + services.dhcpd6) has been hardened. The + service is now using the systemd’s + DynamicUser mechanism to run as an + unprivileged dynamically-allocated user with limited + capabilities. The dhcpd state files are now always stored in + /var/lib/dhcpd{4,6} and the + services.dhcpd4.stateDir and + service.dhcpd6.stateDir options have been + removed. If you were depending on root privileges or + set{uid,gid,cap} binaries in dhcpd shell hooks, you may give + dhcpd more capabilities with e.g. + systemd.services.dhcpd6.serviceConfig.AmbientCapabilities. + + The mailpile email webclient @@ -271,6 +330,22 @@ writers.writePyPy2 needs to be used. + + + buildGoModule was updated to use + go_1_17, third party derivations that + specify >= go 1.17 in the main go.mod + will need to regenerate their vendorSha256 + hash. + + + + + The gnome-passwordsafe package updated to + version + 6.x and renamed to gnome-secrets. + + If you previously used @@ -382,6 +457,11 @@ unmaintained + + + tilp2 was removed together with its module + + The options @@ -428,6 +508,20 @@ directly. + + + The existing pkgs.opentelemetry-collector + has been moved to + pkgs.opentelemetry-collector-contrib to + match the actual source being the contrib + edition. pkgs.opentelemetry-collector is + now the actual core release of opentelemetry-collector. If you + use the community contributions you should change the package + you refer to. If you don’t need them update your commands from + otelcontribcol to + otelcorecol and enjoy a 7x smaller binary. + + pkgs.noto-fonts-cjk is now deprecated in @@ -515,6 +609,14 @@ wrapper for assert conditions. + + + pkgs.vimPlugins.onedark-nvim now refers to + navarasu/onedark.nvim + (formerly refers to + olimorris/onedarkpro.nvim). + +
@@ -700,6 +802,13 @@ loaded in the initrd. + + + nixos-generate-config now puts the dhcp + configuration in hardware-configuration.nix + instead of configuration.nix. + + fetchFromSourcehut now allows fetching @@ -732,6 +841,14 @@ 0042 configuration. + + + The default value for + programs.spacefm.settings.graphical_su got + unset. It previously pointed to gksu which + has been removed. + + A new module was added for the @@ -784,6 +901,17 @@ warning. + + + The option + services.networking.networkmanager.enableFccUnlock + was added to support FCC unlock procedures. Since release + 1.18.4, the ModemManager daemon no longer automatically + performs the FCC unlock procedure by default. See + the + docs for more details. + + programs.tmux has a new option diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md index a8b717c6f8..c748d2dae9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md @@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable). +- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS). + - [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable) - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable). @@ -49,12 +51,20 @@ In addition to numerous new and upgraded packages, this release has the followin - [BaGet](https://loic-sharma.github.io/BaGet/), a lightweight NuGet and symbol server. Available at [services.baget](#opt-services.baget.enable). +- [moosefs](https://moosefs.com), fault tolerant petabyte distributed file system. + Available as [moosefs](#opt-services.moosefs). + - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). +- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative + spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable). + - [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable). - [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable). +- [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable) + ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} @@ -71,6 +81,12 @@ In addition to numerous new and upgraded packages, this release has the followin instead to ensure cross compilation keeps working (or switch to `haskellPackages.callPackage`). +- `pkgs.ghc.withPackages` as well as `haskellPackages.ghcWithPackages` etc. + now needs be overridden directly, as opposed to overriding the result of + calling it. Additionally, the `withLLVM` parameter has been renamed to + `useLLVM`. So instead of `(ghc.withPackages (p: [])).override { withLLVM = true; }`, + one needs to use `(ghc.withPackages.override { useLLVM = true; }) (p: [])`. + - `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated. The packages in the top level of `pkgs.emacsPackages`, such as org and org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and @@ -78,6 +94,11 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. +- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened. + The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities. + The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed. + If you were depending on root privileges or set{uid,gid,cap} binaries in dhcpd shell hooks, you may give dhcpd more capabilities with e.g. `systemd.services.dhcpd6.serviceConfig.AmbientCapabilities`. + - The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. @@ -90,6 +111,10 @@ In addition to numerous new and upgraded packages, this release has the followin - The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter. Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used. +- `buildGoModule` was updated to use `go_1_17`, third party derivations that specify >= go 1.17 in the main `go.mod` will need to regenerate their `vendorSha256` hash. + +- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`. + - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. - The backward compatibility in `services.wordpress` to configure sites with @@ -126,15 +151,26 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.docbookrx` was removed since it's unmaintained +- `tilp2` was removed together with its module + - The options `networking.interfaces..ipv4.routes` and `networking.interfaces..ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`. - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. + - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under `$out/libexec/terraform-providers/////_/terraform-provider-_v` (which mkProvider does). This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. +- The existing `pkgs.opentelemetry-collector` has been moved to + `pkgs.opentelemetry-collector-contrib` to match the actual source being the + "contrib" edition. `pkgs.opentelemetry-collector` is now the actual core + release of opentelemetry-collector. If you use the community contributions + you should change the package you refer to. If you don't need them update your + commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary. + + - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` and `pkgs.noto-fonts-cjk-serif` because they each have different release schedules. To maintain compatibility with prior releases of Nixpkgs, @@ -157,6 +193,9 @@ In addition to numerous new and upgraded packages, this release has the followin - `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions. +- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) + (formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)). + ## Other Notable Changes {#sec-release-22.05-notable-changes} @@ -235,6 +274,8 @@ In addition to numerous new and upgraded packages, this release has the followin - A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd. +- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`. + - `fetchFromSourcehut` now allows fetching repositories recursively using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. @@ -245,6 +286,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.mbpfan` module was converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. +- The default value for `programs.spacefm.settings.graphical_su` got unset. It previously pointed to `gksu` which has been removed. + - A new module was added for the [Starship](https://starship.rs/) shell prompt, providing the options `programs.starship.enable` and `programs.starship.settings`. @@ -260,6 +303,12 @@ In addition to numerous new and upgraded packages, this release has the followin Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. +- The option + [services.networking.networkmanager.enableFccUnlock](#opt-services.networking.networkmanager.enableFccUnlock) + was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager + daemon no longer automatically performs the FCC unlock procedure by default. See + [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details. + - `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`. diff --git a/third_party/nixpkgs/nixos/lib/eval-config.nix b/third_party/nixpkgs/nixos/lib/eval-config.nix index e3eb88a60e..2daaa8a118 100644 --- a/third_party/nixpkgs/nixos/lib/eval-config.nix +++ b/third_party/nixpkgs/nixos/lib/eval-config.nix @@ -21,6 +21,7 @@ evalConfigArgs@ , # !!! See comment about args in lib/modules.nix specialArgs ? {} , modules +, modulesLocation ? (builtins.unsafeGetAttrPos "modules" evalConfigArgs).file or null , # !!! See comment about check in lib/modules.nix check ? true , prefix ? [] @@ -74,7 +75,18 @@ let _module.check = lib.mkDefault check; }; }; - allUserModules = modules ++ legacyModules; + + allUserModules = + let + # Add the invoking file (or specified modulesLocation) as error message location + # for modules that don't have their own locations; presumably inline modules. + locatedModules = + if modulesLocation == null then + modules + else + map (lib.setDefaultModuleLocation modulesLocation) modules; + in + locatedModules ++ legacyModules; noUserModules = evalModulesMinimal ({ inherit prefix specialArgs; diff --git a/third_party/nixpkgs/nixos/lib/qemu-common.nix b/third_party/nixpkgs/nixos/lib/qemu-common.nix index 964814e8c6..20bbe9ff5d 100644 --- a/third_party/nixpkgs/nixos/lib/qemu-common.nix +++ b/third_party/nixpkgs/nixos/lib/qemu-common.nix @@ -22,7 +22,7 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix index db4c355118..ab166d7327 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix @@ -11,6 +11,9 @@ in rec { mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""]; + # a type for options that take a unit name + unitNameType = types.strMatching "[a-zA-Z0-9@%:_.\\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)"; + makeUnit = name: unit: if unit.enable then pkgs.runCommand "unit-${mkPathSafeName name}" diff --git a/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix b/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix index 832a33d642..520f2e982a 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix @@ -45,7 +45,7 @@ in rec { requiredBy = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Units that require (i.e. depend on and need to go down with) this unit. The discussion under wantedBy @@ -56,7 +56,7 @@ in rec { wantedBy = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Units that want (i.e. depend on) this unit. The standard way to make a unit start by default at boot is to set this option @@ -73,7 +73,7 @@ in rec { aliases = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = "Aliases of that unit."; }; @@ -110,7 +110,7 @@ in rec { requires = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Start the specified units when this unit is started, and stop this unit when the specified units are stopped or fail. @@ -119,7 +119,7 @@ in rec { wants = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Start the specified units when this unit is started. ''; @@ -127,7 +127,7 @@ in rec { after = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started at the same time as this unit, delay this unit until they have started. @@ -136,7 +136,7 @@ in rec { before = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started at the same time as this unit, delay them until this unit has started. @@ -145,7 +145,7 @@ in rec { bindsTo = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Like ‘requires’, but in addition, if the specified units unexpectedly disappear, this unit will be stopped as well. @@ -154,7 +154,7 @@ in rec { partOf = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are stopped or restarted, then this unit is stopped or restarted as well. @@ -163,7 +163,7 @@ in rec { conflicts = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started, then this unit is stopped and vice versa. @@ -172,7 +172,7 @@ in rec { requisite = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Similar to requires. However if the units listed are not started, they will not be started and the transaction will fail. @@ -203,7 +203,7 @@ in rec { onFailure = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' A list of one or more units that are activated when this unit enters the "failed" state. 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 a41c419ebe..b730c4b44d 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 @@ -543,11 +543,11 @@ class Machine: Should only be used during test development, not in the production test.""" self.connect() - self.log("Terminal is ready (there is no prompt):") + self.log("Terminal is ready (there is no initial prompt):") assert self.shell subprocess.run( - ["socat", "READLINE", f"FD:{self.shell.fileno()}"], + ["socat", "READLINE,prompt=$ ", f"FD:{self.shell.fileno()}"], pass_fds=[self.shell.fileno()], ) diff --git a/third_party/nixpkgs/nixos/lib/utils.nix b/third_party/nixpkgs/nixos/lib/utils.nix index bbebf8ba35..190c4db4d4 100644 --- a/third_party/nixpkgs/nixos/lib/utils.nix +++ b/third_party/nixpkgs/nixos/lib/utils.nix @@ -149,10 +149,16 @@ rec { if [[ -h '${output}' ]]; then rm '${output}' fi + + inherit_errexit_restore=$(shopt -p inherit_errexit) + shopt -s inherit_errexit '' + concatStringsSep "\n" - (imap1 (index: name: "export secret${toString index}=$(<'${secrets.${name}}')") + (imap1 (index: name: '' + secret${toString index}=$(<'${secrets.${name}}') + export secret${toString index} + '') (attrNames secrets)) + "\n" + "${pkgs.jq}/bin/jq >'${output}' '" @@ -164,6 +170,7 @@ rec { ' <<'EOF' ${builtins.toJSON set} EOF + $inherit_errexit_restore ''; systemdUtils = { diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 2470d8b5bf..b0f96c754f 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -449,16 +449,10 @@ in { imports = [ (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ]) - (mkChangedOptionModule - [ "security" "initialRootPassword" ] - [ "users" "users" "root" "initialHashedPassword" ] - (cfg: if cfg.security.initialRootPassword == "!" - then null - else cfg.security.initialRootPassword)) + (mkRenamedOptionModule ["security" "initialRootPassword"] ["users" "users" "root" "initialHashedPassword"]) ]; ###### interface - options = { users.mutableUsers = mkOption { @@ -526,6 +520,17 @@ in { ''; }; + + users.allowNoPasswordLogin = mkOption { + type = types.bool; + default = false; + description = '' + Disable checking that at least the root user or a user in the wheel group can log in using + a password or an SSH key. + + WARNING: enabling this can lock you out of your system. Enable this only if you know what are you doing. + ''; + }; }; @@ -540,6 +545,7 @@ in { home = "/root"; shell = mkDefault cfg.defaultUserShell; group = "root"; + initialHashedPassword = mkDefault "!"; }; nobody = { uid = ids.uids.nobody; @@ -616,9 +622,11 @@ in { # there is at least one "privileged" account that has a # password or an SSH authorized key. Privileged accounts are # root and users in the wheel group. - assertion = !cfg.mutableUsers -> - any id ((mapAttrsToList (_: cfg: - (cfg.name == "root" + # The check does not apply when users.disableLoginPossibilityAssertion + # The check does not apply when users.mutableUsers + assertion = !cfg.mutableUsers -> !cfg.allowNoPasswordLogin -> + any id (mapAttrsToList (name: cfg: + (name == "root" || cfg.group == "wheel" || elem "wheel" cfg.extraGroups) && @@ -627,12 +635,16 @@ in { || cfg.passwordFile != null || cfg.openssh.authorizedKeys.keys != [] || cfg.openssh.authorizedKeys.keyFiles != []) - ) cfg.users) ++ [ + ) cfg.users ++ [ config.security.googleOsLogin.enable ]); message = '' Neither the root account nor any wheel user has a password or SSH authorized key. - You must set one to prevent being locked out of your system.''; + You must set one to prevent being locked out of your system. + If you really want to be locked out of your system, set users.allowNoPasswordLogin = true; + However you are most probably better off by setting users.mutableUsers = true; and + manually running passwd root to set the root password. + ''; } ] ++ flatten (flip mapAttrsToList cfg.users (name: user: [ diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix index 24d5b7bc2b..99bdb11b01 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix @@ -57,7 +57,6 @@ in { rtl8723bs-firmware rtl8761b-firmware rtw88-firmware - rtw89-firmware zd1211fw alsa-firmware sof-firmware @@ -65,6 +64,8 @@ in { ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware + ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [ + rtw89-firmware ]; hardware.wirelessRegulatoryDatabase = true; }) diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index c32c3f3ac5..b19ea614c8 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -178,11 +178,6 @@ in igpuBusId = if pCfg.intelBusId != "" then pCfg.intelBusId else pCfg.amdgpuBusId; in mkIf enabled { assertions = [ - { - assertion = with config.services.xserver.displayManager; (gdm.enable && gdm.nvidiaWayland) -> cfg.modesetting.enable; - message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`"; - } - { assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == ""; message = '' diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 065cea470f..31aeaad80d 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/hapw7q1fkjxvprnkcgw9ppczavg4daj2-nix-2.4"; - i686-linux = "/nix/store/8qlvh8pp5j8wgrzj3is2jlbhgrwgsiy9-nix-2.4"; - aarch64-linux = "/nix/store/h48lkygcqj4hdibbdnpl67q7ks6vkrd6-nix-2.4"; - x86_64-darwin = "/nix/store/c3mvzszvyzakvcp9spnjvsb8m2bpjk7m-nix-2.4"; - aarch64-darwin = "/nix/store/hbfqs62r0hga2yr4zi5kc7fzhf71bq9n-nix-2.4"; + x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0"; + i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0"; + aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0"; + x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0"; + aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index fe8c4fb1a6..57aef50a0f 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -279,7 +279,7 @@ if (`lsblk -o TYPE` =~ "lvm") { push @initrdKernelModules, "dm-snapshot"; } -my $virt = `systemd-detect-virt`; +my $virt = `@detectvirt@`; chomp $virt; @@ -398,7 +398,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { # Maybe this is a bind-mount of a filesystem we saw earlier? if (defined $fsByDev{$fields[2]}) { # Make sure this isn't a btrfs subvolume. - my $msg = `btrfs subvol show $rootDir$mountPoint`; + my $msg = `@btrfs@ subvol show $rootDir$mountPoint`; if ($? != 0 || $msg =~ /ERROR:/s) { my $path = $fields[3]; $path = "" if $path eq "/"; my $base = $fsByDev{$fields[2]}; @@ -436,7 +436,7 @@ EOF # Is this a btrfs filesystem? if ($fsType eq "btrfs") { - my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + my ($status, @info) = runCommand("@btrfs@ subvol show $rootDir$mountPoint"); if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } @@ -558,6 +558,8 @@ if (!$noFilesystems) { $fsAndSwap .= "swapDevices =" . multiLineList(" ", @swapDevices) . ";\n"; } +my $networkingDhcpConfig = generateNetworkingDhcpConfig(); + my $hwConfig = <selectall_arrayref( "select package from Programs where system = ? and name = ?", { Slice => {} }, $system, $program); -if (!defined $res || scalar @$res == 0) { +my $len = !defined $res ? 0 : scalar @$res; + +if ($len == 0) { print STDERR "$program: command not found\n"; -} elsif (scalar @$res == 1) { +} elsif ($len == 1) { my $package = @$res[0]->{package}; if ($ENV{"NIX_AUTO_RUN"} // "") { + if ($ENV{"NIX_AUTO_RUN_INTERACTIVE"} // "") { + while (1) { + print STDERR "'$program' from package '$package' will be run, confirm? [yn]: "; + chomp(my $comfirm = ); + if (lc $comfirm eq "n") { + exit 0; + } elsif (lc $comfirm eq "y") { + last; + } + } + } exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); } else { print STDERR <{package}\n"; + } + my $choice = 0; + while (1) { # exec will break this loop + no warnings "numeric"; + print STDERR "Your choice [1-${len}]: "; + # 0 can be invalid user input like non-number string + # so we start from 1 + $choice = + 0; + if (1 <= $choice && $choice <= $len) { + exec("nix-shell", "-p", @$res[$choice - 1]->{package}, + "--run", shell_quote("exec", @ARGV)); + } + } + } else { + print STDERR <{package}\n" foreach @$res; + print STDERR " nix-shell -p $_->{package}\n" foreach @$res; + } } exit 127; diff --git a/third_party/nixpkgs/nixos/modules/programs/dconf.nix b/third_party/nixpkgs/nixos/modules/programs/dconf.nix index 298abac8af..265c41cbbb 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dconf.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dconf.nix @@ -60,7 +60,7 @@ in environment.systemPackages = [ pkgs.dconf ]; # Needed for unwrapped applications - environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix index 822fca3ece..f71abcaa33 100644 --- a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix @@ -27,13 +27,11 @@ in default = { tmp_dir = "/tmp"; terminal_su = "${pkgs.sudo}/bin/sudo"; - graphical_su = "${pkgs.gksu}/bin/gksu"; }; defaultText = literalExpression '' { tmp_dir = "/tmp"; terminal_su = "''${pkgs.sudo}/bin/sudo"; - graphical_su = "''${pkgs.gksu}/bin/gksu"; } ''; description = '' diff --git a/third_party/nixpkgs/nixos/modules/programs/tilp2.nix b/third_party/nixpkgs/nixos/modules/programs/tilp2.nix deleted file mode 100644 index da9e32e3e6..0000000000 --- a/third_party/nixpkgs/nixos/modules/programs/tilp2.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.programs.tilp2; - -in { - options.programs.tilp2 = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable tilp2 and udev rules for supported calculators. - ''; - }; - }; - - config = mkIf cfg.enable { - services.udev.packages = [ - pkgs.libticables2 - ]; - - environment.systemPackages = [ - pkgs.tilp2 - ]; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 81843dc0f9..1315a2e136 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -32,6 +32,7 @@ with lib; '') (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) (mkRemovedOptionModule [ "security" "hideProcessInformation" ] '' @@ -59,6 +60,9 @@ with lib; (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. + '') (mkRemovedOptionModule [ "services" "prey" ] '' prey-bash-client is deprecated upstream '') @@ -84,6 +88,8 @@ with lib; The racoon module has been removed, because the software project was abandoned upstream. '') + (mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.") + # Do NOT add any option renames here, see top of the file ]; } diff --git a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix index c2889a0f0d..cf416035ef 100644 --- a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix +++ b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.security.googleOsLogin; - package = pkgs.google-compute-engine-oslogin; + package = pkgs.google-guest-oslogin; in @@ -17,7 +17,7 @@ in type = types.bool; default = false; description = '' - Whether to enable Google OS Login + Whether to enable Google OS Login. The OS Login package enables the following components: AuthorizedKeysCommand to query valid SSH keys from the user's OS Login @@ -36,7 +36,7 @@ in security.pam.services.sshd = { makeHomeDir = true; googleOsLoginAccountVerification = true; - # disabled for now: googleOsLoginAuthentication = true; + googleOsLoginAuthentication = true; }; security.sudo.extraConfig = '' @@ -47,6 +47,9 @@ in "d /var/google-users.d 750 root root -" ]; + systemd.packages = [ package ]; + systemd.timers.google-oslogin-cache.wantedBy = [ "timers.target" ]; + # enable the nss module, so user lookups etc. work system.nssModules = [ package ]; system.nssDatabases.passwd = [ "cache_oslogin" "oslogin" ]; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 964cfe7040..9f295db84f 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -444,15 +444,15 @@ let account sufficient ${pam_krb5}/lib/security/pam_krb5.so '' + optionalString cfg.googleOsLoginAccountVerification '' - account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so - account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so + account [success=ok ignore=ignore default=die] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so + account [success=ok default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so '' + '' # Authentication management. '' + optionalString cfg.googleOsLoginAuthentication '' - auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so + auth [success=done perm_denied=die default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so '' + optionalString cfg.rootOK '' auth sufficient pam_rootok.so @@ -1091,11 +1091,11 @@ in mr ${pam_ccreds}/lib/security/pam_ccreds.so, '' + optionalString (isEnabled (cfg: cfg.googleOsLoginAccountVerification)) '' - mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so, - mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so, + mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so, + mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so, '' + optionalString (isEnabled (cfg: cfg.googleOsLoginAuthentication)) '' - mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so, + mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so, '' + optionalString (config.security.pam.enableSSHAgentAuth && isEnabled (cfg: cfg.sshAgentAuth)) '' diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix index 7686ff99bf..8cbe54c606 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix @@ -362,6 +362,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "systemd-tmpfiles-clean.service" ]; + requires = [ "network.target" ]; serviceConfig = { Type = "forking"; @@ -371,12 +372,12 @@ in ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LimitMEMLOCK = "infinity"; }; - - preStart = '' - mkdir -p /var/spool - ''; }; + systemd.tmpfiles.rules = mkIf cfg.client.enable [ + "d /var/spool/slurmd 755 root root -" + ]; + services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true); systemd.services.slurmctld = mkIf (cfg.server.enable) { diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix index afd85c972b..c3bd8f99c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix @@ -208,6 +208,7 @@ in token=$(< "$STATE_DIRECTORY"/${newConfigTokenFilename}) RUNNER_ROOT="$STATE_DIRECTORY" ${cfg.package}/bin/config.sh \ --unattended \ + --disableupdate \ --work "$RUNTIME_DIRECTORY" \ --url ${escapeShellArg cfg.url} \ --token "$token" \ diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix index 4288b6b5de..1039605391 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -38,7 +38,7 @@ with lib; systemd.packages = [ pkgs.glib-networking ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix index 27864fad4f..1aa64ea37d 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix @@ -57,7 +57,7 @@ in services.udev.packages = [ pkgs.libmtp.out ]; # Needed for unwrapped applications - environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pantheon/files.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pantheon/files.nix deleted file mode 100644 index 8cee9f42b6..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pantheon/files.nix +++ /dev/null @@ -1,13 +0,0 @@ -# pantheon files daemon. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - imports = [ - (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`") - ]; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/ddccontrol.nix b/third_party/nixpkgs/nixos/modules/services/hardware/ddccontrol.nix index 766bf12ee9..f0b5a9c819 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/ddccontrol.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/ddccontrol.nix @@ -20,6 +20,9 @@ in ###### implementation config = lib.mkIf cfg.enable { + # Load the i2c-dev module + boot.kernelModules = [ "i2c_dev" ]; + # Give users access to the "gddccontrol" tool environment.systemPackages = [ pkgs.ddccontrol diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix index d48b544467..61448af2d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix @@ -317,7 +317,8 @@ in (isYes "NET") ]; - boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; + # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat. + environment.etc."modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; system.activationScripts.udevd = '' diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix b/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix index 92c060147b..81bf497c99 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix @@ -155,8 +155,8 @@ in default = 1200; description = '' When usePercentageForPolicy is - false, the time remaining at which UPower will - consider the battery low. + false, the time remaining in seconds at which + UPower will consider the battery low. If any value (of timeLow, timeCritical and timeAction) is @@ -169,8 +169,8 @@ in default = 300; description = '' When usePercentageForPolicy is - false, the time remaining at which UPower will - consider the battery critical. + false, the time remaining in seconds at which + UPower will consider the battery critical. If any value (of timeLow, timeCritical and timeAction) is @@ -183,8 +183,8 @@ in default = 120; description = '' When usePercentageForPolicy is - false, the time remaining at which UPower will - take action for the critical battery level. + false, the time remaining in seconds at which + UPower will take action for the critical battery level. If any value (of timeLow, timeCritical and timeAction) is diff --git a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix index 95c83796ec..a34bc07b6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix @@ -45,7 +45,7 @@ in { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix b/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix index 95cee5046e..a65c5c9d11 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix @@ -43,6 +43,7 @@ in { ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}"; Type = "oneshot"; RemainAfterExit = false; + KillMode = "process"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index 6f6a9e3110..19f270d373 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -1131,8 +1131,8 @@ in { ExecStartPre = let preStartFullPrivileges = '' - shopt -s dotglob nullglob - set -eu + set -o errexit -o pipefail -o nounset + shopt -s dotglob nullglob inherit_errexit chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/* if [[ -n "$(ls -A '${cfg.statePath}'/config/)" ]]; then @@ -1142,7 +1142,8 @@ in { in "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}"; ExecStart = pkgs.writeShellScript "gitlab-config" '' - set -eu + set -o errexit -o pipefail -o nounset + shopt -s inherit_errexit umask u=rwx,g=rx,o= @@ -1171,7 +1172,8 @@ in { rm -f '${cfg.statePath}/config/database.yml' ${if cfg.databasePasswordFile != null then '' - export db_password="$(<'${cfg.databasePasswordFile}')" + db_password="$(<'${cfg.databasePasswordFile}')" + export db_password if [[ -z "$db_password" ]]; then >&2 echo "Database password was an empty string!" @@ -1195,10 +1197,11 @@ in { rm -f '${cfg.statePath}/config/secrets.yml' - export secret="$(<'${cfg.secrets.secretFile}')" - export db="$(<'${cfg.secrets.dbFile}')" - export otp="$(<'${cfg.secrets.otpFile}')" - export jws="$(<'${cfg.secrets.jwsFile}')" + secret="$(<'${cfg.secrets.secretFile}')" + db="$(<'${cfg.secrets.dbFile}')" + otp="$(<'${cfg.secrets.otpFile}')" + jws="$(<'${cfg.secrets.jwsFile}')" + export secret db otp jws jq -n '{production: {secret_key_base: $ENV.secret, otp_key_base: $ENV.otp, db_key_base: $ENV.db, @@ -1232,7 +1235,8 @@ in { RemainAfterExit = true; ExecStart = pkgs.writeShellScript "gitlab-db-config" '' - set -eu + set -o errexit -o pipefail -o nounset + shopt -s inherit_errexit umask u=rwx,g=rx,o= initial_root_password="$(<'${cfg.initialRootPasswordFile}')" diff --git a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix index ac4c0222aa..fc8ce08b2e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix @@ -329,7 +329,7 @@ in { "zwave_js" ]; in { - ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'"; + ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "hass"; Group = "hass"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-conduit.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-conduit.nix index d6cd575ee9..108f64de7a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-conduit.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-conduit.nix @@ -86,6 +86,15 @@ in and is set to be read only. ''; }; + global.database_backend = mkOption { + type = types.enum [ "sqlite" "rocksdb" ]; + default = "sqlite"; + example = "rocksdb"; + description = '' + The database backend for the service. Switching it on an existing + instance will require manual migration of data. + ''; + }; }; }; default = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix b/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix index ea9ffbb867..360cdbac2a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix @@ -217,7 +217,6 @@ in { package = mkOption { type = types.package; - example = literalExpression "pkgs.mediatomb"; default = pkgs.gerbera; defaultText = literalExpression "pkgs.gerbera"; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 111a2ad504..ea57292fc4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -89,7 +89,7 @@ let requireSignedBinaryCaches = "require-sigs"; trustedUsers = "trusted-users"; allowedUsers = "allowed-users"; - systemFeatures = "system-feature"; + systemFeatures = "system-features"; }; semanticConfType = with types; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix b/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix index 93bd206bd9..9191078ef9 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix @@ -13,7 +13,7 @@ let (iniFmt.generate "PackageKit.conf" (recursiveUpdate { Daemon = { - DefaultBackend = "test_nop"; + DefaultBackend = "nix"; KeepCache = false; }; } @@ -35,7 +35,7 @@ let in { imports = [ - (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "The only backend that doesn't blow up is `test_nop`.") + (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "Always set to Nix.") ]; options.services.packagekit = { @@ -62,6 +62,8 @@ in services.dbus.packages = with pkgs; [ packagekit ]; + environment.systemPackages = with pkgs; [ packagekit ]; + systemd.packages = with pkgs; [ packagekit ]; environment.etc = listToAttrs (map diff --git a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix index 2ae4e80d5c..7000d45975 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix @@ -6,6 +6,10 @@ let cfg = config.services.plex; in { + imports = [ + (mkRemovedOptionModule [ "services" "plex" "managePlugins" ] "Please omit or define the option: `services.plex.extraPlugins' instead.") + ]; + options = { services.plex = { enable = mkEnableOption "Plex Media Server"; @@ -42,16 +46,6 @@ in ''; }; - managePlugins = mkOption { - type = types.bool; - default = true; - description = '' - If set to true, this option will cause all of the symlinks in Plex's - plugin directory to be removed and symlinks for paths specified in - to be added. - ''; - }; - extraPlugins = mkOption { type = types.listOf types.path; default = []; @@ -59,9 +53,7 @@ in A list of paths to extra plugin bundles to install in Plex's plugin directory. Every time the systemd unit for Plex starts up, all of the symlinks in Plex's plugin directory will be cleared and this module - will symlink all of the paths specified here to that directory. If - this behavior is undesired, set to - false. + will symlink all of the paths specified here to that directory. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index 9e49601ce1..bac9836453 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -42,11 +42,11 @@ in { serviceOpts = { serviceConfig = { AmbientCapabilities = [ - "CAP_RAW_SYSIO" + "CAP_SYS_RAWIO" "CAP_SYS_ADMIN" ]; CapabilityBoundingSet = [ - "CAP_RAW_SYSIO" + "CAP_SYS_RAWIO" "CAP_SYS_ADMIN" ]; DevicePolicy = "closed"; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix index e313589134..7a1444deca 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix @@ -181,8 +181,8 @@ in rgwMimeTypesFile = mkOption { type = with types; nullOr path; - default = "${pkgs.mime-types}/etc/mime.types"; - defaultText = literalExpression ''"''${pkgs.mime-types}/etc/mime.types"''; + default = "${pkgs.mailcap}/etc/mime.types"; + defaultText = literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; description = '' Path to mime types used by radosgw. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix index 5482b2aaf8..b311b91b4a 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix @@ -260,24 +260,17 @@ in ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + optionalString cfg.autoMigrate '' ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y - '' + concatStringsSep "\n" (collect - isString - (mapAttrsRecursive - (path: value: - # Using heredoc below so that the value is never improperly quoted - '' - read value <mfsmaster-init on a freshly installed master server to + initialize the DATA_PATH direcory. + ''; + default = false; + }; + + exports = mkOption { + type = with types; listOf str; + default = null; + description = "Paths to export (see mfsexports.cfg)."; + example = [ + "* / rw,alldirs,admin,maproot=0:0" + "* . rw" + ]; + }; + + openFirewall = mkOption { + type = types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = mkOption { + type = types.str; + default = "/var/lib/mfs"; + description = "Data storage directory."; + }; + }; + + description = "Contents of config file (mfsmaster.cfg)."; + }; + }; + + metalogger = { + enable = mkEnableOption "Moosefs metalogger daemon."; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = mkOption { + type = types.str; + default = "/var/lib/mfs"; + description = "Data storage directory"; + }; + }; + + description = "Contents of metalogger config file (mfsmetalogger.cfg)."; + }; + }; + + chunkserver = { + enable = mkEnableOption "Moosefs chunkserver daemon."; + + openFirewall = mkOption { + type = types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + hdds = mkOption { + type = with types; listOf str; + default = null; + description = "Mount points to be used by chunkserver for storage (see mfshdd.cfg)."; + example = [ "/mnt/hdd1" ]; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = mkOption { + type = types.str; + default = "/var/lib/mfs"; + description = "Directory for lock file."; + }; + }; + + description = "Contents of chunkserver config file (mfschunkserver.cfg)."; + }; + }; + }; + }; + + ###### implementation + + config = mkIf ( cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) { + + warnings = [ ( mkIf (!cfg.runAsUser) "Running moosefs services as root is not recommended.") ]; + + # Service settings + services.moosefs = { + master.settings = mkIf cfg.master.enable { + WORKING_USER = mfsUser; + EXPORTS_FILENAME = toString ( pkgs.writeText "mfsexports.cfg" + (concatStringsSep "\n" cfg.master.exports)); + }; + + metalogger.settings = mkIf cfg.metalogger.enable { + WORKING_USER = mfsUser; + MASTER_HOST = cfg.masterHost; + }; + + chunkserver.settings = mkIf cfg.chunkserver.enable { + WORKING_USER = mfsUser; + MASTER_HOST = cfg.masterHost; + HDD_CONF_FILENAME = toString ( pkgs.writeText "mfshdd.cfg" + (concatStringsSep "\n" cfg.chunkserver.hdds)); + }; + }; + + # Create system user account for daemons + users = mkIf ( cfg.runAsUser && ( cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) ) { + users.moosefs = { + isSystemUser = true; + description = "moosefs daemon user"; + group = "moosefs"; + }; + groups.moosefs = {}; + }; + + environment.systemPackages = + (lib.optional cfg.client.enable pkgs.moosefs) ++ + (lib.optional cfg.master.enable initTool); + + networking.firewall.allowedTCPPorts = + (lib.optionals cfg.master.openFirewall [ 9419 9420 9421 ]) ++ + (lib.optional cfg.chunkserver.openFirewall 9422); + + # Ensure storage directories exist + systemd.tmpfiles.rules = + optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" + ++ optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" + ++ optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}"; + + # Service definitions + systemd.services.mfs-master = mkIf cfg.master.enable + ( systemdService "master" { + TimeoutStartSec = 1800; + TimeoutStopSec = 1800; + Restart = "no"; + } masterCfg ); + + systemd.services.mfs-metalogger = mkIf cfg.metalogger.enable + ( systemdService "metalogger" { Restart = "on-abnormal"; } metaloggerCfg ); + + systemd.services.mfs-chunkserver = mkIf cfg.chunkserver.enable + ( systemdService "chunkserver" { Restart = "on-abnormal"; } chunkserverCfg ); + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix index edac86eb0e..e72f9b54cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix @@ -79,7 +79,7 @@ in { in { services.rsync = { enable = !cfg.socketActivated; - aliases = [ "rsyncd" ]; + aliases = [ "rsyncd.service" ]; description = "fast remote file copy program daemon"; after = [ "network.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix index 8886e7a30f..9945dc83a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix @@ -127,7 +127,7 @@ in { description = "ConnMan VPN service"; wantedBy = [ "multi-user.target" ]; after = [ "syslog.target" ]; - before = [ "connman" ]; + before = [ "connman.service" ]; serviceConfig = { Type = "dbus"; BusName = "net.connman.vpn"; @@ -140,7 +140,7 @@ in { description = "D-BUS Service"; serviceConfig = { Name = "net.connman.vpn"; - before = [ "connman" ]; + before = [ "connman.service" ]; ExecStart = "${cfg.package}/sbin/connman-vpnd -n"; User = "root"; SystemdService = "connman-vpn.service"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index 2c339350ac..3eb7ca99ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -183,6 +183,20 @@ in config = mkIf enableDHCP { + assertions = [ { + # dhcpcd doesn't start properly with malloc ∉ [ libc scudo ] + # see https://github.com/NixOS/nixpkgs/issues/151696 + assertion = + dhcpcd.enablePrivSep + -> elem config.environment.memoryAllocator.provider [ "libc" "scudo" ]; + message = '' + dhcpcd with privilege separation is incompatible with chosen system malloc. + Currently only the `libc` and `scudo` allocators are known to work. + To disable dhcpcd's privilege separation, overlay Nixpkgs and override dhcpcd + to set `enablePrivSep = false`. + ''; + } ]; + systemd.services.dhcpcd = let cfgN = config.networking; hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "") diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix index 54e4f90028..3c4c0069df 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix @@ -28,38 +28,45 @@ let } ''; - dhcpdService = postfix: cfg: optionalAttrs cfg.enable { - "dhcpd${postfix}" = { - description = "DHCPv${postfix} server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + dhcpdService = postfix: cfg: + let + configFile = + if cfg.configFile != null + then cfg.configFile + else writeConfig 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 = '' - mkdir -m 755 -p ${cfg.stateDir} - chown dhcpd:nogroup ${cfg.stateDir} - touch ${cfg.stateDir}/dhcpd.leases - ''; - - serviceConfig = - let - configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg; - args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" - "-pf" "/run/dhcpd${postfix}/dhcpd.pid" - "-cf" "${configFile}" - "-lf" "${cfg.stateDir}/dhcpd.leases" - "-user" "dhcpd" "-group" "nogroup" - ] ++ cfg.extraFlags - ++ cfg.interfaces; - - in { - ExecStart = concatMapStringsSep " " escapeShellArg args; - Type = "forking"; - Restart = "always"; - RuntimeDirectory = [ "dhcpd${postfix}" ]; - PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; + 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 = { ... }: { @@ -102,15 +109,6 @@ let ''; }; - stateDir = mkOption { - type = types.path; - # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility. - default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}"; - description = '' - State directory for the DHCP server. - ''; - }; - extraConfig = mkOption { type = types.lines; default = ""; @@ -194,7 +192,13 @@ 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 @@ -210,15 +214,6 @@ in config = mkIf (cfg4.enable || cfg6.enable) { - users = { - users.dhcpd = { - isSystemUser = true; - group = "dhcpd"; - description = "DHCP daemon user"; - }; - groups.dhcpd = {}; - }; - systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix index ff023a888f..2aa3be16f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix @@ -326,7 +326,7 @@ in type = types.package; default = pkgs.iptables; defaultText = literalExpression "pkgs.iptables"; - example = literalExpression "pkgs.iptables-nftables-compat"; + example = literalExpression "pkgs.iptables-legacy"; description = '' The iptables package to use for running the firewall service." diff --git a/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix new file mode 100644 index 0000000000..091d2a938c --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix @@ -0,0 +1,490 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.headscale; + + dataDir = "/var/lib/headscale"; + runDir = "/run/headscale"; + + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "headscale.yaml" cfg.settings; +in +{ + options = { + services.headscale = { + enable = mkEnableOption "headscale, Open Source coordination server for Tailscale"; + + package = mkOption { + type = types.package; + default = pkgs.headscale; + defaultText = literalExpression "pkgs.headscale"; + description = '' + Which headscale package to use for the running server. + ''; + }; + + user = mkOption { + default = "headscale"; + type = types.str; + description = '' + User account under which headscale runs. + + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the headscale service starts. + + ''; + }; + + group = mkOption { + default = "headscale"; + type = types.str; + description = '' + Group under which headscale runs. + + If left as the default value this group will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the headscale service starts. + + ''; + }; + + serverUrl = mkOption { + type = types.str; + default = "http://127.0.0.1:8080"; + description = '' + The url clients will connect to. + ''; + example = "https://myheadscale.example.com:443"; + }; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Listening address of headscale. + ''; + example = "0.0.0.0"; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + Listening port of headscale. + ''; + example = 443; + }; + + privateKeyFile = mkOption { + type = types.path; + default = "${dataDir}/private.key"; + description = '' + Path to private key file, generated automatically if it does not exist. + ''; + }; + + derp = { + urls = mkOption { + type = types.listOf types.str; + default = [ "https://controlplane.tailscale.com/derpmap/default" ]; + description = '' + List of urls containing DERP maps. + See How Tailscale works for more information on DERP maps. + ''; + }; + + paths = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + List of file paths containing DERP maps. + See How Tailscale works for more information on DERP maps. + ''; + }; + + + autoUpdate = mkOption { + type = types.bool; + default = true; + description = '' + Whether to automatically update DERP maps on a set frequency. + ''; + example = false; + }; + + updateFrequency = mkOption { + type = types.str; + default = "24h"; + description = '' + Frequency to update DERP maps. + ''; + example = "5m"; + }; + + }; + + ephemeralNodeInactivityTimeout = mkOption { + type = types.str; + default = "30m"; + description = '' + Time before an inactive ephemeral node is deleted. + ''; + example = "5m"; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" "postgres" ]; + example = "postgres"; + default = "sqlite3"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1"; + description = "Database host address."; + }; + + port = mkOption { + type = types.nullOr types.port; + default = null; + example = 3306; + description = "Database host port."; + }; + + name = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = "Database name."; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = "Database user."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/headscale-dbpassword"; + description = '' + A file containing the password corresponding to + . + ''; + }; + + path = mkOption { + type = types.nullOr types.str; + default = "${dataDir}/db.sqlite"; + description = "Path to the sqlite3 database file."; + }; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + headscale log level. + ''; + example = "debug"; + }; + + dns = { + nameservers = mkOption { + type = types.listOf types.str; + default = [ "1.1.1.1" ]; + description = '' + List of nameservers to pass to Tailscale clients. + ''; + }; + + domains = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Search domains to inject to Tailscale clients. + ''; + example = [ "mydomain.internal" ]; + }; + + magicDns = mkOption { + type = types.bool; + default = true; + description = '' + Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/). + Only works if there is at least a nameserver defined. + ''; + example = false; + }; + + baseDomain = mkOption { + type = types.str; + default = ""; + description = '' + Defines the base domain to create the hostnames for MagicDNS. + must be a FQDNs, without the trailing dot. + The FQDN of the hosts will be + hostname.namespace.base_domain (e.g. + myhost.mynamespace.example.com). + ''; + }; + }; + + openIdConnect = { + issuer = mkOption { + type = types.str; + default = ""; + description = '' + URL to OpenID issuer. + ''; + example = "https://openid.example.com"; + }; + + clientId = mkOption { + type = types.str; + default = ""; + description = '' + OpenID Connect client ID. + ''; + }; + + clientSecretFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to OpenID Connect client secret file. + ''; + }; + + domainMap = mkOption { + type = types.attrsOf types.str; + default = { }; + description = '' + Domain map is used to map incomming users (by their email) to + a namespace. The key can be a string, or regex. + ''; + example = { + ".*" = "default-namespace"; + }; + }; + + }; + + tls = { + letsencrypt = { + hostname = mkOption { + type = types.nullOr types.str; + default = ""; + description = '' + Domain name to request a TLS certificate for. + ''; + }; + challengeType = mkOption { + type = types.enum [ "TLS_ALPN-01" "HTTP-01" ]; + default = "HTTP-01"; + description = '' + Type of ACME challenge to use, currently supported types: + HTTP-01 or TLS_ALPN-01. + ''; + }; + httpListen = mkOption { + type = types.nullOr types.str; + default = ":http"; + description = '' + When HTTP-01 challenge is chosen, letsencrypt must set up a + verification endpoint, and it will be listening on: + :http = port 80. + ''; + }; + }; + + certFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to already created certificate. + ''; + }; + keyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to key for already created certificate. + ''; + }; + }; + + aclPolicyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a file containg ACL policies. + ''; + }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + description = '' + Overrides to config.yaml as a Nix attribute set. + This option is ideal for overriding settings not exposed as Nix options. + Check the example config + for possible options. + ''; + }; + + + }; + + }; + config = mkIf cfg.enable { + + services.headscale.settings = { + server_url = mkDefault cfg.serverUrl; + listen_addr = mkDefault "${cfg.address}:${toString cfg.port}"; + + private_key_path = mkDefault cfg.privateKeyFile; + + derp = { + urls = mkDefault cfg.derp.urls; + paths = mkDefault cfg.derp.paths; + auto_update_enable = mkDefault cfg.derp.autoUpdate; + update_frequency = mkDefault cfg.derp.updateFrequency; + }; + + # Turn off update checks since the origin of our package + # is nixpkgs and not Github. + disable_check_updates = true; + + ephemeral_node_inactivity_timeout = mkDefault cfg.ephemeralNodeInactivityTimeout; + + db_type = mkDefault cfg.database.type; + db_path = mkDefault cfg.database.path; + + log_level = mkDefault cfg.logLevel; + + dns_config = { + nameservers = mkDefault cfg.dns.nameservers; + domains = mkDefault cfg.dns.domains; + magic_dns = mkDefault cfg.dns.magicDns; + base_domain = mkDefault cfg.dns.baseDomain; + }; + + unix_socket = "${runDir}/headscale.sock"; + + # OpenID Connect + oidc = { + issuer = mkDefault cfg.openIdConnect.issuer; + client_id = mkDefault cfg.openIdConnect.clientId; + domain_map = mkDefault cfg.openIdConnect.domainMap; + }; + + tls_letsencrypt_cache_dir = "${dataDir}/.cache"; + + } // optionalAttrs (cfg.database.host != null) { + db_host = mkDefault cfg.database.host; + } // optionalAttrs (cfg.database.port != null) { + db_port = mkDefault cfg.database.port; + } // optionalAttrs (cfg.database.name != null) { + db_name = mkDefault cfg.database.name; + } // optionalAttrs (cfg.database.user != null) { + db_user = mkDefault cfg.database.user; + } // optionalAttrs (cfg.tls.letsencrypt.hostname != null) { + tls_letsencrypt_hostname = mkDefault cfg.tls.letsencrypt.hostname; + } // optionalAttrs (cfg.tls.letsencrypt.challengeType != null) { + tls_letsencrypt_challenge_type = mkDefault cfg.tls.letsencrypt.challengeType; + } // optionalAttrs (cfg.tls.letsencrypt.httpListen != null) { + tls_letsencrypt_listen = mkDefault cfg.tls.letsencrypt.httpListen; + } // optionalAttrs (cfg.tls.certFile != null) { + tls_cert_path = mkDefault cfg.tls.certFile; + } // optionalAttrs (cfg.tls.keyFile != null) { + tls_key_path = mkDefault cfg.tls.keyFile; + } // optionalAttrs (cfg.aclPolicyFile != null) { + acl_policy_path = mkDefault cfg.aclPolicyFile; + }; + + # Setup the headscale configuration in a known path in /etc to + # allow both the Server and the Client use it to find the socket + # for communication. + environment.etc."headscale/config.yaml".source = configFile; + + users.groups.headscale = mkIf (cfg.group == "headscale") { }; + + users.users.headscale = mkIf (cfg.user == "headscale") { + description = "headscale user"; + home = dataDir; + group = cfg.group; + isSystemUser = true; + }; + + systemd.services.headscale = { + description = "headscale coordination server for Tailscale"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + + script = '' + ${optionalString (cfg.database.passwordFile != null) '' + export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.database.passwordFile})" + ''} + + export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})" + exec ${cfg.package}/bin/headscale serve + ''; + + serviceConfig = + let + capabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024) "CAP_NET_BIND_SERVICE"; + in + { + Restart = "always"; + Type = "simple"; + User = cfg.user; + Group = cfg.group; + + # Hardening options + RuntimeDirectory = "headscale"; + # Allow headscale group access so users can be added and use the CLI. + RuntimeDirectoryMode = "0750"; + + StateDirectory = "headscale"; + StateDirectoryMode = "0750"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectHostname = true; + ProtectClock = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictNamespaces = true; + RemoveIPC = true; + UMask = "0077"; + + CapabilityBoundingSet = capabilityBoundingSet; + AmbientCapabilities = capabilityBoundingSet; + NoNewPrivileges = true; + LockPersonality = true; + RestrictRealtime = true; + SystemCallFilter = [ "@system-service" "~@priviledged" "@chown" ]; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; + }; + }; + }; + + meta.maintainers = with maintainers; [ kradalby ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix index e1a31a0c2e..34fda57b23 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix @@ -222,14 +222,12 @@ let in concatStringsSep "\n" inTunOpts))]; in pkgs.writeText "i2pd-tunnels.conf" opts; - i2pdSh = pkgs.writeScriptBin "i2pd" '' - #!/bin/sh - exec ${cfg.package}/bin/i2pd \ - ${if cfg.address == null then "" else "--host="+cfg.address} \ - --service \ - --conf=${i2pdConf} \ - --tunconf=${tunnelConf} - ''; + i2pdFlags = concatStringsSep " " ( + optional (cfg.address != null) ("--host=" + cfg.address) ++ [ + "--service" + ("--conf=" + i2pdConf) + ("--tunconf=" + tunnelConf) + ]); in @@ -686,7 +684,7 @@ in User = "i2pd"; WorkingDirectory = homeDir; Restart = "on-abort"; - ExecStart = "${i2pdSh}/bin/i2pd"; + ExecStart = "${cfg.package}/bin/i2pd ${i2pdFlags}"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix index bbbe1e181b..992678c43e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -294,7 +294,7 @@ in systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target "]; + after = [ "network-online.target" ]; preStart = '' ${pkgs.envsubst}/bin/envsubst \ -o /run/murmur/murmurd.ini \ diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index 73e63e2ee9..a9801036b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -384,6 +384,17 @@ in { so you don't need to to that yourself. ''; }; + + enableFccUnlock = mkOption { + type = types.bool; + default = false; + description = '' + Enable FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer + automatically performs the FCC unlock procedure by default. See + the docs + for more details. + ''; + }; }; }; @@ -438,7 +449,13 @@ in { "NetworkManager/VPN/nm-sstp-service.name".source = "${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name"; + } + // optionalAttrs cfg.enableFccUnlock + { + "ModemManager/fcc-unlock.d".source = + "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/*"; + } // optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != []) { "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix index eb74d373b0..b911f97491 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix @@ -25,9 +25,10 @@ in for more information. There are other programs that use iptables internally too, such as - libvirt. + libvirt. For information on how the two firewalls interact, see [2]. [1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273 + [2]: https://wiki.nftables.org/wiki-nftables/index.php/Troubleshooting#Question_4._How_do_nftables_and_iptables_interact_when_used_on_the_same_system.3F ''; }; networking.nftables.ruleset = mkOption { @@ -118,20 +119,11 @@ in flush ruleset include "${cfg.rulesetFile}" ''; - checkScript = pkgs.writeScript "nftables-check" '' - #! ${pkgs.runtimeShell} -e - if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then - echo "Unload ip_tables before using nftables!" 1>&2 - exit 1 - else - ${rulesScript} - fi - ''; in { Type = "oneshot"; RemainAfterExit = true; - ExecStart = checkScript; - ExecReload = checkScript; + ExecStart = rulesScript; + ExecReload = rulesScript; ExecStop = "${pkgs.nftables}/bin/nft flush ruleset"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix b/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix index d7fb22edeb..2839ffb60a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; let - python = pkgs.python3Packages.python; cfg = config.services.seafile; settingsFormat = pkgs.formats.ini { }; @@ -221,9 +220,7 @@ in { ''; }; - seahub = let - penv = (pkgs.python3.withPackages (ps: with ps; [ gunicorn seahub ])); - in { + seahub = { description = "Seafile Server Web Frontend"; wantedBy = [ "seafile.target" ]; partOf = [ "seafile.target" ]; @@ -231,8 +228,7 @@ in { requires = [ "seaf-server.service" ]; restartTriggers = [ seahubSettings ]; environment = { - PYTHONPATH = - "${pkgs.python3Packages.seahub}/thirdpart:${pkgs.python3Packages.seahub}:${penv}/${python.sitePackages}"; + PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; DJANGO_SETTINGS_MODULE = "seahub.settings"; CCNET_CONF_DIR = ccnetDir; SEAFILE_CONF_DIR = dataDir; @@ -249,7 +245,7 @@ in { LogsDirectory = "seafile"; ConfigurationDirectory = "seafile"; ExecStart = '' - ${penv}/bin/gunicorn seahub.wsgi:application \ + ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ --name seahub \ --workers ${toString cfg.workers} \ --log-level=info \ @@ -262,27 +258,27 @@ in { preStart = '' mkdir -p ${seahubDir}/media # Link all media except avatars - for m in `find ${pkgs.python3Packages.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do + for m in `find ${pkgs.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do ln -sf $m ${seahubDir}/media/ done if [ ! -e "${seafRoot}/.seahubSecret" ]; then - ${penv}/bin/python ${pkgs.python3Packages.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret + ${pkgs.seahub.python}/bin/python ${pkgs.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret chmod 400 ${seafRoot}/.seahubSecret fi if [ ! -f "${seafRoot}/seahub-setup" ]; then # avatars directory should be writable - install -D -t ${seahubDir}/media/avatars/ ${pkgs.python3Packages.seahub}/media/avatars/default.png - install -D -t ${seahubDir}/media/avatars/groups ${pkgs.python3Packages.seahub}/media/avatars/groups/default.png + install -D -t ${seahubDir}/media/avatars/ ${pkgs.seahub}/media/avatars/default.png + install -D -t ${seahubDir}/media/avatars/groups ${pkgs.seahub}/media/avatars/groups/default.png # init database - ${pkgs.python3Packages.seahub}/manage.py migrate + ${pkgs.seahub}/manage.py migrate # create admin account - ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.python3Packages.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' - echo "${pkgs.python3Packages.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" fi - if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.python3Packages.seahub.version}" ]; then + if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then # update database - ${pkgs.python3Packages.seahub}/manage.py migrate - echo "${pkgs.python3Packages.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${pkgs.seahub}/manage.py migrate + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" fi ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix index 27a16fb2e2..b6faf2d3f7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix @@ -68,7 +68,7 @@ in systemd.services.syncplay = { description = "Syncplay Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target "]; + after = [ "network-online.target" ]; serviceConfig = { ExecStart = "${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs}"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wg-netmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/wg-netmanager.nix new file mode 100644 index 0000000000..493ff7ceba --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/wg-netmanager.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.wg-netmanager; +in +{ + + options = { + services.wg-netmanager = { + enable = mkEnableOption "Wireguard network manager"; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + # NOTE: wg-netmanager runs as root + systemd.services.wg-netmanager = { + description = "Wireguard network manager"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = with pkgs; [ wireguard-tools iproute2 wireguard-go ]; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + ExecStart = "${pkgs.wg-netmanager}/bin/wg_netmanager"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + ReadWritePaths = [ + "/tmp" # wg-netmanager creates files in /tmp before deleting them after use + ]; + }; + unitConfig = { + ConditionPathExists = ["/etc/wg_netmanager/network.yaml" "/etc/wg_netmanager/peer.yaml"]; + }; + }; + }; + + meta.maintainers = with maintainers; [ gin66 ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 07dec8ea71..c2e1d37e28 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -10,14 +10,45 @@ let cfg = config.networking.wireless; opt = options.networking.wireless; + wpa3Protocols = [ "SAE" "FT-SAE" ]; + hasMixedWPA = opts: + let + hasWPA3 = !mutuallyExclusive opts.authProtocols wpa3Protocols; + others = subtractLists wpa3Protocols opts.authProtocols; + in hasWPA3 && others != []; + + # Gives a WPA3 network higher priority + increaseWPA3Priority = opts: + opts // optionalAttrs (hasMixedWPA opts) + { priority = if opts.priority == null + then 1 + else opts.priority + 1; + }; + + # Creates a WPA2 fallback network + mkWPA2Fallback = opts: + opts // { authProtocols = subtractLists wpa3Protocols opts.authProtocols; }; + + # Networks attrset as a list + networkList = mapAttrsToList (ssid: opts: opts // { inherit ssid; }) + cfg.networks; + + # List of all networks (normal + generated fallbacks) + allNetworks = + if cfg.fallbackToWPA2 + then map increaseWPA3Priority networkList + ++ map mkWPA2Fallback (filter hasMixedWPA networkList) + else networkList; + # Content of wpa_supplicant.conf generatedConfig = concatStringsSep "\n" ( - (mapAttrsToList mkNetwork cfg.networks) + (map mkNetwork allNetworks) ++ optional cfg.userControlled.enable (concatStringsSep "\n" [ "ctrl_interface=/run/wpa_supplicant" "ctrl_interface_group=${cfg.userControlled.group}" "update_config=1" ]) + ++ [ "pmf=1" ] ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); @@ -33,7 +64,7 @@ let finalConfig = ''"$RUNTIME_DIRECTORY"/wpa_supplicant.conf''; # Creates a network block for wpa_supplicant.conf - mkNetwork = ssid: opts: + mkNetwork = opts: let quote = x: ''"${x}"''; indent = x: " " + x; @@ -43,7 +74,7 @@ let else opts.pskRaw; options = [ - "ssid=${quote ssid}" + "ssid=${quote opts.ssid}" (if pskString != null || opts.auth != null then "key_mgmt=${concatStringsSep " " opts.authProtocols}" else "key_mgmt=NONE") @@ -175,6 +206,18 @@ in { ''; }; + fallbackToWPA2 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to fall back to WPA2 authentication protocols if WPA3 failed. + This allows old wireless cards (that lack recent features required by + WPA3) to connect to mixed WPA2/WPA3 access points. + + To avoid possible downgrade attacks, disable this options. + ''; + }; + environmentFile = mkOption { type = types.nullOr types.path; default = null; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.xml b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.xml index c012cd4a92..a341d5d815 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.xml +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.xml @@ -84,7 +84,6 @@ in { interface eth0 { AdvSendAdvert on; - AdvDefaultLifetime 0; prefix ${prefix}::/64 { AdvOnLink on; AdvAutonomous on; diff --git a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix index 98c35a7ec8..041d0b3c43 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix @@ -143,6 +143,17 @@ in example = lib.literalExpression "[ pkgs.elasticsearchPlugins.discovery-ec2 ]"; }; + restartIfChanged = mkOption { + type = types.bool; + description = '' + Automatically restart the service on config change. + This can be set to false to defer restarts on a server or cluster. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + }; ###### implementation @@ -153,6 +164,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pkgs.inetutils ]; + inherit (cfg) restartIfChanged; environment = { ES_HOME = cfg.dataDir; ES_JAVA_OPTS = toString cfg.extraJavaOptions; @@ -163,6 +175,8 @@ in User = "elasticsearch"; PermissionsStartOnly = true; LimitNOFILE = "1024000"; + Restart = "always"; + TimeoutStartSec = "infinity"; }; preStart = '' ${optionalString (!config.boot.isContainer) '' diff --git a/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix b/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix index e5bed0a998..6df2343b84 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; @@ -11,7 +11,16 @@ in { dataDir = mkOption { default = "/var/lib/cfssl"; type = types.path; - description = "Cfssl work directory."; + description = '' + The work directory for CFSSL. + + + If left as the default value this directory will automatically be + created before the CFSSL server starts, otherwise you are + responsible for ensuring the directory exists with appropriate + ownership and permissions. + + ''; }; address = mkOption { @@ -22,7 +31,7 @@ in { port = mkOption { default = 8888; - type = types.ints.u16; + type = types.port; description = "Port to bind."; }; @@ -147,13 +156,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups.cfssl = { + users.groups.cfssl = { gid = config.ids.gids.cfssl; }; - users.extraUsers.cfssl = { + users.users.cfssl = { description = "cfssl user"; - createHome = true; home = cfg.dataDir; group = "cfssl"; uid = config.ids.uids.cfssl; @@ -164,41 +172,46 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - serviceConfig = { - WorkingDirectory = cfg.dataDir; - StateDirectory = cfg.dataDir; - StateDirectoryMode = 700; - Restart = "always"; - User = "cfssl"; + serviceConfig = lib.mkMerge [ + { + WorkingDirectory = cfg.dataDir; + Restart = "always"; + User = "cfssl"; + Group = "cfssl"; - ExecStart = with cfg; let - opt = n: v: optionalString (v != null) ''-${n}="${v}"''; - in - lib.concatStringsSep " \\\n" [ - "${pkgs.cfssl}/bin/cfssl serve" - (opt "address" address) - (opt "port" (toString port)) - (opt "ca" ca) - (opt "ca-key" caKey) - (opt "ca-bundle" caBundle) - (opt "int-bundle" intBundle) - (opt "int-dir" intDir) - (opt "metadata" metadata) - (opt "remote" remote) - (opt "config" configFile) - (opt "responder" responder) - (opt "responder-key" responderKey) - (opt "tls-key" tlsKey) - (opt "tls-cert" tlsCert) - (opt "mutual-tls-ca" mutualTlsCa) - (opt "mutual-tls-cn" mutualTlsCn) - (opt "mutual-tls-client-key" mutualTlsClientKey) - (opt "mutual-tls-client-cert" mutualTlsClientCert) - (opt "tls-remote-ca" tlsRemoteCa) - (opt "db-config" dbConfig) - (opt "loglevel" (toString logLevel)) - ]; - }; + ExecStart = with cfg; let + opt = n: v: optionalString (v != null) ''-${n}="${v}"''; + in + lib.concatStringsSep " \\\n" [ + "${pkgs.cfssl}/bin/cfssl serve" + (opt "address" address) + (opt "port" (toString port)) + (opt "ca" ca) + (opt "ca-key" caKey) + (opt "ca-bundle" caBundle) + (opt "int-bundle" intBundle) + (opt "int-dir" intDir) + (opt "metadata" metadata) + (opt "remote" remote) + (opt "config" configFile) + (opt "responder" responder) + (opt "responder-key" responderKey) + (opt "tls-key" tlsKey) + (opt "tls-cert" tlsCert) + (opt "mutual-tls-ca" mutualTlsCa) + (opt "mutual-tls-cn" mutualTlsCn) + (opt "mutual-tls-client-key" mutualTlsClientKey) + (opt "mutual-tls-client-cert" mutualTlsClientCert) + (opt "tls-remote-ca" tlsRemoteCa) + (opt "db-config" dbConfig) + (opt "loglevel" (toString logLevel)) + ]; + } + (mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) { + StateDirectory = baseNameOf cfg.dataDir; + StateDirectoryMode = 700; + }) + ]; }; services.cfssl = { diff --git a/third_party/nixpkgs/nixos/modules/services/security/haveged.nix b/third_party/nixpkgs/nixos/modules/services/security/haveged.nix index 22ece18834..57cef7e44d 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/haveged.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/haveged.nix @@ -3,12 +3,10 @@ with lib; let - cfg = config.services.haveged; in - { ###### interface @@ -17,14 +15,11 @@ in services.haveged = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable to haveged entropy daemon, which refills - /dev/random when low. - ''; - }; + enable = mkEnableOption '' + haveged entropy daemon, which refills /dev/random when low. + NOTE: does nothing on kernels newer than 5.6. + ''; + # source for the note https://github.com/jirka-h/haveged/issues/57 refill_threshold = mkOption { type = types.int; @@ -39,29 +34,44 @@ in }; - - ###### implementation - config = mkIf cfg.enable { - systemd.services.haveged = - { description = "Entropy Harvesting Daemon"; - unitConfig.Documentation = "man:haveged(8)"; - wantedBy = [ "multi-user.target" ]; + # https://github.com/jirka-h/haveged/blob/a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f/contrib/Fedora/haveged.service + systemd.services.haveged = { + description = "Entropy Daemon based on the HAVEGE algorithm"; + unitConfig = { + Documentation = "man:haveged(8)"; + DefaultDependencies = false; + ConditionKernelVersion = "<5.6"; + }; + wantedBy = [ "sysinit.target" ]; + after = [ "systemd-tmpfiles-setup-dev.service" ]; + before = [ "sysinit.target" "shutdown.target" "systemd-journald.service" ]; - path = [ pkgs.haveged ]; - - serviceConfig = { - ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1"; - SuccessExitStatus = 143; - PrivateTmp = true; - PrivateDevices = true; - PrivateNetwork = true; - ProtectSystem = "full"; - ProtectHome = true; - }; + serviceConfig = { + ExecStart = "${pkgs.haveged}/bin/haveged -w ${toString cfg.refill_threshold} --Foreground -v 1"; + Restart = "always"; + SuccessExitStatus = "137 143"; + SecureBits = "noroot-locked"; + CapabilityBoundingSet = [ "CAP_SYS_ADMIN" "CAP_SYS_CHROOT" ]; + # We can *not* set PrivateTmp=true as it can cause an ordering cycle. + PrivateTmp = false; + PrivateDevices = true; + ProtectSystem = "full"; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + RestrictNamespaces = true; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "newuname" "~@mount" ]; + SystemCallErrorNumber = "EPERM"; }; + }; }; } 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 71088fc4dc..fd459f70cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -131,7 +131,7 @@ in { users.groups.vaultwarden = { }; systemd.services.vaultwarden = { - aliases = [ "bitwarden_rs" ]; + aliases = [ "bitwarden_rs.service" ]; after = [ "network.target" ]; path = with pkgs; [ openssl ]; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix b/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix index eb82b738e4..8c6a6e294e 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix @@ -52,11 +52,22 @@ in ''; }; + network.enable = mkOption { + type = types.bool; + default = false; + description = '' + Allow the cloud-init service to configure network interfaces + through systemd-networkd. + ''; + }; + config = mkOption { type = types.str; default = '' system_info: distro: nixos + network: + renderers: [ 'networkd' ] users: - root @@ -109,9 +120,12 @@ in environment.etc."cloud/cloud.cfg".text = cfg.config; + systemd.network.enable = cfg.network.enable; + systemd.services.cloud-init-local = { description = "Initial cloud-init job (pre-networking)"; wantedBy = [ "multi-user.target" ]; + before = ["systemd-networkd.service"]; path = path; serviceConfig = { Type = "oneshot"; @@ -129,7 +143,7 @@ in "sshd.service" "sshd-keygen.service" ]; after = [ "network-online.target" "cloud-init-local.service" ]; before = [ "sshd.service" "sshd-keygen.service" ]; - requires = [ "network.target "]; + requires = [ "network.target"]; path = path; serviceConfig = { Type = "oneshot"; diff --git a/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix b/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix index 33d15e08f4..d7130a13c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix @@ -126,6 +126,8 @@ in config = lib.mkIf cfg.enable { systemd.services.self-deploy = { + inherit (cfg) startAt; + wantedBy = [ "multi-user.target" ]; requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ]; @@ -138,8 +140,7 @@ in path = with pkgs; [ git nix - systemd - ]; + ] ++ lib.optionals (cfg.switchCommand == "boot") [ systemd ]; script = '' if [ ! -e ${repositoryDirectory} ]; then diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix index 54eaea63b6..64a2767fab 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix @@ -385,13 +385,13 @@ in { else if isString v then v else if true == v then "true" else if false == v then "false" - else if isSecret v then v._secret + else if isSecret v then hashString "sha256" v._secret else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; }; }; secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.config); mkSecretReplacement = file: '' - replace-secret ${escapeShellArgs [ file file "${cfg.dataDir}/.env" ]} + replace-secret ${escapeShellArgs [ (builtins.hashString "sha256" file) file "${cfg.dataDir}/.env" ]} ''; secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths; filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ {} null ])) cfg.config; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix new file mode 100644 index 0000000000..d74def59c6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ethercalc; +in { + options = { + services.ethercalc = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + ethercalc, an online collaborative spreadsheet server. + + Persistent state will be maintained under + /var/lib/ethercalc. Upstream supports using a + redis server for storage and recommends the redis backend for + intensive use; however, the Nix module doesn't currently support + redis. + + Note that while ethercalc is a good and robust project with an active + issue tracker, there haven't been new commits since the end of 2020. + ''; + }; + + package = mkOption { + default = pkgs.ethercalc; + defaultText = literalExpression "pkgs.ethercalc"; + type = types.package; + description = "Ethercalc package to use."; + }; + + host = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Address to listen on (use 0.0.0.0 to allow access from any address)."; + }; + + port = mkOption { + type = types.port; + default = 8000; + description = "Port to bind to."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.ethercalc = { + description = "Ethercalc service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${cfg.package}/bin/ethercalc --host ${cfg.host} --port ${toString cfg.port}"; + Restart = "always"; + StateDirectory = "ethercalc"; + WorkingDirectory = "/var/lib/ethercalc"; + }; + }; + }; +} 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 026bde2a92..14cbfb3954 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.miniflux; + defaultAddress = "localhost:8080"; + dbUser = "miniflux"; dbPassword = "miniflux"; dbHost = "localhost"; @@ -31,7 +33,7 @@ in { options = { services.miniflux = { - enable = mkEnableOption "miniflux"; + enable = mkEnableOption "miniflux and creates a local postgres database for it"; config = mkOption { type = types.attrsOf types.str; @@ -45,6 +47,9 @@ in Configuration for Miniflux, refer to for documentation on the supported values. + + Correct configuration for the database is already provided. + By default, listens on ${defaultAddress}. ''; }; @@ -64,7 +69,7 @@ in config = mkIf cfg.enable { services.miniflux.config = { - LISTEN_ADDR = mkDefault "localhost:8080"; + LISTEN_ADDR = mkDefault defaultAddress; DATABASE_URL = "postgresql://${dbUser}:${dbPassword}@${dbHost}/${dbName}?sslmode=disable"; RUN_MIGRATIONS = "1"; CREATE_ADMIN = "1"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix index b6c48186a1..5d550ae5ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix @@ -10,8 +10,7 @@ in { enable = mkEnableOption "plausible"; releaseCookiePath = mkOption { - default = null; - type = with types; nullOr (either str path); + type = with types; either str path; description = '' The path to the file with release cookie. (used for remote connection to the running node). ''; @@ -235,6 +234,8 @@ in { script = '' export CONFIG_DIR=$CREDENTIALS_DIRECTORY + export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" + # setup ${pkgs.plausible}/createdb.sh ${pkgs.plausible}/migrate.sh @@ -243,10 +244,8 @@ in { psql -d plausible <<< "UPDATE users SET email_verified=true;" fi ''} - ${optionalString (cfg.releaseCookiePath != null) '' - export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" - ''} - plausible start + + exec plausible start ''; serviceConfig = { @@ -257,8 +256,8 @@ in { LoadCredential = [ "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" - ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"] - ++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"]; + "RELEASE_COOKIE:${cfg.releaseCookiePath}" + ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; }; }; } 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 a8610047f5..6876dbf39d 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 @@ -924,7 +924,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid @mincore" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ]; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/shellinabox.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/shellinabox.nix deleted file mode 100644 index c7c51f873e..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/shellinabox.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.shellinabox; - - # If a certificate file is specified, shellinaboxd requires - # a file descriptor to retrieve it - fd = "3"; - createFd = optionalString (cfg.certFile != null) "${fd}<${cfg.certFile}"; - - # Command line arguments for the shellinabox daemon - args = [ "--background" ] - ++ optional (! cfg.enableSSL) "--disable-ssl" - ++ optional (cfg.certFile != null) "--cert-fd=${fd}" - ++ optional (cfg.certDirectory != null) "--cert=${cfg.certDirectory}" - ++ cfg.extraOptions; - - # Command to start shellinaboxd - cmd = "${pkgs.shellinabox}/bin/shellinaboxd ${concatStringsSep " " args}"; - - # Command to start shellinaboxd if certFile is specified - wrappedCmd = "${pkgs.bash}/bin/bash -c 'exec ${createFd} && ${cmd}'"; - -in - -{ - - ###### interface - - options = { - services.shellinabox = { - enable = mkEnableOption "shellinabox daemon"; - - user = mkOption { - type = types.str; - default = "root"; - description = '' - User to run shellinaboxd as. If started as root, the server drops - privileges by changing to nobody, unless overridden by the - --user option. - ''; - }; - - enableSSL = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable SSL (https) support. - ''; - }; - - certDirectory = mkOption { - type = types.nullOr types.path; - default = null; - example = "/var/certs"; - description = '' - The daemon will look in this directory far any certificates. - If the browser negotiated a Server Name Identification the daemon - will look for a matching certificate-SERVERNAME.pem file. If no SNI - handshake takes place, it will fall back on using the certificate in the - certificate.pem file. - - If no suitable certificate is installed, shellinaboxd will attempt to - create a new self-signed certificate. This will only succeed if, after - dropping privileges, shellinaboxd has write permissions for this - directory. - ''; - }; - - certFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/var/certificate.pem"; - description = "Path to server SSL certificate."; - }; - - extraOptions = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "--port=443" "--service /:LOGIN" ]; - description = '' - A list of strings to be appended to the command line arguments - for shellinaboxd. Please see the manual page - - for a full list of available arguments. - ''; - }; - - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - - assertions = - [ { assertion = cfg.enableSSL == true - -> cfg.certDirectory != null || cfg.certFile != null; - message = "SSL is enabled for shellinabox, but no certDirectory or certFile has been specefied."; } - { assertion = ! (cfg.certDirectory != null && cfg.certFile != null); - message = "Cannot set both certDirectory and certFile for shellinabox."; } - ]; - - systemd.services.shellinaboxd = { - description = "Shellinabox Web Server Daemon"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "sshd.service" ]; - after = [ "sshd.service" ]; - - serviceConfig = { - Type = "forking"; - User = "${cfg.user}"; - ExecStart = "${if cfg.certFile == null then "${cmd}" else "${wrappedCmd}"}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix index 6ee5b0fc54..8247a7e381 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix - ./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix + ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix ]; 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 efc9bd39b3..e232378514 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 @@ -569,6 +569,7 @@ in atomix five-or-more four-in-a-row + pkgs.gnome-2048 gnome-chess gnome-klotski gnome-mahjongg diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml index e5da774019..807c9d64e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml @@ -249,14 +249,5 @@ services.xserver.desktopManager.gnome = { See this issue.
- -
- Why does <literal>nixos-rebuild switch</literal> sometimes kill my session? - - - This is a known issue without any workarounds. - If you are doing a fairly large upgrade, it is probably safer to use nixos-rebuild boot. - -
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 980a6b939d..6a7d2a8aa6 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 @@ -135,6 +135,7 @@ in services.bamf.enable = true; services.colord.enable = mkDefault true; services.fwupd.enable = mkDefault true; + services.packagekit.enable = mkDefault true; services.touchegg.enable = mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; services.tumbler.enable = mkDefault true; @@ -224,7 +225,6 @@ in programs.file-roller.package = pkgs.pantheon.file-roller; # Settings from elementary-default-settings - environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; xdg.portal.extraPortals = with pkgs.pantheon; [ @@ -273,7 +273,7 @@ in }) (mkIf serviceCfg.apps.enable { - environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [ + environment.systemPackages = with pkgs.pantheon; pkgs.gnome.removePackagesByName ([ elementary-calculator elementary-calendar elementary-camera @@ -287,7 +287,11 @@ in elementary-terminal elementary-videos epiphany - ] config.environment.pantheon.excludePackages); + ] ++ lib.optionals config.services.flatpak.enable [ + # Only install appcenter if flatpak is enabled before + # https://github.com/NixOS/nixpkgs/issues/15932 is resolved. + appcenter + ]) config.environment.pantheon.excludePackages; # needed by screenshot fonts.fonts = [ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml index fe0a1c4962..202909d398 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -105,10 +105,10 @@ switchboard-with-plugs.override { - AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this issue. + AppCenter has been available since 20.03. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this issue. - To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote: + If you are using Pantheon, AppCenter should be installed by default if you have Flatpak support enabled. If you also wish to add the appcenter Flatpak remote: $ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix new file mode 100644 index 0000000000..d471673d45 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.xserver.desktopManager.retroarch; + +in { + options.services.xserver.desktopManager.retroarch = { + enable = mkEnableOption "RetroArch"; + + package = mkOption { + type = types.package; + default = pkgs.retroarch; + defaultText = literalExpression "pkgs.retroarch"; + example = literalExpression "pkgs.retroarch-full"; + description = "RetroArch package to use."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--verbose" "--host" ]; + description = "Extra arguments to pass to RetroArch."; + }; + }; + + config = mkIf cfg.enable { + services.xserver.desktopManager.session = [{ + name = "RetroArch"; + start = '' + ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} & + waitPID=$! + ''; + }]; + + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = with maintainers; [ j0hax ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 6f0d645725..b1dc6643be 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -53,6 +53,8 @@ in "autoLogin" "user" ]) + + (mkRemovedOptionModule [ "services" "xserver" "displayManager" "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.") ]; meta = { @@ -83,17 +85,6 @@ in default = true; description = '' Allow GDM to run on Wayland instead of Xserver. - Note to enable Wayland with Nvidia the - must not be disabled. - ''; - }; - - nvidiaWayland = mkOption { - type = types.bool; - default = true; - description = '' - Whether to allow wayland to be used with the proprietary - NVidia graphics driver. ''; }; @@ -149,7 +140,8 @@ in environment = { GDM_X_SERVER_EXTRA_ARGS = toString (filter (arg: arg != "-terminate") cfg.xserverArgs); - XDG_DATA_DIRS = "${cfg.sessionData.desktops}/share/"; + # GDM is needed for gnome-login.session + XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share"; } // optionalAttrs (xSessionWrapper != null) { # Make GDM use this wrapper before running the session, which runs the # configured setupCommands. This relies on a patched GDM which supports @@ -230,19 +222,6 @@ in services.dbus.packages = [ gdm ]; - # We duplicate upstream's udev rules manually to make wayland with nvidia configurable - services.udev.extraRules = '' - # disable Wayland on Cirrus chipsets - ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - # disable Wayland on Hi1710 chipsets - ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - ${optionalString (!cfg.gdm.nvidiaWayland) '' - DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - ''} - # disable Wayland when modesetting is disabled - IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - ''; - systemd.user.services.dbus.wantedBy = [ "default.target" ]; programs.dconf.profiles.gdm = diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh index f86d464122..8fcc1f0297 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh @@ -282,6 +282,9 @@ checkFS() { # Don't check resilient COWs as they validate the fs structures at mount time if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi + # Skip fsck for apfs as the fsck utility does not support repairing the filesystem (no -a option) + if [ "$fsType" = apfs ]; then return 0; fi + # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. if [ "$fsType" = nilfs2 ]; then return 0; fi 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 9c684fbada..1575c0257d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -350,6 +350,9 @@ let ''; symlink = "/etc/modprobe.d/ubuntu.conf"; } + { object = config.environment.etc."modprobe.d/nixos.conf".source; + symlink = "/etc/modprobe.d/nixos.conf"; + } { object = pkgs.kmod-debian-aliases; symlink = "/etc/modprobe.d/debian.conf"; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 76c59c047e..9dcf9eb769 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -25,9 +25,11 @@ let "nss-lookup.target" "nss-user-lookup.target" "time-sync.target" + ] ++ (optionals cfg.package.withCryptsetup [ "cryptsetup.target" "cryptsetup-pre.target" "remote-cryptsetup.target" + ]) ++ [ "sigpwr.target" "timers.target" "paths.target" diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix new file mode 100644 index 0000000000..7801049501 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc-activation.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +let + inherit (lib) stringAfter; +in { + + imports = [ ./etc.nix ]; + + config = { + system.activationScripts.etc = + stringAfter [ "users" "groups" ] config.system.build.etcActivationCommands; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix index 6cc8c341e6..ed552fecec 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix @@ -66,6 +66,8 @@ in { + imports = [ ../build.nix ]; + ###### interface options = { @@ -188,14 +190,12 @@ in config = { system.build.etc = etc; - - system.activationScripts.etc = stringAfter [ "users" "groups" ] + system.build.etcActivationCommands = '' # Set up the statically computed bits of /etc. echo "setting up /etc..." ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl ${./setup-etc.pl} ${etc}/etc ''; - }; } diff --git a/third_party/nixpkgs/nixos/modules/system/etc/test.nix b/third_party/nixpkgs/nixos/modules/system/etc/test.nix new file mode 100644 index 0000000000..5e43b15503 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/system/etc/test.nix @@ -0,0 +1,70 @@ +{ lib +, coreutils +, fakechroot +, fakeroot +, evalMinimalConfig +, pkgsModule +, runCommand +, util-linux +, vmTools +, writeText +}: +let + node = evalMinimalConfig ({ config, ... }: { + imports = [ pkgsModule ../etc/etc.nix ]; + environment.etc."passwd" = { + text = passwdText; + }; + environment.etc."hosts" = { + text = hostsText; + mode = "0751"; + }; + }); + passwdText = '' + root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash + ''; + hostsText = '' + 127.0.0.1 localhost + ::1 localhost + # testing... + ''; +in +lib.recurseIntoAttrs { + test-etc-vm = + vmTools.runInLinuxVM (runCommand "test-etc-vm" { } '' + mkdir -p /etc + ${node.config.system.build.etcActivationCommands} + set -x + [[ -L /etc/passwd ]] + diff /etc/passwd ${writeText "expected-passwd" passwdText} + [[ 751 = $(stat --format %a /etc/hosts) ]] + diff /etc/hosts ${writeText "expected-hosts" hostsText} + set +x + touch $out + ''); + + # fakeroot is behaving weird + test-etc-fakeroot = + runCommand "test-etc" + { + nativeBuildInputs = [ + fakeroot + fakechroot + # for chroot + coreutils + # fakechroot needs getopt, which is provided by util-linux + util-linux + ]; + fakeRootCommands = '' + mkdir -p /etc + ${node.config.system.build.etcActivationCommands} + diff /etc/hosts ${writeText "expected-hosts" hostsText} + touch $out + ''; + } '' + mkdir fake-root + export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out + fakechroot fakeroot chroot $PWD/fake-root bash -c 'source $stdenv/setup; eval "$fakeRootCommands"' + ''; + +} diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix index 225bcbe58e..f3da677119 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -250,7 +250,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; + fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/apfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/apfs.nix new file mode 100644 index 0000000000..2f2be351df --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/apfs.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems; + +in + +{ + config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.apfsprogs ]; + + boot.extraModulePackages = [ config.boot.kernelPackages.apfs ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "apfs" ]; + + # Don't copy apfsck into the initramfs since it does not support repairing the filesystem + }; +} diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 1dac405ac3..5c91993771 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -305,7 +305,7 @@ let enable = mkOption { type = types.bool; default = false; - description = "Wether to enable wol on this interface."; + description = "Whether to enable wol on this interface."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index a7011be7e0..01447e6ada 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -109,6 +109,10 @@ in # Allow very slow start DefaultTimeoutStartSec=300 ''; + systemd.user.extraConfig = '' + # Allow very slow start + DefaultTimeoutStartSec=300 + ''; boot.consoleLogLevel = 7; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix index fe248a9448..bd7077ff7e 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix @@ -155,7 +155,7 @@ in systemd.services."serial-getty@ttyS0".enable = true; # Creates symlinks for block device names. - services.udev.packages = [ pkgs.ec2-utils ]; + services.udev.packages = [ pkgs.amazon-ec2-utils ]; # Force getting the hostname from EC2. networking.hostName = mkDefault ""; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix index 0e7f050314..d371f67ecd 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix @@ -76,7 +76,11 @@ in # needs newuidmap from pkgs.shadow path = [ "/run/wrappers" ]; environment = proxy_env; - unitConfig.StartLimitInterval = "60s"; + unitConfig = { + # docker-rootless doesn't support running as root. + ConditionUser = "!root"; + StartLimitInterval = "60s"; + }; serviceConfig = { Type = "notify"; ExecStart = "${cfg.package}/bin/dockerd-rootless --config-file=${daemonSettingsFile}"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash b/third_party/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash deleted file mode 100644 index 4a86019611..0000000000 --- a/third_party/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -WGET() { - wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google' "$@" -} - -# When dealing with cryptographic keys, we want to keep things private. -umask 077 -mkdir -p /root/.ssh - -echo "Fetching authorized keys..." -WGET -O /tmp/auth_keys http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys - -# Read keys one by one, split in case Google decided -# to append metadata (it does sometimes) and add to -# authorized_keys if not already present. -touch /root/.ssh/authorized_keys -while IFS='' read -r line || [[ -n "$line" ]]; do - keyLine=$(echo -n "$line" | cut -d ':' -f2) - IFS=' ' read -r -a array <<<"$keyLine" - if [[ ${#array[@]} -ge 3 ]]; then - echo "${array[@]:0:3}" >>/tmp/new_keys - echo "Added ${array[*]:2} to authorized_keys" - fi -done /tmp/mnt/test.txt", + "[ ! -f /tmp/mnt/TeSt.TxT ] || false", # Test case sensitivity + "echo 'Hello World 1' | diff - /tmp/mnt/test.txt", + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "[ ! -f /tmp/mnt/\u00e1.txt ] || false", # Test Unicode normalization sensitivity + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + with subtest("Disable case sensitivity and normalization sensitivity"): + machine.succeed( + "mkapfs /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'bla bla bla' > /tmp/mnt/Test.txt", + "echo -n 'Hello World' > /tmp/mnt/test.txt", + "echo ' 1' >> /tmp/mnt/TEST.TXT", + "umount /tmp/mnt", + "apfsck /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'Hello World 1' | diff - /tmp/mnt/TeSt.TxT", # Test case insensitivity + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u00e1.txt", # Test Unicode normalization + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/breitbandmessung.nix b/third_party/nixpkgs/nixos/tests/breitbandmessung.nix new file mode 100644 index 0000000000..12b1a09483 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/breitbandmessung.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "breitbandmessung"; + meta.maintainers = with lib.maintainers; [ b4dm4n ]; + + machine = { pkgs, ... }: { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + # increase screen size to make the whole program visible + virtualisation.resolution = { x = 1280; y = 1024; }; + + test-support.displayManager.auto.user = "alice"; + + environment.systemPackages = with pkgs; [ breitbandmessung ]; + environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; + + # breitbandmessung is unfree + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "breitbandmessung" ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + machine.execute("su - alice -c breitbandmessung >&2 &") + machine.wait_for_window("Breitbandmessung") + machine.wait_for_text("Breitbandmessung") + machine.wait_for_text("Datenschutz") + machine.screenshot("breitbandmessung") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/cloud-init.nix b/third_party/nixpkgs/nixos/tests/cloud-init.nix index e06cbd056a..3f191ff561 100644 --- a/third_party/nixpkgs/nixos/tests/cloud-init.nix +++ b/third_party/nixpkgs/nixos/tests/cloud-init.nix @@ -35,6 +35,24 @@ let public-keys: - "${snakeOilPublicKey}" EOF + + cat << EOF > $out/iso/network-config + version: 1 + config: + - type: physical + name: eth0 + mac_address: '52:54:00:12:34:56' + subnets: + - type: static + address: '12.34.56.78' + netmask: '255.255.255.0' + gateway: '12.34.56.9' + - type: nameserver + address: + - '8.8.8.8' + search: + - 'example.com' + EOF ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso ''; }; @@ -46,9 +64,13 @@ in makeTest { machine = { ... }: { virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; - services.cloud-init.enable = true; + services.cloud-init = { + enable = true; + network.enable = true; + }; services.openssh.enable = true; networking.hostName = ""; + networking.useDHCP = false; }; testScript = '' # To wait until cloud-init terminates its run @@ -80,5 +102,8 @@ in makeTest { ).strip() == "test" ) + + assert "default via 12.34.56.9 dev eth0 proto static" in unnamed.succeed("ip route") + assert "12.34.56.0/24 dev eth0 proto kernel scope link src 12.34.56.78" in unnamed.succeed("ip route") ''; } diff --git a/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix b/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix index dea660ed05..72c87d7153 100644 --- a/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix +++ b/third_party/nixpkgs/nixos/tests/google-oslogin/default.nix @@ -31,10 +31,10 @@ in { # mockserver should return a non-expired ssh key for both mockuser and mockadmin server.succeed( - f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' ) server.succeed( - f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' ) # install snakeoil ssh key on the client, and provision .ssh/config file diff --git a/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix b/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix index a0a3144ae6..faf5e847d7 100644 --- a/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix +++ b/third_party/nixpkgs/nixos/tests/google-oslogin/server.nix @@ -23,7 +23,5 @@ in { security.googleOsLogin.enable = true; # Mock google service - networking.extraHosts = '' - 127.0.0.1 metadata.google.internal - ''; + networking.interfaces.lo.ipv4.addresses = [ { address = "169.254.169.254"; prefixLength = 32; } ]; } diff --git a/third_party/nixpkgs/nixos/tests/google-oslogin/server.py b/third_party/nixpkgs/nixos/tests/google-oslogin/server.py old mode 100644 new mode 100755 diff --git a/third_party/nixpkgs/nixos/tests/haproxy.nix b/third_party/nixpkgs/nixos/tests/haproxy.nix index 2c3878131b..b6ff4102fe 100644 --- a/third_party/nixpkgs/nixos/tests/haproxy.nix +++ b/third_party/nixpkgs/nixos/tests/haproxy.nix @@ -16,7 +16,6 @@ import ./make-test-python.nix ({ pkgs, ...}: { frontend http bind *:80 mode http - option http-use-htx http-request use-service prometheus-exporter if { path /metrics } use_backend http_server ''; diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 761020571f..5525c3117b 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -306,6 +306,9 @@ let # The test cannot access the network, so any packages we # need must be included in the VM. system.extraDependencies = with pkgs; [ + brotli + brotli.dev + brotli.lib desktop-file-utils docbook5 docbook_xsl_ns @@ -315,6 +318,7 @@ let ntp perlPackages.ListCompare perlPackages.XMLLibXML + python3Minimal shared-mime-info sudo texinfo diff --git a/third_party/nixpkgs/nixos/tests/moosefs.nix b/third_party/nixpkgs/nixos/tests/moosefs.nix new file mode 100644 index 0000000000..0dc08748b8 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/moosefs.nix @@ -0,0 +1,89 @@ +import ./make-test-python.nix ({ pkgs, ... } : + +let + master = { pkgs, ... } : { + # data base is stored in memory + # server crashes with default memory size + virtualisation.memorySize = 1024; + + services.moosefs.master = { + enable = true; + openFirewall = true; + exports = [ + "* / rw,alldirs,admin,maproot=0:0" + "* . rw" + ]; + }; + }; + + chunkserver = { pkgs, ... } : { + virtualisation.emptyDiskImages = [ 4096 ]; + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + fileSystems = pkgs.lib.mkVMOverride { + "/data" = { + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; + + services.moosefs = { + masterHost = "master"; + chunkserver = { + openFirewall = true; + enable = true; + hdds = [ "~/data" ]; + }; + }; + }; + + metalogger = { pkgs, ... } : { + services.moosefs = { + masterHost = "master"; + metalogger.enable = true; + }; + }; + + client = { pkgs, ... } : { + services.moosefs.client.enable = true; + }; + +in { + name = "moosefs"; + + nodes= { + inherit master; + inherit metalogger; + chunkserver1 = chunkserver; + chunkserver2 = chunkserver; + client1 = client; + client2 = client; + }; + + testScript = '' + # prepare master server + master.start() + master.wait_for_unit("multi-user.target") + master.succeed("mfsmaster-init") + master.succeed("systemctl restart mfs-master") + master.wait_for_unit("mfs-master.service") + + metalogger.wait_for_unit("mfs-metalogger.service") + + for chunkserver in [chunkserver1, chunkserver2]: + chunkserver.wait_for_unit("multi-user.target") + chunkserver.succeed("chown moosefs:moosefs /data") + chunkserver.succeed("systemctl restart mfs-chunkserver") + chunkserver.wait_for_unit("mfs-chunkserver.service") + + for client in [client1, client2]: + client.wait_for_unit("multi-user.target") + client.succeed("mkdir /moosefs") + client.succeed("mount -t moosefs master:/ /moosefs") + + client1.succeed("echo test > /moosefs/file") + client2.succeed("grep test /moosefs/file") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/mysql/common.nix b/third_party/nixpkgs/nixos/tests/mysql/common.nix index 968253d109..040d360b6d 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/common.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/common.nix @@ -3,7 +3,7 @@ inherit (pkgs.darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }); - mysqlPackage = { + mysqlPackages = { inherit (pkgs) mysql57 mysql80; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; diff --git a/third_party/nixpkgs/nixos/tests/mysql/mysql.nix b/third_party/nixpkgs/nixos/tests/mysql/mysql.nix index a5e42f85a7..197e6da80e 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mysql.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mysql.nix @@ -142,7 +142,7 @@ let in lib.mapAttrs (_: package: makeMySQLTest { inherit package; - hasRocksDB = false; hasMroonga = false; + hasRocksDB = false; hasMroonga = false; useSocketAuth = false; }) mysqlPackages // (lib.mapAttrs (_: package: makeMySQLTest { inherit package; diff --git a/third_party/nixpkgs/nixos/tests/noto-fonts.nix b/third_party/nixpkgs/nixos/tests/noto-fonts.nix new file mode 100644 index 0000000000..049dc766bd --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/noto-fonts.nix @@ -0,0 +1,44 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "noto-fonts"; + meta = { + maintainers = with lib.maintainers; [ nickcao midchildan ]; + }; + + machine = { + imports = [ ./common/x11.nix ]; + environment.systemPackages = [ pkgs.gnome.gedit ]; + fonts = { + enableDefaultFonts = false; + fonts = with pkgs;[ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + ]; + fontconfig.defaultFonts = { + serif = [ "Noto Serif" "Noto Serif CJK SC" ]; + sansSerif = [ "Noto Sans" "Noto Sans CJK SC" ]; + monospace = [ "Noto Sans Mono" "Noto Sans Mono CJK SC" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + }; + + testScript = + # extracted from http://www.clagnut.com/blog/2380/ + let testText = builtins.toFile "test.txt" '' + the quick brown fox jumps over the lazy dog + 視野無限廣，窗外有藍天 + Eĥoŝanĝo ĉiuĵaŭde. + いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす + 다람쥐 헌 쳇바퀴에 타고파 + 中国智造，慧及全球 + ''; in + '' + machine.wait_for_x() + machine.succeed("gedit ${testText} >&2 &") + machine.wait_for_window(".* - gedit") + machine.sleep(10) + machine.screenshot("screen") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/plausible.nix b/third_party/nixpkgs/nixos/tests/plausible.nix index 45e11f0270..58c1dd5cf4 100644 --- a/third_party/nixpkgs/nixos/tests/plausible.nix +++ b/third_party/nixpkgs/nixos/tests/plausible.nix @@ -8,6 +8,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { virtualisation.memorySize = 4096; services.plausible = { enable = true; + releaseCookiePath = "${pkgs.runCommand "cookie" { } '' + ${pkgs.openssl}/bin/openssl rand -base64 64 >"$out" + ''}"; adminUser = { email = "admin@example.org"; passwordFile = "${pkgs.writeText "pwd" "foobar"}"; diff --git a/third_party/nixpkgs/nixos/tests/retroarch.nix b/third_party/nixpkgs/nixos/tests/retroarch.nix new file mode 100644 index 0000000000..4c96f9eabc --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/retroarch.nix @@ -0,0 +1,49 @@ +import ./make-test-python.nix ({ pkgs, ... }: + + { + name = "retroarch"; + meta = with pkgs.lib.maintainers; { maintainers = [ j0hax ]; }; + + machine = { ... }: + + { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.desktopManager.retroarch = { + enable = true; + package = pkgs.retroarchFull; + }; + services.xserver.displayManager = { + sddm.enable = true; + defaultSession = "RetroArch"; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + }; + + testScript = { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + xdo = "${pkgs.xdotool}/bin/xdotool"; + in '' + with subtest("Wait for login"): + start_all() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + + with subtest("Check RetroArch started"): + machine.wait_until_succeeds("pgrep retroarch") + machine.wait_for_window("^RetroArch ") + + with subtest("Check configuration created"): + machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg") + + with subtest("Wait to get a screenshot"): + machine.execute( + "${xdo} key Alt+F1 sleep 10" + ) + machine.screenshot("screen") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/ssh-keys.nix b/third_party/nixpkgs/nixos/tests/ssh-keys.nix index 07d422196e..df9ff38a3b 100644 --- a/third_party/nixpkgs/nixos/tests/ssh-keys.nix +++ b/third_party/nixpkgs/nixos/tests/ssh-keys.nix @@ -10,6 +10,6 @@ pkgs: snakeOilPublicKey = pkgs.lib.concatStrings [ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" - "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" + "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil" ]; } diff --git a/third_party/nixpkgs/nixos/tests/sudo.nix b/third_party/nixpkgs/nixos/tests/sudo.nix index ae9362ca70..661fe9989e 100644 --- a/third_party/nixpkgs/nixos/tests/sudo.nix +++ b/third_party/nixpkgs/nixos/tests/sudo.nix @@ -28,6 +28,10 @@ in enable = true; wheelNeedsPassword = false; + extraConfig = '' + Defaults lecture="never" + ''; + extraRules = [ # SUDOERS SYNTAX CHECK (Test whether the module produces a valid output; # errors being detected by the visudo checks. diff --git a/third_party/nixpkgs/nixos/tests/sway.nix b/third_party/nixpkgs/nixos/tests/sway.nix index 43b8c84730..1e9e146c4b 100644 --- a/third_party/nixpkgs/nixos/tests/sway.nix +++ b/third_party/nixpkgs/nixos/tests/sway.nix @@ -1,6 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: - -{ +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "sway"; meta = { maintainers = with lib.maintainers; [ primeos synthetica ]; @@ -70,6 +68,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: enableOCR = true; testScript = { nodes, ... }: '' + import shlex + + def swaymsg(command: str, succeed=True): + with machine.nested(f"sending swaymsg {command!r}" + " (allowed to fail)" * (not succeed)): + (machine.succeed if succeed else machine.execute)( + f"su - alice -c {shlex.quote('swaymsg -- ' + command)}" + ) + start_all() machine.wait_for_unit("multi-user.target") @@ -81,9 +87,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: machine.wait_for_file("/tmp/sway-ipc.sock") # Test XWayland (foot does not support X): - machine.succeed( - "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'" - ) + swaymsg("exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty") machine.wait_for_text("alice@machine") machine.send_chars("test-x11\n") machine.wait_for_file("/tmp/test-x11-exit-ok") @@ -107,9 +111,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if # $WAYLAND_DISPLAY is correctly imported into the D-Bus user env): - machine.succeed( - "su - alice -c 'swaymsg -- exec gpg --no-tty --yes --quick-generate-key test'" - ) + swaymsg("exec gpg --no-tty --yes --quick-generate-key test") machine.wait_until_succeeds("pgrep --exact gpg") machine.wait_for_text("Passphrase") machine.screenshot("gpg_pinentry") @@ -121,8 +123,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: machine.wait_for_text("You pressed the exit shortcut.") machine.screenshot("sway_exit") + swaymsg("exec swaylock") + machine.wait_until_succeeds("pgrep -x swaylock") + machine.sleep(3) + machine.send_chars("${nodes.machine.config.users.users.alice.password}") + machine.send_key("ret") + machine.wait_until_fails("pgrep -x swaylock") + # Exit Sway and verify process exit status 0: - machine.succeed("su - alice -c 'swaymsg exit || true'") + swaymsg("exit", succeed=False) machine.wait_until_fails("pgrep -x sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 68836c7307..37a89fc21e 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -36,19 +36,10 @@ import ./make-test-python.nix ({pkgs, ...}: { }; # Since we want to program the routes that we delegate to the "customer" - # into our routing table we must have a way to gain the required privs. - # This security wrapper will do in our test setup. - # - # DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice. - # Everyone on the "isp" machine will be able to add routes to the kernel. - security.wrappers.add-dhcpd-lease = { - owner = "root"; - group = "root"; - source = pkgs.writeShellScript "add-dhcpd-lease" '' - exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2" - ''; - capabilities = "cap_net_admin+ep"; - }; + # into our routing table we must give dhcpd the required privs. + systemd.services.dhcpd6.serviceConfig.AmbientCapabilities = + [ "CAP_NET_ADMIN" ]; + services = { # Configure the DHCPv6 server # @@ -80,7 +71,7 @@ import ./make-test-python.nix ({pkgs, ...}: { set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a"); set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a"); log(concat(IP, " ", Prefix, " ", PrefixLength)); - execute("/run/wrappers/bin/add-dhcpd-lease", concat(Prefix,"/",PrefixLength), IP); + execute("${pkgs.iproute2}/bin/ip", "-6", "route", "replace", concat(Prefix,"/",PrefixLength), "via", IP); } ''; }; diff --git a/third_party/nixpkgs/nixos/tests/unifi.nix b/third_party/nixpkgs/nixos/tests/unifi.nix index 34284811ab..9dc7e5d04b 100644 --- a/third_party/nixpkgs/nixos/tests/unifi.nix +++ b/third_party/nixpkgs/nixos/tests/unifi.nix @@ -12,7 +12,7 @@ let makeAppTest = unifi: makeTest { name = "unifi-controller-${unifi.version}"; meta = with pkgs.lib.maintainers; { - maintainers = [ zhaofengli ]; + maintainers = [ patryk27 zhaofengli ]; }; nodes.server = { @@ -32,4 +32,5 @@ in with pkgs; { unifiLTS = makeAppTest unifiLTS; unifi5 = makeAppTest unifi5; unifi6 = makeAppTest unifi6; + unifi7 = makeAppTest unifi7; } diff --git a/third_party/nixpkgs/nixos/tests/wine.nix b/third_party/nixpkgs/nixos/tests/wine.nix index 18ad759b55..cc449864c7 100644 --- a/third_party/nixpkgs/nixos/tests/wine.nix +++ b/third_party/nixpkgs/nixos/tests/wine.nix @@ -17,7 +17,7 @@ let machine = { pkgs, ... }: { environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ]; - virtualisation.diskSize = "800"; + virtualisation.diskSize = 800; }; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix index 1d669d5016..40d934b8e1 100644 --- a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix @@ -27,8 +27,19 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: enable = lib.mkOverride 0 true; userControlled.enable = true; interfaces = [ "wlan1" ]; + fallbackToWPA2 = true; networks = { + # test WPA2 fallback + mixed-wpa = { + psk = "password"; + authProtocols = [ "WPA-PSK" "SAE" ]; + }; + sae-only = { + psk = "password"; + authProtocols = [ "SAE" ]; + }; + # test network nixos-test.psk = "@PSK_NIXOS_TEST@"; @@ -64,8 +75,12 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: machine.succeed(f"grep -q @PSK_MISSING@ {config_file}") machine.succeed(f"grep -q P@ssowrdWithSome@tSymbol {config_file}") - # save file for manual inspection - machine.copy_from_vm(config_file) + with subtest("WPA2 fallbacks have been generated"): + assert int(machine.succeed(f"grep -c sae-only {config_file}")) == 1 + assert int(machine.succeed(f"grep -c mixed-wpa {config_file}")) == 2 + + # save file for manual inspection + machine.copy_from_vm(config_file) with subtest("Daemon is running and accepting connections"): machine.wait_for_unit("wpa_supplicant-wlan1.service") diff --git a/third_party/nixpkgs/nixos/tests/xxh.nix b/third_party/nixpkgs/nixos/tests/xxh.nix new file mode 100644 index 0000000000..3af8e53779 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/xxh.nix @@ -0,0 +1,67 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + + let + inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + xxh-shell-zsh = pkgs.stdenv.mkDerivation { + pname = "xxh-shell-zsh"; + version = ""; + src = pkgs.fetchFromGitHub { + owner = "xxh"; + repo = "xxh-shell-zsh"; + # gets rarely updated, we can then just replace the hash + rev = "91e1f84f8d6e0852c3235d4813f341230cac439f"; + sha256 = "sha256-Y1FrIRxTd0yooK+ZzKcCd6bLSy5E2fRXYAzrIsm7rIc="; + }; + + postPatch = '' + substituteInPlace build.sh \ + --replace "echo Install wget or curl" "cp ${zsh-portable-binary} zsh-5.8-linux-x86_64.tar.gz" \ + --replace "command -v curl" "command -v this-should-not-trigger" + ''; + + installPhase = '' + mkdir -p $out + mv * $out/ + ''; + }; + + zsh-portable-binary = pkgs.fetchurl { + # kept in sync with https://github.com/xxh/xxh-shell-zsh/tree/master/build.sh#L27 + url = "https://github.com/romkatv/zsh-bin/releases/download/v3.0.1/zsh-5.8-linux-x86_64.tar.gz"; + sha256 = "sha256-i8flMd2Isc0uLoeYQNDnOGb/kK3oTFVqQgIx7aOAIIo="; + }; + in + { + name = "xxh"; + meta = with lib.maintainers; { + maintainers = [ lom ]; + }; + + nodes = { + server = { ... }: { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; + }; + + client = { ... }: { + programs.zsh.enable = true; + users.users.root.shell = pkgs.zsh; + environment.systemPackages = with pkgs; [ xxh git ]; + }; + }; + + testScript = '' + start_all() + + client.succeed("mkdir -m 700 /root/.ssh") + + client.succeed( + "cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa" + ) + client.succeed("chmod 600 /root/.ssh/id_ecdsa") + + server.wait_for_unit("sshd") + + client.succeed("xxh server -i /root/.ssh/id_ecdsa +hc \'echo $0\' +i +s zsh +I xxh-shell-zsh+path+${xxh-shell-zsh} | grep -Fq '/root/.xxh/.xxh/shells/xxh-shell-zsh/build/zsh-bin/bin/zsh'") + ''; + }) diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix index 44bee86880..2f9e40616d 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix @@ -2,25 +2,23 @@ , lib , fetchFromGitLab , cairo -, dbus , desktop-file-utils , gettext , glib -, gtk3 -, libhandy_0 -, libsass +, gtk4 +, libadwaita , meson , ninja , pango , pkg-config , python3 , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "contrast"; - version = "0.0.3"; + version = "0.0.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -28,13 +26,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "contrast"; rev = version; - sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy"; + sha256 = "cypSbqLwSmauOoWOuppWpF3hvrxiqmkLspxAWzvlUC0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4="; + hash = "sha256-W4FyqwJpimf0isQRCq9TegpTQPQfsumx40AFQCFG5VQ="; }; nativeBuildInputs = [ @@ -47,29 +45,31 @@ stdenv.mkDerivation rec { rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 glib # for glib-compile-resources ]; buildInputs = [ cairo - dbus glib - gtk3 - libhandy_0 - libsass + gtk4 + libadwaita pango ]; postPatch = '' patchShebangs build-aux/meson_post_install.py + # https://gitlab.gnome.org/World/design/contrast/-/merge_requests/23 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; meta = with lib; { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix index 18bcb04c65..db139ab39d 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix @@ -19,14 +19,15 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.14.0"; + version = "1.16.0"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "1ayap40pgzcpmfydk5pbf3gwhh26m3cmbk6lyly4jihr9qw7dgb0"; + sha256 = "sha256-51Grkn6NSR6azTRuq1vdbDg7d3HuQQ+ZJCsM2mSrSHk="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -35,18 +36,9 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; + sha256 = "sha256-vQaiEENxaQxBGYP1br03wSkU7OGOYkJvMBUAOeb3jGk="; }; - patches = [ - # remove when updating from 1.14.0 - (fetchpatch { - name = "fix-rust-1.54-build.patch"; - url = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816.patch"; - sha256 = "sha256-8rWcfhQmGiwlc2lpkRvJ95XQp1Xg7St+0K85x8nQ0mk="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/applications/audio/ChowCentaur/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ChowCentaur/default.nix new file mode 100644 index 0000000000..80f5768dc1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/ChowCentaur/default.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon +, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor +, alsa-lib, libjack2, lv2, gcc-unwrapped }: + +stdenv.mkDerivation rec { + pname = "ChowCentaur"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "KlonCentaur"; + rev = "v${version}"; + sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + cairo + libxkbcommon + xcbutilcursor + xcbutilkeysyms + xcbutil + libXrandr + libXinerama + libXcursor + alsa-lib + libjack2 + lv2 + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 + cd ChowCentaur/ChowCentaur_artefacts/Release + cp -r LV2/ChowCentaur.lv2 $out/lib/lv2 + cp -r VST3/ChowCentaur.vst3 $out/lib/vst3 + ''; + + meta = with lib; { + description = + "Digital emulation of the Klon Centaur guitar pedal using RNNs, Wave Digital Filters, and more"; + homepage = "https://github.com/jatinchowdhury18/KlonCentaur"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index 0e4afa4af7..9d4c522edc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -24,7 +24,7 @@ , expat , libid3tag , libopus -, ffmpeg +, ffmpeg_4 , soundtouch , pcre /*, portaudio - given up fighting their portaudio.patch */ @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg + ffmpeg_4 file flac libid3tag diff --git a/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix index afceca2a54..9fe86550f0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cozy/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "1.1.2"; + version = "1.2.0"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "sha256-QENn8mFMk06/Uj8QJo0mJQ7frJNcv5RVNJwDB+H/LkI="; + sha256 = "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix index d03b7836f2..4f3a5a08af 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "cyanrip"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "cyanreg"; repo = pname; rev = "v${version}"; - sha256 = "1aip52bwkq8cb1d8ifyv2m6m5dz7jk6qmbhyb97yyf4nhxv445ky"; + sha256 = "17bi2xhjv3f3i870whkyqckvjlg32wqkspash87zi0jw7m7jm229"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/dfasma/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dfasma/default.nix index 97870c478e..cb2ac2b9e0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/dfasma/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/dfasma/default.nix @@ -57,7 +57,7 @@ in mkDerivation rec { there are basic functionalities to align the signals in time and amplitude, this software does not aim to be an audio editor. ''; - homepage = "http://gillesdegottex.github.io/dfasma/"; + homepage = "https://gillesdegottex.gitlab.io/dfasma-website/"; license = [ licenses.gpl3Plus reaperFork.meta.license ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix index e1366d38ba..23ca109c6b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix @@ -4,14 +4,15 @@ , fetchFromGitHub , calf , fftwFloat +, fmt , glib -, glibmm , gtk4 -, gtkmm4 , itstool +, libadwaita , libbs2b , libebur128 , libsamplerate +, libsigcxx30 , libsndfile , lilv , lsp-plugins @@ -26,6 +27,7 @@ , rnnoise , rubberband , speexdsp +, tbb , wrapGAppsHook4 , zam-plugins , zita-convolver @@ -33,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.1.3"; + version = "6.2.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-1UfeqPJxY4YT98UdqTZtG+QUBOZlKfK+7WbszhO22A0="; + sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM="; }; nativeBuildInputs = [ @@ -54,13 +56,14 @@ stdenv.mkDerivation rec { buildInputs = [ fftwFloat + fmt glib - glibmm gtk4 - gtkmm4 + libadwaita libbs2b libebur128 libsamplerate + libsigcxx30 libsndfile lilv lv2 @@ -69,14 +72,13 @@ stdenv.mkDerivation rec { rnnoise rubberband speexdsp + tbb zita-convolver ]; postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - # https://github.com/wwmm/easyeffects/pull/1205 - substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; preFixup = diff --git a/third_party/nixpkgs/pkgs/applications/audio/fomp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fomp/default.nix index bb421886f5..8dc86cb8cc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fomp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fomp/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ lv2 python3 ]; meta = with lib; { - homepage = "http://drobilla.net/software/fomp/"; + homepage = "https://drobilla.net/software/fomp.html"; description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/freewheeling/default.nix b/third_party/nixpkgs/pkgs/applications/audio/freewheeling/default.nix index 75e44d8c4f..b7afb0d57a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/freewheeling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype, fluidsynth , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsa-lib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ - freetype SDL SDL_gfx SDL_ttf + freetype fluidsynth SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsa-lib libvorbis libsndfile libogg libSM (gnutls.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 77c6f9935f..a5fc9a8789 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.50"; + version = "1.51"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-OURD8k8DIa1DddDng55HrzgAN95srW4wm7RD7DbiJLQ="; + sha256 = "sha256-g8LZhP6qHctmvbmrhJ8gAOeAd57SePeO2tdFi9SVjQ0="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/third_party/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix b/third_party/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix index a2aebc58a8..55f12fd3c6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix index d281ec11c7..707deeb1a0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/hybridreverb2/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www2.ika.ruhr-uni-bochum.de/HybridReverb2"; + homepage = "https://github.com/jpcima/HybridReverb2"; description = "Reverb effect using hybrid impulse convolution"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix new file mode 100644 index 0000000000..b4d4a02878 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix @@ -0,0 +1,64 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, pipewire +, glibmm +, qmake +, makeDesktopItem +, pkg-config +, libarchive +, fetchpatch +}: + +mkDerivation rec{ + pname = "jamesdsp"; + version = "2.3"; + src = fetchFromGitHub rec{ + owner = "Audio4Linux"; + repo = "JDSP4Linux"; + fetchSubmodules = true; + rev = version; + hash = "sha256-Hkzurr+s+vvSyOMCYH9kHI+nIm6mL9yORGNzY2FXslc="; + }; + + patches = [ + # fixing /usr install assumption, remove on version bump + (fetchpatch { + url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch"; + hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E="; + }) + ]; + + nativeBuildInputs = [ qmake pkg-config ]; + buildInputs = [ + glibmm + libarchive + pipewire + ]; + + desktopItems = [ + (makeDesktopItem { + name = "jamesdsp.desktop"; + desktopName = "JamesDSP"; + genericName = "Audio effects processor"; + exec = "jamesdsp"; + icon = "jamesdsp"; + comment = "JamesDSP for Linux"; + categories = "AudioVideo;Audio"; + startupNotify = false; + terminal = false; + type = "Application"; + extraDesktopEntries = { + Keywords = "equalizer;audio;effect"; + }; + }) + ]; + + meta = with lib;{ + description = "An audio effect processor for PipeWire clients"; + homepage = "https://github.com/Audio4Linux/JDSP4Linux"; + license = licenses.gpl3Only; + maintainers = with maintainers;[ pasqui23 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix index 47fbd5794e..ea54a4a55d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; + postPatch = '' + # https://github.com/milkytracker/MilkyTracker/issues/262 + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 98' 'CMAKE_CXX_STANDARD 11' + ''; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/default.nix deleted file mode 100644 index 93a9ce2585..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/munt/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, mkDerivation -, stdenv -, fetchFromGitHub -, makeDesktopItem -, cmake -, pkg-config -, qtbase -, glib -, alsa-lib -, withJack ? stdenv.hostPlatform.isUnix, jack -}: - -let - mainProgram = "mt32emu-qt"; -in -mkDerivation rec { - pname = "munt"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "munt_${lib.replaceChars [ "." ] [ "_" ] version}"; - sha256 = "1lknq2a72gv1ddhzr7f967wpa12lh805jj4gjacdnamgrc1h22yn"; - }; - - dontFixCmake = true; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ qtbase glib ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optional withJack jack; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/Applications - mv $out/bin/${mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} - ''; - - meta = with lib; { - inherit mainProgram; - description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; - homepage = "http://munt.sourceforge.net/"; - license = with licenses; [ lgpl21 gpl3 ]; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix new file mode 100644 index 0000000000..f79a266754 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "libmt32emu"; + version = "2.5.3"; + + src = fetchFromGitHub { + owner = "munt"; + repo = "munt"; + rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + ]; + + dontFixCmake = true; + + cmakeFlags = [ + "-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" + "-Dmunt_WITH_MT32EMU_QT=OFF" + ]; + + meta = with lib; { + homepage = "http://munt.sourceforge.net/"; + description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; + license = with licenses; [ lgpl21Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; # Not tested on ReactOS yet :) + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix new file mode 100644 index 0000000000..0c54188568 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, alsa-lib +, cmake +, libpulseaudio +, libmt32emu +, pkg-config +, portaudio +, qtbase +, qtmultimedia +, withJack ? stdenv.hostPlatform.isUnix, libjack2 +}: + +mkDerivation rec { + pname = "mt32emu-qt"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "munt"; + repo = "munt"; + rev = "mt32emu_qt_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-9vapBKpl1NC3mIDetuCb452IHV6c7c7NCzSyiBry5oo="; + }; + + postPatch = '' + sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libmt32emu + portaudio + qtbase + qtmultimedia + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libpulseaudio + ] + ++ lib.optional withJack libjack2; + + dontFixCmake = true; + + cmakeFlags = [ + "-Dmt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING=OFF" + "-Dmunt_WITH_MT32EMU_QT=ON" + "-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv $out/bin/${meta.mainProgram}.app $out/Applications/ + ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} + ''; + + meta = with lib; { + homepage = "http://munt.sourceforge.net/"; + description = "A synthesizer application built on Qt and libmt32emu"; + longDescription = '' + mt32emu-qt is a synthesiser application that facilitates both realtime + synthesis and conversion of pre-recorded SMF files to WAVE making use of + the mt32emu library and the Qt framework. + ''; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + mainProgram = "mt32emu-qt"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix new file mode 100644 index 0000000000..378b5dd8fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, glib +, libmt32emu +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "mt32emu-smf2wav"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "munt"; + repo = "munt"; + rev = "mt32emu_smf2wav_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-FnKlKJxe7P4Yqpv0oVGgV4253dMgSmgtb7EAa2FI+aI="; + }; + + postPatch = '' + sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt + ''; + + dontFixCmake = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libmt32emu + glib + ]; + + cmakeFlags = [ + "-Dmunt_WITH_MT32EMU_QT=OFF" + "-Dmunt_WITH_MT32EMU_SMF2WAV=ON" + ]; + + meta = with lib; { + homepage = "http://munt.sourceforge.net/"; + description = "Produces a WAVE file from a Standard MIDI file (SMF)"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + mainProgram = "mt32emu-smf2wav"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 0eaea39f24..a44dd941c5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.39"; + version = "1.40"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-ZmgsNp2fRebbLxSzzCsLdM6/7kBKo+YFUCdWLSYfI5A="; + sha256 = "sha256-0qEhhkprIpseCEFStgJ0035TX0e9s271BK/1hVkn/JU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix index 16ef4ed6e4..e7e8c73c9c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.5.0.3"; + version = "0.6.1.0"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-8bgi621psvUlhiLyZ15tKGmGOs6HTf5/6Ru2Z9l8QIo="; + sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index b7f6bb3ee3..65ccf48e90 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.43"; + version = "6.46"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; hash = { - x86_64-linux = "sha256-VQ91px9YZWbrw31fFQxS+H/6fsjkLDrYU6FtI8eSq6E="; - aarch64-linux = "sha256-x6z5+H7ASWiuNL0maNGK05VmJptHdFGRiFf6DgwlZDw="; + x86_64-linux = "sha256-cHjiO2hRK8gUaq2VfuE9GOtRJ0JyfH2rhdIbK+RxoEM="; + aarch64-linux = "sha256-j+05SdyDWzI1fekwwQ2RAGontEvppkUWPYfZEtOVXYg="; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/redux/default.nix b/third_party/nixpkgs/pkgs/applications/audio/redux/default.nix new file mode 100644 index 0000000000..45ee78917a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/redux/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchurl +, libX11 +, alsa-lib +, autoPatchelfHook +, releasePath ? null +}: + +# To use the full release version (same as renoise): +# 1) Sign into https://backstage.renoise.com and download the release version to some stable location. +# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. +# Note: Renoise creates an individual build for each license which screws somewhat with the +# use of functions like requireFile as the hash will be different for every user. + +stdenv.mkDerivation rec { + pname = "redux"; + version = "1.2.2"; + + src = if releasePath != null then releasePath + else fetchurl { + url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux.tar.gz"; + sha256 = "0zbwsg7nh9x3q29jv2kpqb3vwi0ksdwybhb4m2qr95rxrpx1kxhm"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ libX11 alsa-lib stdenv.cc.cc.lib ]; + + installPhase = '' + runHook preInstall + + OUTDIR=$out/lib/vst2/RenoiseRedux.vst2 + mkdir -p $OUTDIR + cp -r ./renoise_redux_x86_64/* $OUTDIR + + runHook postInstall + ''; + + meta = with lib; { + description = "Sample-based instrument, with a powerful phrase sequencer"; + homepage = "https://www.renoise.com/products/redux"; + license = licenses.unfree; + maintainers = with maintainers; [ mihnea-s ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index ce55516a40..7439e566da 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20211116"; + version = "20220125"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz"; + sha256 = "sha256-Hqbm5+YyCde/6QuyIy4NE/jG4xNDzeNjEefMr60GEZM="; }; configureFlags = [ "--enable-dependency-tracking" ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index 73f1f65067..9aef427f50 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-DBZZf3A0AYkeQxQvHGyHHbsQ2EDuxsZnZPbxkWTNcHA="; + sha256 = "sha256-R60Dh19GYM157ysmN8EOJ47eO8a7sdkEEF1TObG1xzk="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix index fa51183720..52789d64d1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "22.0"; + version = "22.1"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-QK5lq2ek1yn3G0Ecs+TFIG5ST3lAETiyxuXIic3v1ik="; + sha256 = "sha256-jrH0XRvPj9ySd8FSrOKf6qP5T1YSKrYBNHl6fz5dhkI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix b/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix index 60fbd3a288..03cfae066b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix @@ -6,24 +6,25 @@ , alsa-lib , pkg-config , ffmpeg +, dbus }: rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - sha256 = "sha256-pKHKM4XOuuZCr4neMe1AVqWMuZghwYNe+ifJCQhXG/c="; + sha256 = "sha256-aHZH3sQNUUPcMRySy8Di0XUoFo4qjGi2pi0phLwORaA="; }; - cargoSha256 = "sha256-J3ezXBOGJwzIPTHXujHpswsgh9PFy110AOQ2pPJNm10="; + cargoSha256 = "sha256-EpkB43rMUJO6ouUV9TmQ+RSnGhX32DZHpKic1E6lUyU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; + buildInputs = [ alsa-lib dbus gtk3 openssl ffmpeg ]; postInstall = '' mv packaging/rootfs/usr/share $out/share diff --git a/third_party/nixpkgs/pkgs/applications/audio/squishyball/default.nix b/third_party/nixpkgs/pkgs/applications/audio/squishyball/default.nix index 4a7f819e29..1d3bb0e0be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/squishyball/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/squishyball/default.nix @@ -1,22 +1,34 @@ -{ lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses +{ lib, stdenv, autoreconfHook, fetchFromGitLab, fetchpatch, flac, libao, libvorbis, ncurses , opusfile, pkg-config }: stdenv.mkDerivation rec { - name = "squishyball-${rev}"; - rev = "19580"; + pname = "squishyball"; + version = "unstable-2020-11-23"; - src = fetchsvn { - url = "https://svn.xiph.org/trunk/squishyball"; - rev = rev; - sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; + src = fetchFromGitLab { + domain = "gitlab.xiph.org"; + owner = "xiph"; + repo = "squishyball"; + rev = "27590fe6bac545e2dd3eacf048edbd969682263a"; + sha256 = "07zs8wx1ahf3q505fk9b6cgzlkhnayfsscch46yy9s1wgxgphj7s"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ flac libao libvorbis ncurses opusfile ]; - patches = [ ./gnu-screen.patch ]; + patches = [ + ./gnu-screen.patch + + # Patch pending upstream inclusion for ncurses-6.3 support: + # https://gitlab.xiph.org/xiph/squishyball/-/issues/1 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://gitlab.xiph.org/xiph/squishyball/uploads/5609ceaf85ebb6dc297c0efe61b9a1b7/0001-mincurses.c-use-ncurses-API-to-enter-raw-mode-ncurse.patch"; + sha256 = "06llp7cd77f4vvhz8qdld551dnlpjxf98j7rmp3i1x1kng4f0iy3"; + }) + ]; postInstall = '' # Why doesn’t this happen automagically? @@ -40,7 +52,7 @@ stdenv.mkDerivation rec { comparisons of groups of up to ten samples; this is the default mode of operation. ''; - homepage = "https://svn.xiph.org/trunk/squishyball"; + homepage = "https://gitlab.xiph.org/xiph/squishyball"; license = licenses.gpl2Plus; maintainers = with maintainers; [ michalrus ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index e3200d8e43..6527b90b89 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -72,6 +72,7 @@ mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly ]) ++ lib.optional withVlc libvlc; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix index 8213aeb5fe..5e7f5c7cce 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -5,6 +5,7 @@ , python3Packages , ffmpeg , flac +, librsvg , gobject-introspection , gtk3 , libnotify @@ -20,23 +21,22 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "6.7.1"; + version = "7.0.1"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "1hm82yfq7q2akrrvff3vmwrd3bz34d2dk8jzhnizhnhar6xc6fzp"; + sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ="; }; postPatch = '' substituteInPlace tauon.py \ --replace 'install_mode = False' 'install_mode = True' \ - --replace 'install_directory = os.path.dirname(__file__)' 'install_directory = "${placeholder "out"}/share/tauon"' + --replace 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"' substituteInPlace t_modules/t_main.py \ --replace 'install_mode = False' 'install_mode = True' \ - --replace 'install_directory = sys.path[0]' 'install_directory = "${placeholder "out"}/share/tauon"' \ --replace 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' \ --replace 'lib/libphazor.so' '../../lib/libphazor.so' @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { --replace 'lib/libphazor.so' '../../lib/libphazor.so' patchShebangs compile-phazor.sh + + substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' ''; postBuild = '' @@ -61,6 +63,7 @@ stdenv.mkDerivation rec { gtk3 libnotify libopenmpt + librsvg libsamplerate libvorbis mpg123 @@ -70,11 +73,14 @@ stdenv.mkDerivation rec { ]; pythonPath = with python3Packages; [ + beautifulsoup4 + gst-python dbus-python isounidecode musicbrainzngs mutagen pillow + plexapi pulsectl pycairo pylast @@ -83,6 +89,7 @@ stdenv.mkDerivation rec { pysdl2 requests send2trash + setproctitle ] ++ lib.optional withDiscordRPC pypresence; makeWrapperArgs = [ @@ -98,7 +105,12 @@ stdenv.mkDerivation rec { cp -r assets input.txt t_modules theme $out/share/tauon wrapPythonPrograms - ''; + + mkdir -p $out/share/applications + install -Dm755 extra/tauonmb.desktop $out/share/applications/tauonmb.desktop + mkdir -p $out/share/icons/hicolor/scalable/apps + install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps +''; meta = with lib; { description = "The Linux desktop music player from the future"; diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index 7434c12cba..271efc0283 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-ut4HCfLU/P22y5QbNakTV4d4CnFRxJvn+cnJ0ZGpTlw="; + sha256 = "06sb24pimq9ckdkp9hzp4r9d3i21kxacsx5b7x9q99qcwf7h6372"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix new file mode 100644 index 0000000000..550d65051e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "besu"; + version = "21.10.8"; + + src = fetchurl { + url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-0yXi42vDinB6nuv5IGj1AhYGqMa2Rku0tNWQCO+AFPw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -r bin $out/ + mkdir -p $out/lib + cp -r lib $out/ + wrapProgram $out/bin/${pname} --set JAVA_HOME "${jre}" + ''; + + meta = with lib; { + description = "An enterprise-grade Java-based, Apache 2.0 licensed Ethereum client"; + homepage = "https://www.hyperledger.org/projects/besu"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix index a215e600bb..2bc3813c22 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1q6x6w8mp5ax852hlvi2p61xgckb2lpr2ml21a9mfs9421b6m8h2"; + sha256 = "154b8whbbpnb8lk1b3an44h53gh5fdzxkg5vdfrw1ld6miy68kii"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 6cc83ffbf6..39203e60c7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,28 +3,22 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.3.7"; + version = "1.4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-W8WRw42hMNUaQZlfrl73REGIvLcj6Vso9Axx53ENkx0="; + sha256 = "sha256-PW5a1Bw21skpboWDtlZHGWtFwfImznD7nYI92RT7GGQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.aspnetcore_3_1; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; - dotnetFlags = lib.optionals altcoinSupport [ "/p:Configuration=Altcoins-Release" ]; - - # btcpayserver requires the publish directory as its working dir - # https://github.com/btcpayserver/btcpayserver/issues/1894 - preInstall = '' - makeWrapperArgs+=(--run "cd $out/lib/btcpayserver") - ''; + buildType = if altcoinSupport then "Altcoins-Release" else "Release"; postFixup = '' mv $out/bin/{BTCPayServer,btcpayserver} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index b0bbd448d5..659207b5c5 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,18 +31,18 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.2.16"; - sha256 = "1dq8xzvg51iskvak28ishxm98b5r1qlybh2r36a079764vl5prn1"; + version = "1.2.19"; + sha256 = "0g8wm7idxb3pksqn3kkv62k27r7rzxdjdg3drhfsfrlvi0fm2w9j"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.2.8"; - sha256 = "0ldk7kyipgmg0mj1444ins5n014z149j1qa40h12pncr6q1fb0xf"; + version = "1.2.9"; + sha256 = "0vplw03l0rldqrw98ybm1d8fcglj9zwhxw6j8blhh27x1wdp0x0c"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.2.9"; - sha256 = "0r855lnh6cyj6hpwhdpdhpp39332v7lmk93ri2q8gs9lsnwdyjr8"; + version = "1.2.10"; + sha256 = "12i5glirw23mw15hvnn6jr7wxv2jlg8x88s6izz5f1y81bxcmkk7"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; @@ -50,19 +50,29 @@ sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6"; }) (fetchNuGet { - pname = "BTCPayServer.Lightning.Eclair"; + pname = "BTCPayServer.Lightning.Common"; version = "1.2.8"; - sha256 = "01462fjc0zmgafqk7w0cl880wir9mah90r68xyw607ij28pdc2zf"; + sha256 = "1zqbhz80q004py8qwd4ma0fm9yd0rkza5r2dap6sfwpvng2c82fj"; + }) + (fetchNuGet { + pname = "BTCPayServer.Lightning.Eclair"; + version = "1.2.10"; + sha256 = "1gqnsxbclvbkjhpwxdqpxcvjkzrardxzfkm6fadwa4jr2y5nhdkq"; + }) + (fetchNuGet { + pname = "BTCPayServer.Lightning.LNBank"; + version = "1.0.1"; + sha256 = "0b3psykci3jjwx0gbw6zwzsviph40bn46xb21dnd64djbq2iaa6p"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.2.12"; - sha256 = "1dqg682lxv61rfwxxqqlc5fal8y5sz7dmf7p70rg7l9csgzgn67r"; + version = "1.2.14"; + sha256 = "1lmlakpr67zgwx4qm86ylnivkxfyvq2ypjry17pfiwr11z8p5jih"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.7"; - sha256 = "1mmj8bi32kzgda8v7qdfpm2qlpffv5223c2xnq7351h8ih4bbcvb"; + version = "1.2.8"; + sha256 = "1l68n5mk918mfmpr1dkq1m7ql4zc2c4y7vglghna5pfy6jq7ryni"; }) (fetchNuGet { pname = "BuildBundlerMinifier"; @@ -79,11 +89,6 @@ version = "3.2.435"; sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; }) - (fetchNuGet { - pname = "Common.Logging.Core"; - version = "3.4.1"; - sha256 = "06h80c7l12nh6gnkzskcs4w8741xhprv72vf88f33ilzfy37h5jy"; - }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; @@ -164,6 +169,11 @@ version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) + (fetchNuGet { + pname = "Humanizer.Core"; + version = "2.8.26"; + sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; + }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; @@ -171,8 +181,13 @@ }) (fetchNuGet { pname = "LNURL"; - version = "0.0.14"; - sha256 = "0b2v87k3yi2lyka5zy3sbvxsa7yp04nn72l7dk27cm9i1d9914sq"; + version = "0.0.15"; + sha256 = "1fy6ywzqs5y9c6d156v08dg8c6689d5xb4y1ar7gqgz6f3cl842n"; + }) + (fetchNuGet { + pname = "MailKit"; + version = "3.0.0"; + sha256 = "0z6bf80zqqwlli844xkv7xzdip8lwrag5cpvx3vydzy6qg0xf2cg"; }) (fetchNuGet { pname = "McMaster.NETCore.Plugins.Mvc"; @@ -194,15 +209,20 @@ version = "5.2.7"; sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Connections.Abstractions"; + version = "3.1.10"; + sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; + }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; - version = "3.1.19"; - sha256 = "1b20hksk2qk2jnkwin4g0n9ap3ma7724pd518fh9qcakf7vfpkl1"; + version = "6.0.1"; + sha256 = "1mj04ynr6bxvmq9nrggi832n8hbcr9j9kjr9y2rgiq91y6skzg37"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; - version = "3.1.19"; - sha256 = "1ksi2h3904932igh1g27l91fqdsfxg8zr6y82ym8pqb62m0906a4"; + version = "6.0.1"; + sha256 = "0aqaviwbnwg0vpwwdbif7b9ncpckwpclm77l3ac11s8fsq3vb3sm"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; @@ -219,55 +239,75 @@ version = "2.0.0"; sha256 = "1hgmnd5mj35g8cqq3mdhjf9cmi3wm5lqiyrj5mgfscnig6i686xr"; }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Http.Connections.Client"; + version = "3.1.10"; + sha256 = "1sni7hjpylamxaf98insalx3jj2k8skb02mhkmamxxj2488r2p9j"; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Http.Connections.Common"; + version = "3.1.10"; + sha256 = "19mddj0dpy4j6fwh8b1q7aznnckjrkpvbqiyq4sq4z7lcgw6pbq6"; + }) (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.0.0"; sha256 = "1zk5ad3laa7ma83md8r80kijqzps6dcrvv0k1015nddfk1qd74s6"; }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.Http.Features"; + version = "3.1.10"; + sha256 = "1y6zf2qgph6ga59272msywdv2xrycg56wz50bjm5pivmh6wv9240"; + }) (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; - version = "3.1.19"; - sha256 = "0sm7cpccpygwgplbkp0j1q5ilkkiw0dx76qwy3xharv4himakrfm"; + version = "6.0.1"; + sha256 = "1j9z0xzj2hlffhg28ijp33flljq75js8dvlchbpggvvd789hm4il"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "3.1.19"; - sha256 = "1fh3k85k988jw35sf5hvm6jwmvzmslzpfvf3jk3sn3f3s6gyk0an"; + version = "6.0.1"; + sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "3.1.19"; - sha256 = "1nh08kjdc152m85ycwxn1q8r69f0l02p6cac6q57nzlyy5gyj2rs"; + version = "6.0.1"; + sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; - version = "3.1.19"; - sha256 = "1n22q10n9xlhcjxsm1apd0b7j3j97dd5jmpw6nvymwbv2bw88af4"; + version = "6.0.1"; + sha256 = "1grhlksdd7mwv72g78kx86mzba8mgza3i53x9jv16bkc1wxqwfcd"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; - version = "3.1.19"; - sha256 = "1glmlgrwksv0h8g41wy43wv94ndllq4ihxhdaagig9szvivdh8c1"; + version = "6.0.1"; + sha256 = "0778xw230flwqkjjydp73gb6r3brrlqwqdrf4m0b92b083bysh59"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; - version = "3.1.19"; - sha256 = "059v85f2qbj403wcnp5mspzvhkbf6d8hsjl26xvfd5s8svnaz4ax"; + version = "6.0.1"; + sha256 = "11spvrnp2mz5kc11ycv2wpgn8bilwpinbl6vkvvr7jjrqlm36lk1"; }) (fetchNuGet { - pname = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.1"; - sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; + pname = "Microsoft.AspNetCore.SignalR.Client.Core"; + version = "3.1.10"; + sha256 = "1289624ilk45ca8rkyvirqdjsg9jsnqn8dzbjr6f83641fi73s69"; }) (fetchNuGet { - pname = "Microsoft.Bcl.HashCode"; - version = "1.1.1"; - sha256 = "0xwfph92p92d8hgrdiaka4cazqsjpg4ywfxfx6qbk3939f29kzl0"; + pname = "Microsoft.AspNetCore.SignalR.Client"; + version = "3.1.10"; + sha256 = "1s352srycksfnvz5hhi7himpg2gn39iw2gizlc3g30w6pvy8p29c"; }) (fetchNuGet { - pname = "Microsoft.CodeAnalysis.Analyzers"; - version = "2.9.3"; - sha256 = "1kskwc9gyd2sx3zwx52qwfsl7s0xhaclmlnxvjsb4jgvpydv3xii"; + pname = "Microsoft.AspNetCore.SignalR.Common"; + version = "3.1.10"; + sha256 = "0c6lim7my3alq43xxqkgykba068hjlzdcif6c956irailijc0smw"; + }) + (fetchNuGet { + pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; + version = "3.1.10"; + sha256 = "0qzdpblmgqm3bl5wr14igkqp35zwx4wdkwlh55xm4v3hzhq6l46m"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; @@ -276,33 +316,33 @@ }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; - version = "3.11.0"; - sha256 = "0pwidgg4ifm7cirdy3hf61dyvg6lk4vgb6q7lyb4y0h0b6mvkrcl"; + version = "4.0.0"; + sha256 = "1rwnz5zy7ia9312n2qzzar95x9p7iiw57cql7ssdwv255xl1ix29"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; - version = "3.3.0"; - sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2"; + version = "4.0.1"; + sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; - version = "3.11.0"; - sha256 = "1h16b7dsp1mq7d7picyfhkssqr6xiyywi5x1fd4jwclyrvanyl81"; + version = "4.0.0"; + sha256 = "1mzxjy7xp8r9x25xyspq89ngsz0hmkbp0l0h3v1jv2rcrw63wqb4"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; - version = "3.3.0"; - sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424"; + version = "4.0.1"; + sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; - version = "3.1.19"; - sha256 = "18l0gcpl7i0bfnyzhpm7h72ng2h8bh46fr2azk7d3ns507gi3xmp"; + version = "6.0.1"; + sha256 = "0dwwhiv28wyzq3177qg961ll2q3ggiw2k0zdashgym5cl67p93lm"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "16.11.0"; - sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; + version = "17.0.0"; + sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) (fetchNuGet { pname = "Microsoft.CSharp"; @@ -326,8 +366,8 @@ }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; - version = "3.1.19"; - sha256 = "0ns3rrk011gjw4g1kwr625390yj0mcadb3py49750sji72my7l7s"; + version = "6.0.1"; + sha256 = "0gzn3rynp9k6mx4h4dhq124b7ra8m11rkjh40r2r8z4gkr0shjv1"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; @@ -341,48 +381,48 @@ }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "3.1.18"; - sha256 = "0d00d6wx2mm5bav39bjsikjq0sx6qmp183dbwimfda7wav2bwya8"; + version = "6.0.0"; + sha256 = "1aw13qjkpglc1mm3cv7s73s8fschy8lzdnigsp346b7mycpg7v92"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "3.1.19"; - sha256 = "0na2jgxs5k2gxqh99ha4v0blya3pwh2qha49iz0qkw0r3kq0vdvv"; + version = "6.0.1"; + sha256 = "15mx86i7gqlak604vr853x7a4b4l48wz5vqh9qbib7wh4pkf4rp3"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "3.1.19"; - sha256 = "02xjz4c6f71mcmdwihi9klrqm28xk84x19vcqi8cgpw50q7d0rly"; + version = "6.0.1"; + sha256 = "16739crhjky22j53v8varninz9bqdmdfwjnzj6xvfxqfl858jja5"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; - version = "3.1.19"; - sha256 = "128md0ijqa1wvpdicf09i7kcb2aq2b07skc6j0vddz2jhcbi0irr"; + version = "6.0.1"; + sha256 = "13bi91lkasy4qj04jn2hmbwpsc6fybgllwsr87qhz5p86ig9ryq9"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "3.1.18"; - sha256 = "0mlq9gmxrmix68mdh0lv803cx15lzrhs5d9622vj8wwdlngg3xdx"; + version = "6.0.0"; + sha256 = "1v2r8004isvz4d8qxh5clgkbnlwivjlsqhn7skw0y9b5i61y2mwk"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "3.1.19"; - sha256 = "13rbnd441r4zb52y99zwida0n0phvvw7hmccjy2kpnk1jfrr8xi1"; + version = "6.0.1"; + sha256 = "0224qas1rl3jv02ribb2lwfqcd64ij40v6q10369h4mrwr071zr2"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "3.1.19"; - sha256 = "1w8ja5daglnr3ycfwlyskrnacb66p8yz730k838v6bpmpsdybn71"; + version = "6.0.1"; + sha256 = "1snpa3pzpqfsnf2dpmvhv08lzcdiqcl5af6aldlxrm82dpif95q5"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "3.1.19"; - sha256 = "0iwwa44dr2lg9mh5hmnpnkzbhi5v3vi6xy3xlnqg4hja37ji0xyw"; + version = "6.0.1"; + sha256 = "14r1j8bamfwnjzx6igc5nzqvp5gzl2wyfbi53pznkw61xcf6hnch"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; - version = "3.1.19"; - sha256 = "0gl43zk7ashjx49h35w58cn7dfl1ap3nyq9ws8575jcjhcx3c94h"; + version = "6.0.1"; + sha256 = "0ynspdv0f199ppwcg7hnjv6hp01qyaxfcmh1phy9nwjjxlrkwkjc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; @@ -391,13 +431,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; - version = "3.1.19"; - sha256 = "1y1is16yl69ja67i9n98r44cr0z8b8f8k31d5ighi9djj4yhz4k2"; + version = "6.0.0"; + sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; - version = "3.1.19"; - sha256 = "1iysxrmchw5ripyrcfi4nv5a00b9a7agsgvbb7y9fwbfq838v3mp"; + version = "6.0.0"; + sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; @@ -416,14 +456,19 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.19"; - sha256 = "19s5dpswyad55p191280510sb8cr2b6zyx9zlx79p0lq4zaxwaq6"; + version = "3.1.10"; + sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.5"; sha256 = "03jwqjrfyx11ax19bq84c28qzaiyj4whrx7vayy4hr7sv0p28h8k"; }) + (fetchNuGet { + pname = "Microsoft.Extensions.Configuration.Abstractions"; + version = "6.0.0"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; + }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; @@ -431,8 +476,8 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.19"; - sha256 = "0dw1qiyc8j7rk13x6wfm1xnc7drnlvk8xv607hja0af2m0y7a3p2"; + version = "3.1.10"; + sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; @@ -466,8 +511,8 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; - version = "3.1.19"; - sha256 = "04zadl7q5vcak9d77jm5ivfzhhp2zvz5apywvfzrca4h0q38fs45"; + version = "3.1.10"; + sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; @@ -486,14 +531,19 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.19"; - sha256 = "0claq9nna6p30zbvd25bn1ild9f3x50d5fxfbq9fsp464rq70b2y"; + version = "3.1.10"; + sha256 = "0c9p32jd8fi5k02nbp7ilj0jmnl63kq2464acpsb6ajs4837c02q"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.5"; sha256 = "1wkf8ajh4pj6g3wwd18g3hjc3lqqny8052rl373ddcardxrs2gvn"; }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "6.0.0"; + sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; + }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; @@ -501,8 +551,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.19"; - sha256 = "0fsvv5jl95kmdxc4c7b15xanlq3fmfls556m8ghbqqikrgkqhz8m"; + version = "3.1.10"; + sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection"; + version = "6.0.0"; + sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; @@ -511,13 +566,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; - version = "3.1.6"; - sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac"; + version = "5.0.0"; + sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; - version = "5.0.0"; - sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; + version = "6.0.0"; + sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; @@ -551,13 +606,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; - version = "3.1.19"; - sha256 = "14mywrm6mv7hzfappgdrmwwk97a4qpfkir5a55443awy8wl3bylr"; + version = "6.0.1"; + sha256 = "1kwn30a024fqi9gpap8g2wifjzij0bcz70lgz7bdz4vy3sp9mn99"; }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; - version = "3.1.19"; - sha256 = "0pkrhf1vffll986hh49gyvfdqn1vnjd0qnpfkag2b76d681xlvgg"; + version = "6.0.1"; + sha256 = "1l2njmcg4fvg6jr9gjvcr7yfj0r0ndwsa8r1dwlaciz3a2x2pfg8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; @@ -581,14 +636,19 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.19"; - sha256 = "07jnqb6518xrw086rqlc28ms80d57xg0pl5x72032rk2x5x8hhnn"; + version = "3.1.10"; + sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "6.0.0"; + sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; + }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Filter"; version = "1.1.2"; @@ -601,8 +661,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; - version = "3.1.19"; - sha256 = "0j2874x847xa1nfbppjn10cnxd486f6lwy53mxmansvlmp96h2sn"; + version = "3.1.10"; + sha256 = "1lf1hgpk0d5g9mv68f9b2cp6jhpnc4a6bflc1f2mn9x4dvmpv2wi"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging"; + version = "6.0.0"; + sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; @@ -621,14 +686,19 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; - version = "3.1.19"; - sha256 = "1jm7rd2sbfscyfysvl8zcaypyzpd6d5w52ha2npa9c7q84cmn4r9"; + version = "3.1.10"; + sha256 = "0kmh12w0y4bf2jnmbbxk10mqnynjqa5qks5pa0zg4vsnfscj8i95"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.5"; sha256 = "0rhqyqa7vhlmz2g0250zhypaayvckx4dv89micdg521cpvr5arpr"; }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options"; + version = "6.0.0"; + sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; + }) (fetchNuGet { pname = "Microsoft.Extensions.PlatformAbstractions"; version = "1.1.0"; @@ -656,14 +726,19 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; - version = "3.1.19"; - sha256 = "0vcwwqqfwm5vj87psmic6mxix3prgkzw8sqbg5m1c2q662kby380"; + version = "3.1.10"; + sha256 = "0a3f35427hpai0wq1wlqpn4m5aacfddkq25hp71nwlz5zm1dqfmk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.5"; sha256 = "0n2pk1sy8ikd29282sx4ps9r1wnhzgg4nwmkka9ypjizd8lkkk2m"; }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "6.0.0"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; + }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.6.0"; @@ -681,8 +756,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "16.11.0"; - sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; + version = "17.0.0"; + sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.NetCore.Analyzers"; @@ -709,11 +784,6 @@ version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; @@ -726,13 +796,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "16.11.0"; - sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; + version = "17.0.0"; + sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "16.11.0"; - sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; + version = "17.0.0"; + sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -745,35 +815,25 @@ sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { - pname = "Microsoft.Win32.SystemEvents"; - version = "4.7.0"; - sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; + pname = "MimeKit"; + version = "3.0.0"; + sha256 = "1ccds2g2cr3xficahq5i3i049nlzv2075x8yc24kwz3v1wyw458s"; }) (fetchNuGet { pname = "MySqlConnector"; - version = "0.69.10"; - sha256 = "159xir7czzz291cs0f2dsgmnhar41s4wglm5r5lw3kqpd50q3i9v"; + version = "2.0.0"; + sha256 = "0l0r4wr1h176w6hcsfjp5kx05fpzhhgzxcmirv8zfyk899vfgqkz"; }) (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.8"; sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; }) - (fetchNuGet { - pname = "NBitcoin.Secp256k1"; - version = "1.0.3"; - sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj"; - }) (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) - (fetchNuGet { - pname = "NBitcoin"; - version = "5.0.54"; - sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b"; - }) (fetchNuGet { pname = "NBitcoin"; version = "6.0.15"; @@ -781,8 +841,8 @@ }) (fetchNuGet { pname = "NBitcoin"; - version = "6.0.17"; - sha256 = "1dl3rmmx33041sd0lsj54lk19mzyd8j2nngjmbnn8s4gsdnzd7z1"; + version = "6.0.19"; + sha256 = "1vd9hcavqkh0yhzmwnyyk8yd4i205217k90m7w0lln5vqvmq14kk"; }) (fetchNuGet { pname = "NBitcoin"; @@ -804,96 +864,11 @@ version = "4.1.3"; sha256 = "1nh4jj7yg81825hr7cc99qlnfmdm6jibap81qqi8a968b61z4251"; }) - (fetchNuGet { - pname = "Nethereum.ABI"; - version = "4.1.0"; - sha256 = "1mhg6mh7wkz93fq3pclkxjipcvzglnk70gr9s1cgr2ak84y3g5lr"; - }) - (fetchNuGet { - pname = "Nethereum.Accounts"; - version = "4.1.0"; - sha256 = "0wd4wa2d1dm4ni5l208bn7wi63m1whmbh4x6sfk8m4qh4dlh1bq0"; - }) - (fetchNuGet { - pname = "Nethereum.BlockchainProcessing"; - version = "4.1.0"; - sha256 = "1986y39mpd61s7kkkbcc9hcg7vwmp9mamhiiy9pzsnfgc2jna6c4"; - }) - (fetchNuGet { - pname = "Nethereum.Contracts"; - version = "4.1.0"; - sha256 = "07yj2fqx0p22aayhn7zjczq5xj55b2w48qar8j5q2klzl9q64iwc"; - }) - (fetchNuGet { - pname = "Nethereum.HdWallet"; - version = "4.1.0"; - sha256 = "052g15iqhkx94igvnv5qr8gxpvbi34c7avqn6j4i4p0yf6kwbwsi"; - }) - (fetchNuGet { - pname = "Nethereum.Hex"; - version = "4.1.0"; - sha256 = "1bkmbfclbkr3336za7ii5vac7c4h2l1vd4bl3a15s54piwfgx44w"; - }) - (fetchNuGet { - pname = "Nethereum.JsonRpc.Client"; - version = "4.1.0"; - sha256 = "1260pr9y83nrfqpgq37s91dbsxdfkvdh55x48554c33ldrqsqk4p"; - }) - (fetchNuGet { - pname = "Nethereum.JsonRpc.RpcClient"; - version = "4.1.0"; - sha256 = "0jybgfzy4cj9jx1djjc66vpk9sg88dymy5jrcrply3y6bq85arq3"; - }) - (fetchNuGet { - pname = "Nethereum.KeyStore"; - version = "4.1.0"; - sha256 = "16xffhfx7k9rfb5kr717cpbircj66gazbkbbwvf5hss3v9a6imzz"; - }) - (fetchNuGet { - pname = "Nethereum.Model"; - version = "4.1.0"; - sha256 = "03aaizfpjvbf367mprni2ixlyfvz7ic8cn1cfmjk1n3f3q63qbqh"; - }) - (fetchNuGet { - pname = "Nethereum.RLP"; - version = "4.1.0"; - sha256 = "19ixlvv91s0xhn3bvwn0yydd5932vcylin037dv4wzgbk2v0vdpm"; - }) - (fetchNuGet { - pname = "Nethereum.RPC"; - version = "4.1.0"; - sha256 = "0ivvic38wpay9ry1hp4n88bgglnxcd8id7p5h235ilviq2gxgmmb"; - }) - (fetchNuGet { - pname = "Nethereum.Signer"; - version = "4.1.0"; - sha256 = "1lgyb80l7xwhp4jbfbba0d47p7nxhx0lac08k23nzwnqmg95y4n6"; - }) - (fetchNuGet { - pname = "Nethereum.StandardTokenEIP20"; - version = "4.1.0"; - sha256 = "1i08kpa6knrm3jbhxgfaa2ing5w42j3jsdx72hl6a9xcjdkjr405"; - }) - (fetchNuGet { - pname = "Nethereum.Util"; - version = "4.1.0"; - sha256 = "1fp7ii6ic13d1s8n6l63f1kyb03s04fghhfm7sshvk6bhjlynfqw"; - }) - (fetchNuGet { - pname = "Nethereum.Web3"; - version = "4.1.0"; - sha256 = "1b8myc9wr44vf7kcl9rmhc8zimpfda3mmizhiq1x287xs44nam0b"; - }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; @@ -961,13 +936,13 @@ }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; - version = "3.1.18"; - sha256 = "0yjrp87m0kj8bzybszxnj7n1h21zag3rqpva74xzvm78gz1asc04"; + version = "6.0.1"; + sha256 = "108sc62dqdb6ym2ck651kamcv6qf93cmaqzygfblmiglwzi6frnx"; }) (fetchNuGet { pname = "Npgsql"; - version = "4.1.9"; - sha256 = "1b9qp3cjwydd4g1yy8nxxr0b0nwdbijmcmzjpkb9r13ndgdrd8nq"; + version = "6.0.1"; + sha256 = "150paiwqxp6zsy5v7vl2a9h3ikzfv3pd04whxifmamq0h1ghw0ld"; }) (fetchNuGet { pname = "NSec.Cryptography"; @@ -1001,23 +976,18 @@ }) (fetchNuGet { pname = "Pomelo.EntityFrameworkCore.MySql"; - version = "3.2.7"; - sha256 = "018za1ax17ibxld9rk2nc29716qpn2afh1prfrdjchf5cp56ba2p"; - }) - (fetchNuGet { - pname = "Pomelo.JsonObject"; - version = "2.2.1"; - sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; + version = "6.0.0"; + sha256 = "0qvm5rh9kv8znsp8wbss81w5a2afh0dl13pwkc824j7ywklz0gzz"; }) (fetchNuGet { pname = "Portable.BouncyCastle"; - version = "1.8.2"; - sha256 = "0xqc8q40lr4r7ahsmzpa1q0jagp12abb6rsj80p37q34hsv5284q"; + version = "1.9.0"; + sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; }) (fetchNuGet { pname = "QRCoder"; - version = "1.4.1"; - sha256 = "1xgwhpqrm4ycnj8nk4ibxfwkmkiwc5i15l1za3ci5alghlpcb6ch"; + version = "1.4.3"; + sha256 = "1hmlqbdyq5n9bsmns5h0dwcxpd2jvqr9a2y6dyc9kbjmc8j1dpla"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -1121,8 +1091,8 @@ }) (fetchNuGet { pname = "Selenium.WebDriver.ChromeDriver"; - version = "94.0.4606.6100"; - sha256 = "04kn91qcgsx92yhcqlhpm1yy3m34m371k70szf8h93gcwfs42b9c"; + version = "96.0.4664.4500"; + sha256 = "1kfnrimy49mab6v4afkk290djjyldnn683wdj15dax2mv8yxbyxs"; }) (fetchNuGet { pname = "Selenium.WebDriver"; @@ -1176,23 +1146,23 @@ }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; - version = "2.0.2"; - sha256 = "00p7n7ndmmh45fhhd3clb11igpzklm1n7r50sdrgnbi5yifv1lxl"; + version = "2.0.6"; + sha256 = "1ip0a653dx5cqybxg27zyz5ps31f2yz50g3jvz3vx39isx79gax3"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; - version = "2.0.2"; - sha256 = "11mnbnsiirpgmilskqh1issvgzgg08ndq3p3nkrw73hyqr7kl958"; + version = "2.0.6"; + sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; }) (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; - version = "2.0.2"; - sha256 = "0967w6r6n94hj0fma3kidb9fx1m2p3fgrw6gpsy6q6jbb33qw6vj"; + version = "2.0.6"; + sha256 = "16378rh1lcqxynf5qj0kh8mrsb0jp37qqwg4285kqc5pknvh1bx3"; }) (fetchNuGet { - pname = "SQLitePCLRaw.provider.dynamic_cdecl"; - version = "2.0.2"; - sha256 = "1lzs8yfjygrwfm3hjmkhnbnpsjzq53ijwx9whmii2r9kjg2a46if"; + pname = "SQLitePCLRaw.provider.e_sqlite3"; + version = "2.0.6"; + sha256 = "0chgrqyycb1kqnaxnhhfg0850b94blhzni8zn79c7ggb3pd2ykyz"; }) (fetchNuGet { pname = "SSH.NET"; @@ -1219,6 +1189,11 @@ version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { + pname = "System.Buffers"; + version = "4.5.1"; + sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; + }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; @@ -1229,21 +1204,16 @@ version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "1.5.0"; - sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; - }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "1.7.1"; - sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; - }) (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.NonGeneric"; version = "4.3.0"; @@ -1264,11 +1234,6 @@ version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { - pname = "System.ComponentModel.Annotations"; - version = "4.7.0"; - sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; - }) (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; @@ -1311,8 +1276,8 @@ }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; - version = "4.7.1"; - sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; + version = "6.0.0"; + sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; @@ -1339,11 +1304,6 @@ version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - pname = "System.Drawing.Common"; - version = "4.7.0"; - sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; - }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; @@ -1354,6 +1314,11 @@ version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { + pname = "System.Formats.Asn1"; + version = "5.0.0"; + sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; + }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; @@ -1416,8 +1381,8 @@ }) (fetchNuGet { pname = "System.IO.Pipelines"; - version = "4.7.4"; - sha256 = "09gv2nz35vmmcjrfj1ppxx32v772i0mb369v7lwqr8mz14zhh86r"; + version = "6.0.1"; + sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4"; }) (fetchNuGet { pname = "System.IO"; @@ -1644,16 +1609,6 @@ version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.2"; - sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.6.0"; - sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; - }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; @@ -1664,6 +1619,11 @@ version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "6.0.0"; + sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; + }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; @@ -1774,6 +1734,11 @@ version = "4.7.0"; sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; }) + (fetchNuGet { + pname = "System.Security.Cryptography.Cng"; + version = "5.0.0"; + sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; + }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; @@ -1794,6 +1759,11 @@ version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { + pname = "System.Security.Cryptography.Pkcs"; + version = "5.0.0"; + sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; + }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; @@ -1881,18 +1851,13 @@ }) (fetchNuGet { pname = "System.Text.Encodings.Web"; - version = "5.0.0"; - sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; + version = "6.0.0"; + sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; - version = "4.7.2"; - sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; - }) - (fetchNuGet { - pname = "System.Text.Json"; - version = "5.0.0"; - sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + version = "6.0.0"; + sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; @@ -1909,6 +1874,11 @@ version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; }) + (fetchNuGet { + pname = "System.Threading.Channels"; + version = "4.7.1"; + sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; @@ -1919,11 +1889,6 @@ version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.5.3"; - sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; - }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; @@ -2016,8 +1981,8 @@ }) (fetchNuGet { pname = "Text.Analyzers"; - version = "2.6.4"; - sha256 = "1fm3gjnbfnjap3wphx5x48awriy14a2g3s9c1nc4m8w85k8mqdsl"; + version = "3.3.3"; + sha256 = "1fkx07xi049mlzskrw9422zpikdppsgf7vi2lq97qs5rvly3rfvp"; }) (fetchNuGet { pname = "TwentyTwenty.Storage.Amazon"; @@ -2081,8 +2046,8 @@ }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.2"; - sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + version = "2.4.3"; + sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) (fetchNuGet { pname = "xunit"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix index 4d7943df77..4928f363d7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-37KTcLFVzuXlLpz9INXbasUdzuY+T34ef8EtfczQ+D8="; + hash = "sha256-6TR9OeIAVVbwDrshb9zHTS39x6taNWYK0UyRLbkW+g0="; }; - cargoHash = "sha256-aOSCpvejMUfSZCDwShqMPEc3vXw9ri2QvTaCuHODTwA="; + cargoHash = "sha256-taOrbtx74DICvPLrwym70X3pv7EBA/H22VZmlxefANM="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 96ca870b79..f4b26c5f2e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.16.2"; + version = "4.0.20.1"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-nAaNT5Rt/oLBA2pSJSinoLKMYJ0VZmuC0zoMYbMSAJQ="; + sha256 = "sha256-uKt0TNKcqiXiT5MnsguU5fTdUyFgV7Km5KjrFS/7tws="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix index 41eb1b9ca5..56114ed72a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0l0w1badhvlh1rgqzvlmy5k7xhb1nf4f5dmhkl935a5ila08aak3"; }; - vendorSha256 = "sha256-kA7pOSP4wkzKuFmUqhZmjXJ0ao64cIgZMrQtQ0bQ++U="; + vendorSha256 = "sha256-i8BaT9C39tmHU3GGgd0hUB1PHXnoAdNYRIqZA1ggbjQ="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix new file mode 100644 index 0000000000..35b5f05b38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, qmake +, python3 +, qtbase +, rocksdb +, zeromq +}: + +stdenv.mkDerivation rec { + pname = "fulcrum"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "cculianu"; + repo = "Fulcrum"; + rev = "v${version}"; + sha256 = "sha256-oywxGg+Ss7qBITI2PBXQs5ph7PZbJ3c1smtT/TcVoLI="; + }; + + nativeBuildInputs = [ pkg-config qmake ]; + + dontWrapQtApps = true; # no GUI + + buildInputs = [ python3 qtbase rocksdb zeromq ]; + + meta = with lib; { + description = "Fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC"; + homepage = "https://github.com/cculianu/Fulcrum"; + maintainers = with maintainers; [ prusnak ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} 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 908ace89db..5afdf959cc 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,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.36.3"; + version = "2.38.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256:1sxsr70nm86fyx2m3wf694x1p6kvmkwxw6fqnslpbyjpyi9x73cd"; + hash = "sha256-k6Rbxpe5BpRmlE+WL7iiFUtRCs5KlrLH2c3iSucUhqo="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix index 85ec49f3be..2f4caad325 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.16.0-beta"; + version = "0.17.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "0q4lk338mr30frilgnjr43gd55z7ryj2s260437b4pnp03hmbf10"; + sha256 = "0hjawagn1dfgj67i52bvf3phvm9f9708z3jqs6cvyz0w7vp107py"; }; - vendorSha256 = "14862603rrss14p537j9i7iwflaaprwrnslmqm9hpb7hj52bxqfv"; + vendorSha256 = "1fpc73hwdn3baz5ykrykvqdr5861gj9p6liy8qll5525kdv560f6"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix index 3cc054cea5..198fdb0cf4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.14.1-beta"; + version = "0.14.2-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0arm36682y4csdv9abqs0l8rgxkiqkamrps7q8wpyyg4n78yiij3"; + sha256 = "sha256-JOKitxxWcTlGlxYR1XpySZlI2fT9jgBrOxNUwT/sqdQ="; }; - vendorSha256 = "13zhs0gb7chi0zz5rabmw3sd5fcpxc4s553crfcg7lrnbn5hcwzv"; + vendorSha256 = "sha256-shDmJcEyobY7Ih1MHMEY2GQnzAffsH/y4J1bme/bT7I="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index be3d610d8f..5b25afd587 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -2,20 +2,20 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.2.18"; + version = "2.2.20"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-zjSHgMdK417bm1Z/B2kvloDnPTqzM9jEVkZvoKeBkzM="; + sha256 = "sha256-C3REnfecNwf3dtk6aLYAEsedHRlIrQZAokXtf6KI8U0="; }; projectFile = "NBXplorer/NBXplorer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.aspnetcore_3_1; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; postFixup = '' mv $out/bin/{NBXplorer,nbxplorer} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index 05c602c27d..e794e0a976 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -6,13 +6,13 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "3.1.19"; - sha256 = "1fh3k85k988jw35sf5hvm6jwmvzmslzpfvf3jk3sn3f3s6gyk0an"; + version = "6.0.1"; + sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "3.1.19"; - sha256 = "1nh08kjdc152m85ycwxn1q8r69f0l02p6cac6q57nzlyy5gyj2rs"; + version = "6.0.1"; + sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; }) (fetchNuGet { pname = "Microsoft.Azure.Amqp"; @@ -226,8 +226,8 @@ }) (fetchNuGet { pname = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + version = "13.0.1"; + sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index 2075c95aad..43f41e5aee 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.12.2"; + version = "22.1.1"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-LzcTFSNN/loYaTDt+QpW8QpSgOTw2097IYdc7mC57Mn4NR/X2hycYZ9ZfZjBh9QFfVu/4R3UN2sA177v6Inomg=="; - x86_64-linux = "sha512-W/voBZrXaJVDN4eSUDD6lyBR9BqboD2k2/azI1pWm1NFUmDZFM+OGzyiPB3n+6SziAhca32Ot5Wy27sfmIjh3g=="; + aarch64-linux = "sha512-hRPwhKdAqiHmsaIuNm5r3ZuKhUh+IipR5/5N/9PwiLEfaSQRWink0dUwyuUoWzy4DyGabLQyIWbQRvR7eRGKJA=="; + x86_64-linux = "sha512-W4S7W4TeDtSwWCj6N6EoJJOCYG3m1pK3D+UPlsp7B7VY/0uBtI31+tS28E6TUgXZUttr8IIbqzJYWCuyLfDthQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; 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 ec4f9b59e9..e7824cd93f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -9,16 +9,16 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.26"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "NE2FgjXtXTCVrCWRakqPhzAGn3blpf0OugJSKviPVBs="; + version = "2021.1.1.21"; # "Android Studio Bumblebee (2021.1.1 Patch 1)" + sha256Hash = "PeMJIILfaunTlpR4EV76qQlTlZDcWoKes61qe9W9oqQ="; }; betaVersion = { - version = "2021.1.1.18"; # "Android Studio Bumblebee (2021.1.1) Beta 5" - sha256Hash = "gWG8h3wTQDH84vSKlfTm3soUqLkwFYfSymJuAAFPDuQ="; + version = "2021.2.1.8"; # "Android Studio Chipmunk (2021.2.1) Beta 1" + sha256Hash = "bPfs4kw7czG9CbEgrzn0bQXdT03jyqPVqtaIuVBFSmc="; }; latestVersion = { # canary & dev - version = "2021.2.1.5"; # "Android Studio Chipmunk (2021.2.1) Canary 5" - sha256Hash = "PS45nu5g9qXNeolYnFEs//Z6p8eIZoD6kUo/0yfHQ6A="; + version = "2021.3.1.1"; # "Android Studio Dolphin (2021.3.1) Canary 1" + sha256Hash = "W3pNQBM7WdDScQo5b8q5Va5NTgl73uZu0ks/zDMb4aA="; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix b/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix index e17fb402ed..3f84666fe0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libX11 libXi libXt libXft ]; + # build fails when run in parallel + enableParallelBuilding = false; postInstall = '' mkdir -p $out/share/applications diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index e7db1cb1cf..2004f607fe 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.15"; + version = "13.0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.15.tar"; - sha256 = "1rm8s02d1mx5sw7yj65zlr07xhimnmvqav7f45nz2h8bwka02c3c"; + url = "https://elpa.gnu.org/packages/auctex-13.0.16.tar"; + sha256 = "1r9piq4js45knw8sf73kk8jjinmx4m2mdinc98xrklnwcffw7hjf"; }; packageRequires = [ emacs ]; meta = { @@ -459,6 +459,21 @@ license = lib.licenses.free; }; }) {}; + cape = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "cape"; + ename = "cape"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cape-0.6.tar"; + sha256 = "0pc0vvdb0pczz9n50wry6k6wkdaz3bqin07nmlxm8w1aqvapb2pr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cape.html"; + license = lib.licenses.free; + }; + }) {}; capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "capf-autosuggest"; @@ -696,10 +711,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.14.tar"; - sha256 = "0lb72j4nxvaar2vip6jlyn62b9z2p2vsmijk3m9nsrshbqnlf0rc"; + url = "https://elpa.gnu.org/packages/consult-0.15.tar"; + sha256 = "0hsmxaiadb8smi1hk90n9napqrygh9rvj7g9a3d9isi47yrbg693"; }; packageRequires = [ emacs ]; meta = { @@ -726,10 +741,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.17.tar"; - sha256 = "13nmbyrsvglzv57n9srl0kz75y07v8imr6c99nbf1mssli3h6n7y"; + url = "https://elpa.gnu.org/packages/corfu-0.18.tar"; + sha256 = "1g1b05wc9qql5qw3diprx0ay2rmq7963gdgyh7bi5i0xlfaspbgi"; }; packageRequires = [ emacs ]; meta = { @@ -741,10 +756,10 @@ elpaBuild { pname = "coterm"; ename = "coterm"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/coterm-1.3.tar"; - sha256 = "078rrc776mdzb4nczp1h8p0pymzds76kz3g2h78ri95k3wpy5ksj"; + url = "https://elpa.gnu.org/packages/coterm-1.4.tar"; + sha256 = "0cs9hqffkzlkkpcfhdh67gg3vzvffrjawmi89q7x9p52fk9rcxp6"; }; packageRequires = [ emacs ]; meta = { @@ -906,10 +921,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.29"; + version = "0.30"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.29.tar"; - sha256 = "1bn21d9dr9pb3vdak3v07x056xafym89kdpxavjf4avy6bry6s4d"; + url = "https://elpa.gnu.org/packages/debbugs-0.30.tar"; + sha256 = "05yy1hhxd59rhricb14iai71w681222sv0i703yrgg868mphl7sb"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -992,6 +1007,21 @@ license = lib.licenses.free; }; }) {}; + diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "diminish"; + ename = "diminish"; + version = "0.46"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diminish-0.46.tar"; + sha256 = "17lsm5khp7cqrva13kn252ab57lw28sibf14615wdjvfqwlwwha4"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/diminish.html"; + license = lib.licenses.free; + }; + }) {}; dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dired-du"; @@ -1082,6 +1112,21 @@ license = lib.licenses.free; }; }) {}; + dtache = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dtache"; + ename = "dtache"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dtache-0.5.tar"; + sha256 = "10gcnkajpw7szd41l6ykkysv00yp93y1z9ajhcmk4wzni93w21z2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dtache.html"; + license = lib.licenses.free; + }; + }) {}; dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "dts-mode"; @@ -1131,10 +1176,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.8"; + version = "0.8.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.8.tar"; - sha256 = "035xakji5vypdpc06qp9yhg8ny7qn80h8kax6cl80p0lljplzrnn"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.10.tar"; + sha256 = "1763zk75a85803wbn68sz4n3yvkhzh3a8571syd1r2npb59b40ad"; }; packageRequires = [ emacs seq ]; meta = { @@ -1191,10 +1236,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211226"; + version = "20220120"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211226.tar"; - sha256 = "15ggg7sv4m5yc8ldyyffz7vgaj00xbw15zga0x2lpdfmahh6y2as"; + url = "https://elpa.gnu.org/packages/eev-20220120.tar"; + sha256 = "0wbm7bd48vl66vhraqfwycz989hd36whris1xa5rbhfbxgz2d1sx"; }; packageRequires = [ emacs ]; meta = { @@ -1214,10 +1259,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.7.tar"; - sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk"; + url = "https://elpa.gnu.org/packages/eglot-1.8.tar"; + sha256 = "1n04jnf3wwpxafrzfd02l53wf90brjc8p835f84k0n0rjxin99k5"; }; packageRequires = [ eldoc emacs flymake jsonrpc project xref ]; meta = { @@ -1264,10 +1309,10 @@ elpaBuild { pname = "eldoc-eval"; ename = "eldoc-eval"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-eval-0.1.el"; - sha256 = "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19"; + url = "https://elpa.gnu.org/packages/eldoc-eval-0.2.tar"; + sha256 = "09g9y1w1dlq3s8sqzczgaj02y53x616ak9w3kynq53pwgaxq14j4"; }; packageRequires = []; meta = { @@ -1309,10 +1354,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.14.tar"; - sha256 = "12d4lza54sf493z9hx1fqlrhrx19girrdh560syi4gg03kg8s7nr"; + url = "https://elpa.gnu.org/packages/embark-0.15.tar"; + sha256 = "0dr97549xrs9j1fhnqpdspvbfxnzqvzvpi8qc91fd2v4jsfwlklh"; }; packageRequires = [ emacs ]; meta = { @@ -1329,10 +1374,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.3.tar"; - sha256 = "1l38bnphfq65r2fjy8zi7a8l4h361bfz756sswa3r7446jhd48rv"; + url = "https://elpa.gnu.org/packages/embark-consult-0.4.tar"; + sha256 = "1z0xc11y59lagfsd2raps4iz68hvw132ff0qynbmvgw63mp1w4yy"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1349,10 +1394,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "8"; + version = "9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-8.tar"; - sha256 = "1iffh6n8q9xag25m9bgnpywa27bkdvvz2gr500hdgwwddgdm4pq8"; + url = "https://elpa.gnu.org/packages/emms-9.tar"; + sha256 = "12p9nigzyrlpkfvg7v76jmcfs08z84gggnx7h4frdaim3kx5y6xf"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2168,10 +2213,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.14.el"; - sha256 = "069l0sqkambam4ikj9id36kdw1jdjna8v586d51m64hiz96rmvm6"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar"; + sha256 = "1hx378rg12jz2zm105cvrqk0nqyzsn04l59d903l98d6lbd96rsw"; }; packageRequires = [ emacs ]; meta = { @@ -2258,10 +2303,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.5.2"; + version = "4.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.5.2.tar"; - sha256 = "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54"; + url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar"; + sha256 = "1rdbrf84ijapiqhq72gy8r5xgk54sf0jy31pgd3w4rl1wywh5cas"; }; packageRequires = [ emacs ]; meta = { @@ -2393,10 +2438,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.11.tar"; - sha256 = "0mri8awary11hwg6lib903q5jcv2isnf8mi62mgndiki5s9cgrbs"; + url = "https://elpa.gnu.org/packages/marginalia-0.12.tar"; + sha256 = "01dy9dg2ac6s84ffcxn2pw1y75pinkdvxg1j2g3vijwjd5hpfakq"; }; packageRequires = [ emacs ]; meta = { @@ -2438,10 +2483,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "0.3.0"; + version = "0.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mct-0.3.0.tar"; - sha256 = "07wywk5zadcinjpx9hvag8ndzb426lq5jlg42rqdgrv92ka7n16b"; + url = "https://elpa.gnu.org/packages/mct-0.4.2.tar"; + sha256 = "0as8298mb136az555zag5q3xvc7d0z508d3siii60wmzs9dyb8dx"; }; packageRequires = [ emacs ]; meta = { @@ -2751,10 +2796,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar"; - sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl"; + url = "https://elpa.gnu.org/packages/nano-theme-0.3.0.tar"; + sha256 = "1nq5x46467vnsfg3fzb0qyg97xpnwsvbqg8frdjil5zq5fhsgmrz"; }; packageRequires = [ emacs ]; meta = { @@ -2916,6 +2961,21 @@ license = lib.licenses.free; }; }) {}; + orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "orderless"; + ename = "orderless"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/orderless-0.7.tar"; + sha256 = "0hvfqxpazan1djpn0qxh609r53jgddpcdih6chkn2zvx29mhdkgg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/orderless.html"; + license = lib.licenses.free; + }; + }) {}; org = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "org"; @@ -2965,10 +3025,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-transclusion-1.1.1.tar"; - sha256 = "12dp5fc7iw78qx2f501ch8mvhvw90bxg8hhvx0kz3y24gf2h8d4d"; + url = "https://elpa.gnu.org/packages/org-transclusion-1.2.0.tar"; + sha256 = "1q36nqxynzh8ygvgw5nmg49c4yq8pgp6lcb6mdqs9paw8pglxcjf"; }; packageRequires = [ emacs org ]; meta = { @@ -3145,10 +3205,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.13"; + version = "0.4.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.13.tar"; - sha256 = "03j5ck0pk88kdl7br1rkdqmnjd8418y9w9m27gk63hqbi3p8diy6"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.16.tar"; + sha256 = "0k8n2pa20nkqd8w4c86p1f5cgn93favxxhws62i4w16934x6w07j"; }; packageRequires = [ emacs ]; meta = { @@ -3190,10 +3250,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.1.5.tar"; - sha256 = "1kyd3r926hhs03mmpyvbjjyqcbvqrxk62rrscgfyl7rqi9ar56i0"; + url = "https://elpa.gnu.org/packages/posframe-1.1.7.tar"; + sha256 = "13i2wxx079gfq0vbq0iwmsig5b7x4aspd1q02yqc79846f1dsx4w"; }; packageRequires = [ emacs ]; meta = { @@ -3250,10 +3310,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-4.0.3.tar"; - sha256 = "110d9d8xglnyv0cn0slwk3msgqq8rs01xq2qmx5ya7i2v77gd5ql"; + url = "https://elpa.gnu.org/packages/pyim-4.1.0.tar"; + sha256 = "1q4b3y72gbkl5z31brlnjqjl30lgqm2d1zlqrbkqnnfy5hjgazk9"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3560,10 +3620,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.19"; + version = "1.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.19.tar"; - sha256 = "14z3i01pq5ljhjf5yfcjw7hxljcrwjnizkrdc1qyh9b6h3ic1bbi"; + url = "https://elpa.gnu.org/packages/relint-1.20.tar"; + sha256 = "0r20dim2r4a4bv0fmgbnq3graa7hhlai55h9qyknapqbr2j1v1h7"; }; packageRequires = [ emacs xr ]; meta = { @@ -3620,10 +3680,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "2.4"; + version = "4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-2.4.tar"; - sha256 = "1qfd0dy4n04gf3vx0pbwfgmp4wm2a64sh3m6mlfhinqgmasajh6r"; + url = "https://elpa.gnu.org/packages/rt-liberation-4.tar"; + sha256 = "15vs982cxpc3g8cq2gj3a6dfn9i2r9b44x38ydvcmiy2brkd3psj"; }; packageRequires = []; meta = { @@ -3742,6 +3802,7 @@ license = lib.licenses.free; }; }) {}; + # removed duplicated shell-command-plus shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "shell-command-plus"; @@ -3892,16 +3953,20 @@ license = lib.licenses.free; }; }) {}; - soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + soap-client = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "soap-client"; ename = "soap-client"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/soap-client-3.2.0.tar"; - sha256 = "1s0bwnip22nj6kgjadd4zlj9j729hiyyjb66sr51i2mddnf9i95s"; + url = "https://elpa.gnu.org/packages/soap-client-3.2.1.tar"; + sha256 = "0ajv6l1p8dinnlybwzvv4c2i6291is6isjxb2h4apg27g66qbcki"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/soap-client.html"; license = lib.licenses.free; @@ -4046,10 +4111,10 @@ elpaBuild { pname = "svg-lib"; ename = "svg-lib"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-lib-0.2.4.tar"; - sha256 = "0vcf3vbrzhgwssf6mi4xyic32yzjsrllp2zaqdk3c0qjvq9w4wxa"; + url = "https://elpa.gnu.org/packages/svg-lib-0.2.5.tar"; + sha256 = "022jp54w14sv0d71j0z76bnir9bgvysmcpcxpzpiiz77da6rg393"; }; packageRequires = [ emacs ]; meta = { @@ -4147,6 +4212,21 @@ license = lib.licenses.free; }; }) {}; + tempel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tempel"; + ename = "tempel"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tempel-0.2.tar"; + sha256 = "0xn2vqaxqv04zmlp5hpb9vxkbs3bv4dk22xs5j5fqjid2hcv3714"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tempel.html"; + license = lib.licenses.free; + }; + }) {}; test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "test-simple"; @@ -4200,10 +4280,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2"; + version = "2.5.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.tar"; - sha256 = "1j71x3q6x9xyf21capjxcp85b7z2x9khrqsd2sy2s3qwxz3jbg5n"; + url = "https://elpa.gnu.org/packages/tramp-2.5.2.1.tar"; + sha256 = "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p"; }; packageRequires = [ emacs ]; meta = { @@ -4290,10 +4370,10 @@ elpaBuild { pname = "uni-confusables"; ename = "uni-confusables"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uni-confusables-0.2.tar"; - sha256 = "1an2l7f8lqhp3hq511a371isv1q00nx431g2a7266pp6pn2sndj1"; + url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar"; + sha256 = "1grmppbyzvjjz0yiv5vvgpykhalisj9jnh6p9ip9vbnnll63iz4w"; }; packageRequires = []; meta = { @@ -4389,10 +4469,10 @@ elpaBuild { pname = "vc-got"; ename = "vc-got"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-got-1.0.tar"; - sha256 = "1lx52g261zr52gy63vjll8mvczcbdzbsx3wa47qdajrq9bwmj99j"; + url = "https://elpa.gnu.org/packages/vc-got-1.1.tar"; + sha256 = "1myck30ybq8ggf4yk3s2sqjqj8m1kfl8qxygkk3ynfa6jxxy4x1r"; }; packageRequires = [ emacs ]; meta = { @@ -4481,10 +4561,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.19.tar"; - sha256 = "1i9aqxsplmzyy7nv4czspa66a6v33lnng1d8zsgjf1m9sz0kyzxp"; + url = "https://elpa.gnu.org/packages/vertico-0.20.tar"; + sha256 = "1hg91f74klbwisxzp74d020v42l28wik9y1lg3hrbdspnhlhsdrl"; }; packageRequires = [ emacs ]; meta = { @@ -4501,10 +4581,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.4.8"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.4.8.tar"; - sha256 = "1cvihfj59qycd3kifxbg9ndrmiihc62si8q5b8fxc1p20acw4f69"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.2.tar"; + sha256 = "0gzvm0la706kg3aqgrd6crz6353sp47dnpxdj9l2avb31avyqmv9"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -4749,10 +4829,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.10.el"; - sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i"; + url = "https://elpa.gnu.org/packages/xclip-1.11.tar"; + sha256 = "0hgblj8ng7vfsdb7g1mm9m2qhzfprycdd77836l59prpak5kp55q"; }; packageRequires = []; meta = { @@ -4794,10 +4874,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.21.tar"; - sha256 = "0mc10d33lsqs0ihcja8w78jzh2pk0dfm9m86kap6r3hi6wkr1cmi"; + url = "https://elpa.gnu.org/packages/xr-1.22.tar"; + sha256 = "1l3bqgzvbamfs4n628kg789g7vjn4v81q570gzbw2cwjgk4s6xbj"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index a6b732d6a0..89f2eb07d7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -45,6 +45,21 @@ license = lib.licenses.free; }; }) {}; + annotate = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "annotate"; + ename = "annotate"; + version = "1.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/annotate-1.5.0.tar"; + sha256 = "0ba91yy2id5jsl9bg8cfjm2sqbqp9jwwdikwkdj5v6xz6ggh134b"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/annotate.html"; + license = lib.licenses.free; + }; + }) {}; anti-zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "anti-zenburn-theme"; @@ -155,6 +170,21 @@ license = lib.licenses.free; }; }) {}; + bind-map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bind-map"; + ename = "bind-map"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar"; + sha256 = "1x98pgalnpl45h63yw6zz6q16x00phijyx2pf4jrf93s18lx33z5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bind-map.html"; + license = lib.licenses.free; + }; + }) {}; bison-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "bison-mode"; @@ -340,6 +370,21 @@ license = lib.licenses.free; }; }) {}; + dockerfile-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dockerfile-mode"; + ename = "dockerfile-mode"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.5.tar"; + sha256 = "0dz91i4ak3v0x1v75ibhjjz211k9g6qimz4lxn3x424j7dlpa9f3"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html"; + license = lib.licenses.free; + }; + }) {}; dracula-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dracula-theme"; @@ -355,6 +400,21 @@ license = lib.licenses.free; }; }) {}; + drupal-mode = callPackage ({ elpaBuild, fetchurl, lib, php-mode }: + elpaBuild { + pname = "drupal-mode"; + ename = "drupal-mode"; + version = "0.7.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar"; + sha256 = "1cglipmwx5v8vaqkkc7f5ka3dpxlrmmqrqhi885mm625kh2r27j1"; + }; + packageRequires = [ php-mode ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drupal-mode.html"; + license = lib.licenses.free; + }; + }) {}; editorconfig = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -375,6 +435,36 @@ license = lib.licenses.free; }; }) {}; + elixir-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "elixir-mode"; + ename = "elixir-mode"; + version = "2.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.4.0.tar"; + sha256 = "0h3ypyxmcpfh8kcwd08rsild4jy8s4mr3zr8va03bbh81pd3nm1m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/elixir-mode.html"; + license = lib.licenses.free; + }; + }) {}; + elpher = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "elpher"; + ename = "elpher"; + version = "3.3.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elpher-3.3.1.tar"; + sha256 = "056z3ryj2288wgl8h4b33v9hybm8n2kfrqyb22bmlq1npcixyjl7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/elpher.html"; + license = lib.licenses.free; + }; + }) {}; evil = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "evil"; @@ -405,6 +495,21 @@ license = lib.licenses.free; }; }) {}; + evil-args = callPackage ({ elpaBuild, evil, fetchurl, lib }: + elpaBuild { + pname = "evil-args"; + ename = "evil-args"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar"; + sha256 = "0lgwrhjsy098h2lhsiasm39kzkdfqcjnapc2q6f2gyf7zll37761"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.gnu.org/packages/evil-args.html"; + license = lib.licenses.free; + }; + }) {}; evil-exchange = callPackage ({ cl-lib ? null , elpaBuild , evil @@ -553,14 +658,44 @@ license = lib.licenses.free; }; }) {}; + forth-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "forth-mode"; + ename = "forth-mode"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar"; + sha256 = "0qk6kg8d38fcvbxa4gfsdyllzrrp9712w74sj29b90fppa11b530"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/forth-mode.html"; + license = lib.licenses.free; + }; + }) {}; + free-keys = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "free-keys"; + ename = "free-keys"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar"; + sha256 = "1w0dslygz098bddap1shwa8pn55ggavz2jn131rmdnbfjy6plglv"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/free-keys.html"; + license = lib.licenses.free; + }; + }) {}; geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.22"; + version = "0.22.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.22.tar"; - sha256 = "0jcxjfn9d7cnsir2pva0axaz180d01sn0l9f175sj57ws8spj2h2"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.22.2.tar"; + sha256 = "0mva8arcxj1kf6g7s6f6ik70gradmbnhhiaf7rdkycxdd8kdqn7i"; }; packageRequires = [ emacs transient ]; meta = { @@ -647,10 +782,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.1.tar"; - sha256 = "1sm19jmaxzxkxd4jksgvc064jv90bc6q0yf8zz0s77y0aldw8sf5"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.2.tar"; + sha256 = "06mr8clsk8fj73q4ln90i28xs8axl4sd68wiyl41kgg9w5y78cb7"; }; packageRequires = [ emacs geiser ]; meta = { @@ -814,6 +949,21 @@ license = lib.licenses.free; }; }) {}; + graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "graphql-mode"; + ename = "graphql-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar"; + sha256 = "11vn02vwiqbkzl9gxsm3gvybkbac13xnzzv2y227j3y8aq5kbwss"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/graphql-mode.html"; + license = lib.licenses.free; + }; + }) {}; gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gruvbox-theme"; @@ -889,6 +1039,36 @@ license = lib.licenses.free; }; }) {}; + helm = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "helm"; + ename = "helm"; + version = "3.8.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/helm-3.8.3.tar"; + sha256 = "00qjcv4qxjw50zp5dzvn79c0xpyla4h41fxkr2jjszq6qzgd92cv"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/helm.html"; + license = lib.licenses.free; + }; + }) {}; + helm-core = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "helm-core"; + ename = "helm-core"; + version = "3.8.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.3.tar"; + sha256 = "11ggn1fmi8wbg2igs5lqppyccgpz8kyfzl17wqkr5xy69lr1jn5g"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/helm-core.html"; + license = lib.licenses.free; + }; + }) {}; highlight-parentheses = callPackage ({ elpaBuild , emacs , fetchurl @@ -991,6 +1171,21 @@ license = lib.licenses.free; }; }) {}; + jade-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "jade-mode"; + ename = "jade-mode"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar"; + sha256 = "1kkf5ayqzs1rs7b3jqwb21r2mikds3lillfrs3pkcca7lj76313n"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/jade-mode.html"; + license = lib.licenses.free; + }; + }) {}; jinja2-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "jinja2-mode"; @@ -1036,6 +1231,21 @@ license = lib.licenses.free; }; }) {}; + kotlin-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "kotlin-mode"; + ename = "kotlin-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/kotlin-mode-1.0.0.tar"; + sha256 = "0ajnnsh6a8psfh7gd34d2wfii08jxr7x7k6na0assjldsxy7afwj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kotlin-mode.html"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "lua-mode"; @@ -1259,6 +1469,26 @@ license = lib.licenses.free; }; }) {}; + nix-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , magit-section + , transient }: + elpaBuild { + pname = "nix-mode"; + ename = "nix-mode"; + version = "1.4.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nix-mode-1.4.4.tar"; + sha256 = "1nn74671273s5mjxzbdqvpwqx6w12zya21sxhzw51k2fs68vwh23"; + }; + packageRequires = [ emacs magit-section transient ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nix-mode.html"; + license = lib.licenses.free; + }; + }) {}; org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-contrib"; @@ -1314,10 +1544,10 @@ elpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.4.tar"; - sha256 = "048psi5h8ln83pra4f24iq794w00b8p8pk67cylbd8afjdhh2x1r"; + url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.6.tar"; + sha256 = "1l6mniyhmw3vbkvahw24038isd4ysbx505c3r0ar1rh7fbdf58cf"; }; packageRequires = [ emacs ]; meta = { @@ -1436,6 +1666,21 @@ license = lib.licenses.free; }; }) {}; + pcmpl-args = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "pcmpl-args"; + ename = "pcmpl-args"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar"; + sha256 = "1p9y80k2rb9vlkqbmwdmzw279wlk8yk8ii5kqgkyr1yg224qpaw7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pcmpl-args.html"; + license = lib.licenses.free; + }; + }) {}; pdf-tools = callPackage ({ elpaBuild , emacs , fetchurl @@ -1531,6 +1776,21 @@ license = lib.licenses.free; }; }) {}; + raku-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "raku-mode"; + ename = "raku-mode"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar"; + sha256 = "01ygn20pbq18rciczbb0mkszr33pifs6i74rajxz03bcgx2j3q6f"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/raku-mode.html"; + license = lib.licenses.free; + }; + }) {}; request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "request"; @@ -1715,14 +1975,29 @@ license = lib.licenses.free; }; }) {}; + stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "stylus-mode"; + ename = "stylus-mode"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar"; + sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/stylus-mode.html"; + license = lib.licenses.free; + }; + }) {}; subatomic-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "subatomic-theme"; ename = "subatomic-theme"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.1.tar"; - sha256 = "0j496l7c2rwgxk2srcf1a70z63y48q5bs9cpx95212q7rl20zhip"; + url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar"; + sha256 = "0h2ln37ir6w4q44vznlkw4kzaisfpvkgs02dnb2x9b1wdg5qfqw4"; }; packageRequires = []; meta = { @@ -1734,10 +2009,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "0.0.3"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-0.0.3.tar"; - sha256 = "1qwpzj9j5fbis6vlgnqyilc49gbnxf48wcrjl8kljwzna3hsk7bx"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.2.tar"; + sha256 = "187ksczrqqzjnbvh8px3xvqyf38i7ac24z1qxzybd4vx2n071v64"; }; packageRequires = [ emacs ]; meta = { @@ -1826,6 +2101,21 @@ license = lib.licenses.free; }; }) {}; + textile-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "textile-mode"; + ename = "textile-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar"; + sha256 = "14ssqiw8x1pvjlw76h12vrk2w5qmhvp11v4h3cddqi96fddr95sq"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/textile-mode.html"; + license = lib.licenses.free; + }; + }) {}; toc-org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "toc-org"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 6eadee0da2..fc60a6916c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1035,8 +1035,8 @@ "auto-complete", "yasnippet" ], - "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd", - "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h" + "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", + "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" }, "stable": { "version": [ @@ -1061,8 +1061,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20211220, - 219 + 20220120, + 754 ], "deps": [ "dash", @@ -1072,8 +1072,8 @@ "s", "xcscope" ], - "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd", - "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h" + "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", + "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" }, "stable": { "version": [ @@ -1249,6 +1249,24 @@ "sha256": "0m32jpg6n0azz2f4y57y92zfvzm54ankx5cm06gli2zw2v1218fw" } }, + { + "ename": "accent", + "commit": "86fe3baa514cf81f4b031ab55d94555fba2c1a55", + "sha256": "191mhb57gj7zcgcb4h99jv8ac08l90wzsmy4aq22pz8sw56bvzpa", + "fetcher": "github", + "repo": "elias94/accent", + "unstable": { + "version": [ + 20220202, + 1312 + ], + "deps": [ + "popup" + ], + "commit": "6b502df6940587dae2dfbd349c22dfd44c803a86", + "sha256": "0q4cf4w0gm933ph4r2glw40vgfiz1v9r043w6lms3z2a0b3p6sdb" + } + }, { "ename": "ace-flyspell", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -2521,14 +2539,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20220104, - 1421 + 20220122, + 2206 ], "deps": [ "all-the-icons" ], - "commit": "df9822a782c409f7e19481921c985d4290882c65", - "sha256": "1906z26h84zz9f7zj1lzqgr92i05h2vgkx2mg5aa2k8kiv4v8p3j" + "commit": "8a914b100348493a665f0d53de4e22bf5b30a2a5", + "sha256": "02rymhafqd2amazi2ds39vf5p01lfa75k5vyary3zrk2q01x1ba3" }, "stable": { "version": [ @@ -2583,15 +2601,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220104, - 1420 + 20220125, + 1547 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "f7d3d1bb69c86087f8b05fa672dd62e096370bfa", - "sha256": "0xnrhrc51hvjxn1mc53jdz868a7gbr6frkl2vgcdbbm2v41jqxlv" + "commit": "1365b83824614656278b0b818fadf293e8ec0973", + "sha256": "0xx0ls0i6rhnacyscxzpnpdm9vy79lj634jvi9cp572y742l7cpx" }, "stable": { "version": [ @@ -2654,11 +2672,11 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20200723, - 1037 + 20220205, + 722 ], - "commit": "2219a8326f8cd8ea5cd91583ba84cae7557b6fd7", - "sha256": "1sx8mp875dfbrir26fl33hql2ypjx2alqzn55qrkhyafyn6lmcmv" + "commit": "a1671339bde3dec273b367bf7dc849d1c306dac6", + "sha256": "17n11prkp1d1ln16jcfyy1m6wp6i8qi57zwy8g9cr13xwgq9f324" }, "stable": { "version": [ @@ -3190,20 +3208,20 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20211001, - 946 + 20220128, + 1118 ], - "commit": "b9c908f24c2119d99cd93c86a0920223ef0568e9", - "sha256": "169nwa7jfsdcjk6mbm3yabk3j8iwfixfkypwk5336dy2ncf90cjc" + "commit": "0cfad246ee4c1297efa399e3d2c6ebb8bb46288b", + "sha256": "1g4gyf087h98njzzjj23n114zhrlg2z1ab7d3v4438wph6c7my14" }, "stable": { "version": [ - 0, - 8, + 1, + 4, 3 ], - "commit": "4cc32fc2fb403dd0c501ffe7c23ba13fd23fd6ec", - "sha256": "0wjrmy2qsndfg7lwql6xw5b88j468cz365jx1sgpsplkgm25xsk2" + "commit": "b9c908f24c2119d99cd93c86a0920223ef0568e9", + "sha256": "169nwa7jfsdcjk6mbm3yabk3j8iwfixfkypwk5336dy2ncf90cjc" } }, { @@ -3232,8 +3250,8 @@ 20200914, 644 ], - "commit": "382861b1967b7ced0806343b8410709b2ce91df0", - "sha256": "05w4wmbdzg4j3nppix6gb2knf9wfyzqjcf0i1adbk7rawgcymq1x" + "commit": "9911f73061e21a87fad76c662463257afe02c861", + "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk" }, "stable": { "version": [ @@ -4004,26 +4022,26 @@ "repo": "fizban007/arxiv-mode", "unstable": { "version": [ - 20211231, - 100 + 20220128, + 920 ], "deps": [ "hydra" ], - "commit": "209a026f528d5b8de0da996d46fddc47ce0749fd", - "sha256": "1kaikdh2mcp6qg45wlhi3ffq9ws2n07i26byxjvxbwwpd5f0335v" + "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2", + "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "hydra" ], - "commit": "74105e665758bad77bd67c00435dbee95c83d791", - "sha256": "1d9aw5x2ypx6d5dyjrnmlrfdj0k5a6z6nqvrllb1n38a8gsr47ym" + "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2", + "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln" } }, { @@ -4074,6 +4092,36 @@ "sha256": "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597" } }, + { + "ename": "asm-blox", + "commit": "78949c0632b01b70385947c69490097e9c3c5cc4", + "sha256": "0cgc6r3l2q4afdpwh632ykac6cpxcxs0lkazzbfd4bagzbl69jdz", + "fetcher": "github", + "repo": "zkry/asm-blox", + "unstable": { + "version": [ + 20220124, + 1430 + ], + "deps": [ + "yaml" + ], + "commit": "ad00c5eb90f189223ef8a0b49c1dc5fef1ef26b0", + "sha256": "0wrwqr79swsj4jmvnn0ljzymjmp1rr4al37qibagl6pj8vfdqim0" + }, + "stable": { + "version": [ + 0, + 2, + 3 + ], + "deps": [ + "yaml" + ], + "commit": "8bc20ab442765dffc6c710c1922757c2df3675a4", + "sha256": "1b9iqbwc7g2z9k413mb01s1qzzshfmxs25pn2m0l1z26fc81dch0" + } + }, { "ename": "asn1-mode", "commit": "b694baceceb54810be8f8c7152b2ac0b4063f01c", @@ -4217,11 +4265,11 @@ "url": "https://tildegit.org/contrapunctus/async-backup.git", "unstable": { "version": [ - 20211128, - 1603 + 20220131, + 1438 ], - "commit": "ba927feec1b568eb2b0a647b3eb7adf2d4a061e8", - "sha256": "0y88wj7p4amsqbj19rxxvhpffw43yganp1cxmzrmhbi5v66jikpr" + "commit": "6ddb39fe77d66cdef48b87cb0d0554ad7d132308", + "sha256": "14clnfjn4wwi0kza5d98d2iv9sjfnxs28cabm9psjvi239lx0f9d" } }, { @@ -4383,8 +4431,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20220113, - 823 + 20220124, + 1253 ], "deps": [ "dash", @@ -4392,8 +4440,8 @@ "flycheck", "s" ], - "commit": "70d15ebaf68d613134a1651bfb3118b57264a3db", - "sha256": "0p3d39d0vhb0c9lr6q4fz1g1jwvap5ym7kwfkk1m4dg16c2a0p60" + "commit": "19a520ecb99529790906a1fb5599acdf2b4f005f", + "sha256": "15jv6bng8xnkng005n1qbbg5lngjyq7mb5q6x3j77bkb3l8pnr9d" }, "stable": { "version": [ @@ -5418,11 +5466,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20211218, - 1848 + 20220201, + 2102 ], - "commit": "222954754ace827a80999955f02008841b260325", - "sha256": "01xg2g7fr6l495yvxsrln4q1i6v626spdy2yw9jkbc2jzpx34v0q" + "commit": "8965ce57c7d206e5d28167a37c11b9713576b009", + "sha256": "13ccb1r646c0k9vgr1h9r4xfn27yqw1489dj76nwq13awg81pjyr" } }, { @@ -5626,8 +5674,8 @@ "avy", "embark" ], - "commit": "2f147726fef37b085e3f4ee2d94d953480544552", - "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9" + "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", + "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" }, "stable": { "version": [ @@ -7528,8 +7576,8 @@ 20200404, 1550 ], - "commit": "8f7cd388abccdf25baeca99c07ef2dfe264e8f2f", - "sha256": "16c4scmc7csb34c237m04fc2w252lvqiwjcz65bjmf077g1ipd7q" + "commit": "9a208d395db66aebadf663344f18effffaac59fe", + "sha256": "1c8i82wxhldzbczhcdfnk9cggsfqpqbg9zar426drvn7vcz6xs3m" }, "stable": { "version": [ @@ -7548,26 +7596,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20211206, - 2137 + 20220122, + 2332 ], "deps": [ "a" ], - "commit": "9e7517cfee9272e9e4822b4efc3fac7e32d7bb38", - "sha256": "00b8pnm1990fjiznz568mf3680cb2wq2qphbd3h0kdbzzanfn1fl" + "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb", + "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k" }, "stable": { "version": [ 0, 3, - 6 + 8 ], "deps": [ "a" ], - "commit": "d452006a31895a79216bf35a64482631a83cfc2d", - "sha256": "0gi0q60q9r5nx5wzavxywajmh9gw4nl20msgh9k9k9ilj4jy3a1b" + "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb", + "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k" } }, { @@ -7973,11 +8021,11 @@ "repo": "ideasman42/emacs-bookmark-in-project", "unstable": { "version": [ - 20220119, - 949 + 20220201, + 544 ], - "commit": "1033822db4ebf675bd55cfe490b39602e7c3c2d3", - "sha256": "1wkh084i62kssx47x154rlsmswqljj7k5nkj0icmdnxlf4ynx71a" + "commit": "ff0d1c3531352a6c54bb48ced797f41bda95939e", + "sha256": "06cprpbff06q98d06vljcrmvixvdnvjmwqgxvpz9yx7s14ml289l" } }, { @@ -8068,15 +8116,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220111, - 1150 + 20220131, + 1421 ], "deps": [ "epkg", "magit" ], - "commit": "0161a03720f11eb7f0a326612e6e2fa3695bb369", - "sha256": "1m0afgr2dbhr2db33cd2s4r7b3ysk0ki44xsbfha2536qwzrkncb" + "commit": "0bad132b4eb25ae9a1e26360e7b87771ab3208d3", + "sha256": "134cirgaxypsr39dlhshw3db4d9cz56dhl4d7d41lbzysih472km" }, "stable": { "version": [ @@ -9845,19 +9893,19 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220119, - 2013 + 20220201, + 2018 ], - "commit": "e01162ab1007457aba788916c1d59de8d6083b25", - "sha256": "18w1xq3q9jc43krvmgc1ic3m09r7am0acwhcgc9xs1jyaxwcg5pi" + "commit": "dba8492f70a46fde51d6269ae971693fd1777575", + "sha256": "1jaygxplh2y8lqq7p0yynql5zrb6yf0vyrcbwi1dvllq0clncnwn" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "9567f1ca09a3867e50ef8f990b486e916460df9d", - "sha256": "0780qymlrg3glyxypizqzwicp5ly5xavxgpmayhx8cxlgp2zlkjh" + "commit": "92c3168283c6d9faa3fcf2e72d0d71afbfa5d6e1", + "sha256": "1bmxpfp0zs24lbp1mlcc66f4s5gxgrj78001h241mzndc3kaiqfk" } }, { @@ -9871,8 +9919,8 @@ 20210707, 2310 ], - "commit": "82b29296f76c583856511f645d9ab4e427a6d218", - "sha256": "03s00fqsw4nxijkfpq0ysqi88d848lgy8xbj13aa4xfygnzx80x0" + "commit": "55a368beb987abf9eeb9b3843e9c5423ad37ab29", + "sha256": "1cnc69ny4icjz9rzqj5sli5vbqkrv3sbahbsl1c0ma28rbqasw0w" }, "stable": { "version": [ @@ -10471,11 +10519,11 @@ "repo": "anler/centered-window-mode", "unstable": { "version": [ - 20200426, - 1053 + 20220125, + 804 ], - "commit": "f50859941ab5c7cbeaee410f2d38716252b552ac", - "sha256": "1l7m3gfn7j1mxs0rj1pm5avknplw2f34dd2k24n5rldfm41pf8i8" + "commit": "80965f6c6afe8d918481433984b493de72af5399", + "sha256": "0zmq84gvkyj20l9gv5wwraa6zis2vk7hadagkmyqg1w6vs25n2mh" } }, { @@ -10560,8 +10608,8 @@ 20171115, 2108 ], - "commit": "ba547dafdcbc6492e4bcfa462942126b2d1b8457", - "sha256": "063pnr6l7ryviw24y0pdkx2sj3piijdard6lszwcr8h3h3k063fm" + "commit": "049018b8f756a41643fdbaa45372b310d56e4211", + "sha256": "1gb7dz2jd0fvxzc4spp3c3hmpwcy8cqkw2qspnhkbxc7q7hirski" }, "stable": { "version": [ @@ -10679,30 +10727,30 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20211013, - 1802 + 20220129, + 1149 ], "deps": [ "dash", "posframe", "s" ], - "commit": "c1f639d7bfd3e728cf85dbe224b06a4be76158f4", - "sha256": "1bic67769xvjdhinq88jqxnb4dql8gssmnx1wvrl69338zjqqjzg" + "commit": "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121", + "sha256": "1vf5zm82sx3m1yvq73km8ajapv6rnz41b1jrsif7kh0ijh9vk3qi" }, "stable": { "version": [ 1, - 5, - 6 + 6, + 0 ], "deps": [ "dash", "posframe", "s" ], - "commit": "8e9b79e38306b11411543d31cb483201131ba42a", - "sha256": "1sa0klkyr55xmshzxm9hz3j5vdkisxg67w8q00z7zbsald0imxbx" + "commit": "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121", + "sha256": "1vf5zm82sx3m1yvq73km8ajapv6rnz41b1jrsif7kh0ijh9vk3qi" } }, { @@ -11024,6 +11072,24 @@ "sha256": "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd" } }, + { + "ename": "chezmoi", + "commit": "36f51f076004452aff618e401984f70750f2505a", + "sha256": "09mzv7pi849ad2mlk8r3dnwh51jvx6qyycwy6dx42faq06i9x1ci", + "fetcher": "github", + "repo": "tuh8888/chezmoi.el", + "unstable": { + "version": [ + 20220131, + 1935 + ], + "deps": [ + "magit" + ], + "commit": "3d7f6bf3abaf0f236e159bde4751b55bc803a7d6", + "sha256": "0xyn59r3m453vy2x1gm7cmw6pd8ws1jiq5979cb8cr068g8pkp18" + } + }, { "ename": "chinese-conv", "commit": "a798158829f8fd84dd3e5e3ec5987d98ff54e641", @@ -11191,16 +11257,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220113, - 1718 + 20220123, + 739 ], "deps": [ "dash", "seq", "ts" ], - "commit": "fe9f2b494f7f78a21b54d43f2546a6da5818b3d3", - "sha256": "1d21y00c5nq6pj2rpbn0jmfghm2fpvq0n1jnq3vqqjy467jwzz2a" + "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", + "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" }, "stable": { "version": [ @@ -11244,14 +11310,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20211118, - 1235 + 20220123, + 2006 ], "deps": [ "chronometrist" ], - "commit": "fe9f2b494f7f78a21b54d43f2546a6da5818b3d3", - "sha256": "1d21y00c5nq6pj2rpbn0jmfghm2fpvq0n1jnq3vqqjy467jwzz2a" + "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", + "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" }, "stable": { "version": [ @@ -11266,6 +11332,38 @@ "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" } }, + { + "ename": "chronometrist-spark", + "commit": "14000772028841fc06aa3baf3545ea193d5705c6", + "sha256": "04gm5srg62zb80av5b5i2k1d790cf9xb6zn0bisf7l4i7cvjxafk", + "fetcher": "git", + "url": "https://tildegit.org/contrapunctus/chronometrist.git", + "unstable": { + "version": [ + 20220123, + 739 + ], + "deps": [ + "chronometrist", + "spark" + ], + "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", + "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" + }, + "stable": { + "version": [ + 0, + 9, + 0 + ], + "deps": [ + "chronometrist", + "spark" + ], + "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", + "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + } + }, { "ename": "chronos", "commit": "53648c5699fc03e50774270f9560c727e2c22873", @@ -11322,8 +11420,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220113, - 610 + 20220204, + 917 ], "deps": [ "clojure-mode", @@ -11333,8 +11431,8 @@ "sesman", "spinner" ], - "commit": "8bb67174ffa0cd7ae01f544926b4ed5a17965d76", - "sha256": "1fh95x4gabmm95ligy30lhqgay5snlp9d4m21l5zmk64klfyrpfb" + "commit": "e8b582e1f28b27cdb0574e0f9361cbb9eb62afd0", + "sha256": "1dazvxk5fbqgipkwvk35b5hdbfakq0f7mn8nmqzaj03nd66dn55m" }, "stable": { "version": [ @@ -11633,8 +11731,8 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220119, - 2244 + 20220204, + 1902 ], "deps": [ "citeproc", @@ -11642,8 +11740,8 @@ "parsebib", "s" ], - "commit": "46da9225a852a8f37399462add58419346c09eb0", - "sha256": "0sf8sv1wasv4bbis2x8dz9d7g4d0rqbfsxa8knjqvcy6gqpssj1c" + "commit": "903dcd3d21be58ec2f7ac61432ff26f037373180", + "sha256": "1danf825jj5ahsicwnb8szis0ixqysy0k4vflvhbjwhl9n38rwg6" }, "stable": { "version": [ @@ -11667,8 +11765,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20220118, - 2057 + 20220124, + 721 ], "deps": [ "dash", @@ -11679,8 +11777,8 @@ "s", "string-inflection" ], - "commit": "470ecfb761062cbb546293e21cd5aa56dd77f528", - "sha256": "0pn6f5hi3ldqzx2p53365arcixxqyrmhvqd2cl0nlz0g0q5wzwhm" + "commit": "ba49516265fa24b138346c4918d39d19b4de8a62", + "sha256": "1zxrzx537ar35i32g7y76k8w5z4x2nip2vw6lr4xwvzl6bwxnfqv" }, "stable": { "version": [ @@ -11746,11 +11844,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20211225, - 1020 + 20220130, + 538 ], - "commit": "641f2f7f69de2c0f4f055efe55b3ecd899a60b24", - "sha256": "052b0zwxn7cnm9l9hb8nv794fbl9vds39f1a9xp0grg5q70qy3k3" + "commit": "d7b6428da289c2f63a7a97f4eaba5b76616a09ce", + "sha256": "0kg64va0iqjzwswzs4z9sx278w20c35pg4ysp9x198z0575lvpid" }, "stable": { "version": [ @@ -11815,11 +11913,11 @@ "url": "https://git.sr.ht/~pkal/clang-capf", "unstable": { "version": [ - 20211204, - 1351 + 20220122, + 1219 ], - "commit": "147be0e908f09ab2346443d48457f9624a404019", - "sha256": "1qwlafw28axrnhk9zrhpgww22964j9s0ys43dndmmh16ykyzaxgc" + "commit": "b1765719288a138e125cc5ce624ef561c80015bf", + "sha256": "1v8h916rqylz98v1xi1bqdcakgjjl3l1f51xcvyd41wn1kfiaxnf" }, "stable": { "version": [ @@ -12117,8 +12215,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220109, - 244 + 20220206, + 1011 ], "deps": [ "cider", @@ -12131,14 +12229,14 @@ "seq", "yasnippet" ], - "commit": "bfd83d142f1a05bad779fa7ccbaec8bd24dae177", - "sha256": "0010db9xagz5dykh377z9r6vn50wk9ffvgq8410ppcymdaq1syx9" + "commit": "d1b68c7807476de95a684fa52de294c96b3e8523", + "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay" }, "stable": { "version": [ 3, 2, - 2 + 3 ], "deps": [ "cider", @@ -12151,8 +12249,8 @@ "seq", "yasnippet" ], - "commit": "e0d83c845014a24c2604a08f9c9931c63ea809c4", - "sha256": "1iyivn7x5bcnp4g7k0k2b0jdcph84pbldlk83qqfzix6h4sp1k1f" + "commit": "d1b68c7807476de95a684fa52de294c96b3e8523", + "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay" } }, { @@ -12231,11 +12329,11 @@ "repo": "ataka/clmemo", "unstable": { "version": [ - 20160326, - 1623 + 20220204, + 1345 ], - "commit": "846a81b984d71edf8278a4d9f9b886e44d5b8365", - "sha256": "152qf7i5bf7xvr35gyawl8abkh7v5dsz957zxslrbbnc8bb1k6bz" + "commit": "f695c38c551f72f6ac5e1a82badc540c80d3b33b", + "sha256": "19lzrbkkabyw2pha005vpkgn42bs3b52nij1x2wr7v35bvpsck2q" } }, { @@ -12379,11 +12477,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20211119, - 1904 + 20220202, + 1341 ], - "commit": "e31186843d06ea86f3771244d1cde0112f9e2079", - "sha256": "0dlbwz0vkn2sf394r86s7vbc78jkq7wd3ldziqkwf57ci2068nyi" + "commit": "913e2450a77a6ddda051f55ac651c99337147db1", + "sha256": "0b8iga2wz5xyqfwwxznsjh71bwgjvvj9yjsamvwfrlsj0wh6zk1w" }, "stable": { "version": [ @@ -12409,8 +12507,8 @@ "deps": [ "clojure-mode" ], - "commit": "e31186843d06ea86f3771244d1cde0112f9e2079", - "sha256": "0dlbwz0vkn2sf394r86s7vbc78jkq7wd3ldziqkwf57ci2068nyi" + "commit": "913e2450a77a6ddda051f55ac651c99337147db1", + "sha256": "0b8iga2wz5xyqfwwxznsjh71bwgjvvj9yjsamvwfrlsj0wh6zk1w" }, "stable": { "version": [ @@ -12574,11 +12672,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20211229, - 2131 + 20220205, + 1336 ], - "commit": "72f1f430c94b93701851567853097b2df7cdd19a", - "sha256": "14jqq522hdy2zy3iqh3r5ql5wgc5jh7mlz9m7h8pgcrwh9h7zjk2" + "commit": "16372ea1f527917102ac302afaec3ef09e289d24", + "sha256": "0wyrc532iqviq1r8pa3qnz10bd66qnvac3qcgcwvjhd5h772y0dh" } }, { @@ -12712,17 +12810,17 @@ 20210104, 1831 ], - "commit": "410dd6cf611f31ebca74e1db4dc439e6fcaf34b4", - "sha256": "1qfpps3mw4gbi59kia89s0hn8snwsfx5vxbw548a2mncm1lmsml9" + "commit": "3d91571f795e7cf2a0e74af1f72398fcd529703b", + "sha256": "0vd0my900iyg7xzccnlml3qg2lgrvyqgagp7zrn33k1sbxsnzcxi" }, "stable": { "version": [ 3, 22, - 1 + 2 ], - "commit": "aa6a33fe54918967f6ffcad30773e01664e8a2b2", - "sha256": "1b5afd4ryqmkdkwpr1xb6g31d8xlkbjg9ql191rvnp5rsmb9a75w" + "commit": "8428e39ed9cddb3b7f1a6f7a58cb8617503183d2", + "sha256": "1c2rczn67bpyhpacyn4qpg71p8dnqvvqndfgqjfd94h4zafcygjv" } }, { @@ -14263,21 +14361,21 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20211104, - 1200 + 20220127, + 817 ], "deps": [ "company", "ht", "s" ], - "commit": "ca52f1bf0a2ad927d629274f648726769ce770de", - "sha256": "0wfryqkvj9xcka2j22mzxjr8cb9f2llyqkxjz9l2zvpijqfp1n49" + "commit": "50b4fbc0d812e12aab21267f78a1acfb1d863943", + "sha256": "1175vfy3ilac73xyj3y644q3rfq0v5vjpjakdahkz337di7cxd73" }, "stable": { "version": [ 1, - 3, + 4, 0 ], "deps": [ @@ -14285,8 +14383,8 @@ "ht", "s" ], - "commit": "7067175ebf56c5110edf1475b03e2e242a00e66b", - "sha256": "1sfzj5qbpc1j1blg6rq5lmimgy1yfwyg7ixgp7psf53nq0cbq9jd" + "commit": "3aeb0bdcc15e969964b73e695aca8e0df60e3a1a", + "sha256": "1yfl1c92i0xn6imgvvj6h5zpadqp96akm69cmccxs7khfall5lmj" } }, { @@ -14502,8 +14600,8 @@ "lean-mode", "s" ], - "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55", - "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb" + "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", + "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" } }, { @@ -14677,8 +14775,8 @@ "company", "native-complete" ], - "commit": "20e1dceb459856c8c4f903e6d8562991069bb8c1", - "sha256": "11m3y6kbjm0nqmdqbcv4xrchcabh4x1w4gy1p8gp36k600s1h7zj" + "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", + "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" } }, { @@ -14801,8 +14899,8 @@ "cl-lib", "company" ], - "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd", - "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h" + "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", + "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" }, "stable": { "version": [ @@ -14834,8 +14932,8 @@ "company", "phpactor" ], - "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", - "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" + "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c", + "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr" }, "stable": { "version": [ @@ -15916,19 +16014,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220115, - 1548 + 20220201, + 1112 ], - "commit": "a899e183d3f85741e6bf92a55a57afe9b9a4c7ae", - "sha256": "1rd4gfzn43g8gzv3v9fl7jbyj8wdn3nkz5l35qlqr0iyz5cd5bzz" + "commit": "1a6ed29e92f00266daff4ff5f62602f53ef7d158", + "sha256": "137s984r5nf9j5padha45n9jhyh82ik4yybcr9nljg86l065s3nz" }, "stable": { "version": [ 0, - 14 + 15 ], - "commit": "f9170bb75f9b4362b42cebee9cd8643b04093342", - "sha256": "051fjp03lj3b5kkzpdhk78g2lj37v973q0f012zld1n6937srj6h" + "commit": "e1e17965a98515a620c439be1eb28cd125f984a0", + "sha256": "0cfj8h0k05947cazsr95yy75shs0vpy59sa41f31xbw00q9l48q6" } }, { @@ -15967,6 +16065,18 @@ ], "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "consult", + "project" + ], + "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", + "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" } }, { @@ -16191,8 +16301,8 @@ "consult", "espotify" ], - "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", - "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" + "commit": "ea6d6021e5acc550560325db2f09198839ee702f", + "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b" } }, { @@ -18019,11 +18129,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20211228, - 415 + 20220130, + 2307 ], - "commit": "282eaa836d2198bb5947dfd3c454ae5305f55efb", - "sha256": "04w708g7d1pnsc18h8fjyqkhk08jkq853alaidriamxyycvdwk0i" + "commit": "38b5e94bf718eeea0b880a78ed52926dec89fea9", + "sha256": "0yc89vfca2q9bii4145wkyb5g4nil3n14b8af08npjhmb2i85aw1" }, "stable": { "version": [ @@ -18466,17 +18576,17 @@ 20211111, 1407 ], - "commit": "a448db45c9f638c384f869ec726ca8bc6e85a1ec", - "sha256": "0czdnpmzxq07rdqb5227y6p24ssh1vr7j6whi79mf46dnzd1p7zd" + "commit": "2a304b0f9e6c9a98f2a8a38d80404a34e6623cd8", + "sha256": "1mqd1594y7spnbwq5y3xgj3wsllzc2gqgg4dns2afp10xiv0l23y" }, "stable": { "version": [ 0, 29, - 26 + 27 ], - "commit": "3028e8c7ac296bc848d996e397c3354b3dbbd431", - "sha256": "175k9f5dzrpg1xqc941n0xa1frxq8vnqlw6ccx59xf9p43ws9rc1" + "commit": "229a4531780863c8a5c311d6b3c70a545988f85f", + "sha256": "1pvfamxnvh9by6658wmqyvm30af3ykhks9mwkqfz9ww161avxzd8" } }, { @@ -19038,11 +19148,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220117, - 1613 + 20220129, + 533 ], - "commit": "c51d94778fd5806ff1b37339f97ec94cfd9d390a", - "sha256": "0cl9cnsw1gp6w1kv6bf719ykczzf41ck4vzzr3lpixn0jkv1q9cz" + "commit": "d6e9f4df42815de467765e78b7c27125f35d30bb", + "sha256": "02lhkk4z8va95fnv5x4sd3xdas28gf3ykbl7gry015sms9jxj7w3" }, "stable": { "version": [ @@ -20063,11 +20173,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220107, - 1051 + 20220128, + 1441 ], - "commit": "8abcac28030c0f770b214823b4a1a5024f121b30", - "sha256": "1717y9fkvppbd1cyf9bhr32cjy0n1zd0vrjs1ynal40ymrv9jnpp" + "commit": "a632b3cddc88bc1ed5f323afba03d91c34453194", + "sha256": "08z1i260r3i7shybcwyiq5michwwfpmzvvnqpppcasazrgpz6vyz" } }, { @@ -20272,6 +20382,21 @@ "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s" } }, + { + "ename": "diff-ansi", + "commit": "6bbfb72c3db4f774ffab9cf273b26e23fb027ee8", + "sha256": "0k25pfxm0w7i84z1qfzd87l75hv43m89ajaq7bl2ppq2h1fwf880", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-diff-ansi", + "unstable": { + "version": [ + 20220130, + 2254 + ], + "commit": "f2207a67e3cc79433b43deeb463d0768357c350f", + "sha256": "1avfss2syaqsrdb4nlgsd49xyiy6bjqsf17r2is5il8g4yj1jabs" + } + }, { "ename": "diff-at-point", "commit": "d342698c94e145ecfebf204c1099dbe765b39c71", @@ -20295,14 +20420,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20211106, - 2353 + 20220124, + 323 ], "deps": [ "cl-lib" ], - "commit": "e628ba35b8fa6f9fe13dc2525bd82532dc9bd864", - "sha256": "1kpwivjr362iiwph8db6maxl1mbcd0xf8md61nbz73ndrbv9xkcv" + "commit": "4a08b02afec1fc6b1e84de46cc34f75f6c9c3bcc", + "sha256": "1c8v4c9cz9mcn70dws79yh1fd3nxkbb6mdrlqs5nwy7m3d2l567a" }, "stable": { "version": [ @@ -20616,8 +20741,8 @@ 20220104, 1539 ], - "commit": "fd486ef76e4c1d8211ae337a43b8bba106d4bca7", - "sha256": "1vlgn7swwfzy6yr880698h3qsmfcqprcb1jvffkzmbvhvf458szf" + "commit": "6b7e837b0cf0129e9d7d6abae48093cf599bb9e8", + "sha256": "0d944fmxnbcqpafcb419i6zv46lh78w9ailbxrzhxrb69ii3fnwh" }, "stable": { "version": [ @@ -21457,15 +21582,15 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210810, - 1533 + 20220129, + 339 ], "deps": [ "ess", "ess-view-data" ], - "commit": "75d5f961926392feb408049d416ed5c4c2213f07", - "sha256": "19ygbq9gibl0pj9663r77w3y00wpw7dpr1zh983w5nj57fa0im3p" + "commit": "96d4cb6569fd2be90a516dedd98263374bbc6ead", + "sha256": "1i1prpzp10irshv42lwv08lzwvm0r9amapbbki07qhmqd5q0av06" }, "stable": { "version": [ @@ -21682,11 +21807,11 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220120, - 504 + 20220203, + 1118 ], - "commit": "762db50fa84decf5ec2b87ea51f5c8b70680a0af", - "sha256": "06b32sgbnfadanarihgsffcqbbbz0ccrcf6v1p59a2kw432jx5kz" + "commit": "bc278f42110fe34e14ebfce0cda036b3ce17730a", + "sha256": "16rqyfj7lsrkp7a406z23dkcz7c6vb0gh6243ywjiwiqj7qdzcqc" } }, { @@ -22601,11 +22726,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220106, - 709 + 20220121, + 2018 ], - "commit": "e92ccc084f164ed87b7ae325669ce5720044179e", - "sha256": "0r53f580grrxgl839l7lrhg8vcrjxy7n2qw10z9bkabmkvbcl20d" + "commit": "9ed9b8c7f7e2ea2d2fb739d65ae4626a1cf16b9f", + "sha256": "11rzq8qbvivmi2sj5gw4g4n7qf8zjjypqz8xvn6s3w4ahz8n5nmd" } }, { @@ -22738,16 +22863,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220104, - 1417 + 20220129, + 1017 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "bd21ee28cc25da400fb32b1e9e65b09514fa7f57", - "sha256": "1k9addpiyk2x56b317awbrmj5d0wlc9fjzp02yicjqzsslakb7hf" + "commit": "b1726bf6b3328763851dfa1d343e4b2f1ccad125", + "sha256": "1qalk74l8vkv69ph642m6m2rvqq5pfvx8jfr40kpf83lx5amrch2" }, "stable": { "version": [ @@ -22791,14 +22916,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220105, - 1406 + 20220127, + 2136 ], "deps": [ "cl-lib" ], - "commit": "56e8a93b2dd8f2c10a693f36c3317833211201f2", - "sha256": "0ph2slvcf5fncw3s6mc3hmgs02g8prljycqymqz813fcqrbdsmqb" + "commit": "f55e32cebb2c756c1c0019cad5aff59abb5882bb", + "sha256": "10bcg2yi0axccp2nks4di2by5y4d7j4vhjg1h692qkc908gb9irs" }, "stable": { "version": [ @@ -23200,14 +23325,14 @@ "repo": "arnested/drupal-mode", "unstable": { "version": [ - 20220117, - 1142 + 20220125, + 1044 ], "deps": [ "php-mode" ], - "commit": "5b90a053f73849db77e4c89a030acd81b53712d1", - "sha256": "0pl00a0gr6xgyrf8fhdk6s79kr1l4fimszmwhr05zdya70jlav7i" + "commit": "17927723adc5921e8058f7c29e5e50e88b975639", + "sha256": "1j0zlcjrz0pswcc8wh476vx503qvlyzjscwh0gs3cfss8j6r6gd5" }, "stable": { "version": [ @@ -23261,6 +23386,29 @@ "sha256": "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c" } }, + { + "ename": "dtache", + "commit": "6e0f64b768c13fb873dc1dcb849770b7b401603d", + "sha256": "1sw5wciadijskzp4cczik36ak08xx7491bqgjhbg2vf2yyg09sbz", + "fetcher": "gitlab", + "repo": "niklaseklund/dtache", + "unstable": { + "version": [ + 20220206, + 1134 + ], + "commit": "948c110bbdd802a530f393580d74f3dc8bbdda1e", + "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655" + }, + "stable": { + "version": [ + 0, + 5 + ], + "commit": "ecf4c57d96eda400d9b2d5cfeaa9244993ae3603", + "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655" + } + }, { "ename": "dtb-mode", "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48", @@ -23454,8 +23602,8 @@ 20210909, 1010 ], - "commit": "7333e33a3fa7d9be93d7e32b0d12a5940b803a4f", - "sha256": "08g5saf7cwiizkg4h75bqa1lgcq3vx5b8vrhy9rjilr45cim8gkm" + "commit": "8e155da034f1f1c10fed88bdba4887ac26be9bcf", + "sha256": "1j3i8sikcpywzr0syrq70qf00cyk0kgcdqcp579v3sgm9p0mgnfg" }, "stable": { "version": [ @@ -24220,14 +24368,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220118, - 739 + 20220121, + 2236 ], "deps": [ "parsebib" ], - "commit": "c854cd0ba979085178b797adb72ad42eed2f87f7", - "sha256": "05lihrrbflr63cbp342g8s2y2i0l3hd4z6q88yvwirfmdv9hlmz9" + "commit": "4aed0c3a34e5faa95435e03be043f9a843971560", + "sha256": "13h94383lqfk2gcrfd7czdm46q38zg8bm8dyk8lcbyi7b60rczbg" }, "stable": { "version": [ @@ -24715,8 +24863,8 @@ "cl-lib", "nadvice" ], - "commit": "2ab86dc9a8ed7a669ca348252d4af46522b5c411", - "sha256": "1ii93vw55vqik765sm79gvlhlnp9xgqzml2ibwwkrfgz7gip9i0m" + "commit": "3c03cef3110024016c688553733cdc3694a8a799", + "sha256": "1vyl3i6dgi8y3rc5a4n2hhghiri0914k2j7w7zkji8brpl8i5f0g" }, "stable": { "version": [ @@ -25079,18 +25227,19 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220119, - 2106 + 20220123, + 1406 ], "deps": [ "eldoc", "flymake", "jsonrpc", "project", + "seq", "xref" ], - "commit": "0fcab44367a362c1ddc73780b6a40eea6d1934b9", - "sha256": "1365zkilbqwah403j56lcw576ql61wai5xy51ny54i1hlck4bnak" + "commit": "0f352213fcfa9f9e8406771fbc8629f2885e80ee", + "sha256": "0ly76fddl2r8hrhqm5jlpsmj5nvggdxl5mxqvb9f6jv82p0bvxbn" }, "stable": { "version": [ @@ -25543,8 +25692,8 @@ "hercules", "org-ql" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9", + "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn" } }, { @@ -25562,8 +25711,8 @@ "el-secretario", "elfeed" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9", + "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn" } }, { @@ -25581,8 +25730,8 @@ "el-secretario", "org-ql" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9", + "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn" } }, { @@ -25600,8 +25749,8 @@ "el-secretario", "notmuch" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9", + "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn" } }, { @@ -25620,8 +25769,8 @@ "el-secretario", "org-ql" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9", + "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn" } }, { @@ -26289,15 +26438,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20210430, - 846 + 20220126, + 1404 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "c88bb246a40c2f8ec2cb36bc16690d1ed43f8b14", - "sha256": "0aq1rp46dr2hdkzm8aapb1xlcbdpa0nbrgb8b5avkihmyx7nkwkb" + "commit": "d2e22f5506bc75dbf4ca42ac87257fd1b259dd66", + "sha256": "0zmalhdd4xbn9wc5dmk4511ha955smrjpmzknwkwhqn8npgbj4m5" }, "stable": { "version": [ @@ -26321,26 +26470,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20211231, - 54 + 20220202, + 201 ], "deps": [ "elfeed" ], - "commit": "38988ebdbc335f990e9a90042141f18e3fc3ddb1", - "sha256": "19g98xpb0kk8i0js4syb2k7sfj0lia3xmywzn9dmrxkpslhfsyms" + "commit": "3448413280d5e8fce0d8098476d246c6c584771d", + "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "elfeed" ], - "commit": "dc9901aabf6f6659beef1c876bd3c9cc4c7d17b6", - "sha256": "10wsjq2zd6kz9182gnkjzlzywx16j29dgm1gzwynr79xmvgs4r2b" + "commit": "3448413280d5e8fce0d8098476d246c6c584771d", + "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" } }, { @@ -26595,28 +26744,27 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20211009, - 1531 + 20220128, + 1736 ], "deps": [ "dash", "s" ], - "commit": "c06aec4486c034d0d4efae98cb7054749f9cc0ec", - "sha256": "0dhflhgc1px9kj2bhv9m646ab08a6qjcqdd1a6wd5psj047bkj9p" + "commit": "fa1de199e07fb020b776fb585613682901962ed6", + "sha256": "0nw1h9iif0amak4wx985vqfv2a45yla2bhi3bb8bjlsxaixzh46a" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "dash", - "loop", "s" ], - "commit": "0b6fcdee29d8156ef37477f4e128a148e295c62b", - "sha256": "0w7k91xf69zc0zkjrw8h8sjdjf9xq9qs5zhvajhd718lzf93564b" + "commit": "0d0318b3e80aa8d045ed6906111701153b797321", + "sha256": "03p95kwvwb3apb3lhhdlaxs952x7sdlxa2qc1c77cjwrm5xzdg9z" } }, { @@ -27040,20 +27188,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210614, - 302 + 20220123, + 1237 ], - "commit": "a3e5b974ca9a7004ed6cf72f9d831ba525432c67", - "sha256": "19hmvrck77pxxm2pq6a6hfdk2azl6nlhffwyzymr80rqcpx0hysx" + "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e", + "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh" }, "stable": { "version": [ 2, - 1, - 6 + 2, + 0 ], - "commit": "abc8d7b7de12e4eb06efa2dbb1cc77a714f14479", - "sha256": "0p5jbdbl7bmx94fj7qyqqsy0clvkzjgczbgvhx4ay9wyq83wdaav" + "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e", + "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh" } }, { @@ -27064,20 +27212,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220117, - 1445 + 20220202, + 2138 ], - "commit": "a9137269875a8e79ce238280227297061d6e246f", - "sha256": "1665pmfi45x0jiccl9dhdi3rdv2mqyd8njiwvl7rn9jnjbwhsxqy" + "commit": "68388182b99d7e12ec649826cf0a8d167be57a88", + "sha256": "1ylxkdhln63g0pli51r7jxp07g7r09agi72dw5mgxld1kgxln9m6" }, "stable": { "version": [ 3, - 2, - 2 + 3, + 1 ], - "commit": "7b52709ddf798fe53db3855eef52ca8862e7700d", - "sha256": "0fzqm5gpadqzsl71r1bq72ki8dw8125v4nmhdd3b4rz9jy1rqm2g" + "commit": "22649fd442d505af3367a6386fa7f0da9a82c9e8", + "sha256": "121hkssy6c15gdr76k3fmdpk82354hk597gvkap6dc9y5j5968mk" } }, { @@ -27103,8 +27251,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20220113, - 430 + 20220203, + 108 ], "deps": [ "company", @@ -27113,8 +27261,8 @@ "s", "yasnippet" ], - "commit": "edea3321e6cd44e466c1b56672324ac7bd28f011", - "sha256": "1ws8pxh3djdfdarpii777fyjwphv5v67v5ch3l3gjmkgx7acz2sz" + "commit": "9b458c80dc1bcecb6345e157d8e921c1e4e8a7ea", + "sha256": "1dniwj4lbmmwk715gi8kykp3c953migh0bs1br3vk1w2n8d6lax4" }, "stable": { "version": [ @@ -27178,17 +27326,18 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20211129, - 38 + 20220205, + 2040 ], "deps": [ "cl-lib", "dash", "f", + "seq", "trinary" ], - "commit": "5b8848fd7d87ee4927adda12a6cf5ed2a7e0c186", - "sha256": "08h86wpgr71xbxpqgbv2jikyzfh1fm33kfb6nxir001inzj0h7aq" + "commit": "ea2d2afee38af1511728f61083b22a3e688c7570", + "sha256": "0xp7dgn5llh58v9mkj9wd6wx81q26bgxxf8vdrllyz35rkwb1sq4" } }, { @@ -27440,14 +27589,14 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220117, - 1826 + 20220130, + 457 ], "deps": [ "cl-lib" ], - "commit": "9e24e4e8e81ac93c9e13748759a15436ea565966", - "sha256": "1r23l5i63h9k697bq199nzpyzifbrb7lph53w0yi6w6a54yy6dan" + "commit": "ace53396a66ed4b753f42c04a5a0db2bcd770423", + "sha256": "0p55shxvqm1713af33mfglny7rpi31d42wvgwylcsfy4jvnsq8bb" } }, { @@ -27521,30 +27670,30 @@ "repo": "emacscollective/emacsql-libsqlite3", "unstable": { "version": [ - 20211209, - 1243 + 20220129, + 2241 ], "deps": [ "emacsql", "emacsql-sqlite", - "sqlite" + "sqlite3" ], - "commit": "d3e401750410979be50cab3fee0ec8d0d2a9998c", - "sha256": "07c9dc49sh1vh1rzw80sqk4nivc4mwkjq3amhx3knm8dpysa1208" + "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39", + "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "emacsql", "emacsql-sqlite", - "sqlite" + "sqlite3" ], - "commit": "d3e401750410979be50cab3fee0ec8d0d2a9998c", - "sha256": "07c9dc49sh1vh1rzw80sqk4nivc4mwkjq3amhx3knm8dpysa1208" + "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39", + "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq" } }, { @@ -27771,11 +27920,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220115, - 1923 + 20220205, + 1643 ], - "commit": "2f147726fef37b085e3f4ee2d94d953480544552", - "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9" + "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", + "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" }, "stable": { "version": [ @@ -27801,8 +27950,8 @@ "consult", "embark" ], - "commit": "2f147726fef37b085e3f4ee2d94d953480544552", - "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9" + "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", + "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" }, "stable": { "version": [ @@ -27950,28 +28099,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220104, - 2105 + 20220131, + 501 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "2c24a16fa2e57ccedf4b502c887213c8f4eeb872", - "sha256": "1qsshfnrkimpvz6w5hy1wrx9s70ffbfcqzrdlwcvaly66zna7zq1" + "commit": "d32a9bbc8ffcd736c4aa33a6dcea819a01b8e808", + "sha256": "1bsdwp4h5b3xbigaaa8mx3sx9650xn34b1w4l47r8a4c5imkxspi" }, "stable": { "version": [ - 8 + 9 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "32ff8a70ca9726dd0e3b8ad68430bc6fd66bf387", - "sha256": "127xvjsqqk1a5m5qf06ksr3y378fm5h2vyckvm38y3mgrx1kvxx0" + "commit": "c3596ae7166db2de004c57da303b5eb8d3e1f2e8", + "sha256": "09fs05cgvxxsqcbswrdr5fi8g0m0y2iq2w19ks7a102zqpfp2bml" } }, { @@ -28555,15 +28704,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20220103, - 1759 + 20220130, + 1525 ], "deps": [ "inheritenv", "seq" ], - "commit": "456c4100de41d2cb50813058a9e727b6e83c5d1e", - "sha256": "1l80sr74lb275i49xna5li64v2ip598xs0fdqcnhc449b1zpazm3" + "commit": "12485e71d5154b02858628fce84396ac03f95630", + "sha256": "0vpwzs6yz6cmqcawil42wxdljkncnx85snk1p9pdfk3aghrrws4x" }, "stable": { "version": [ @@ -28700,14 +28849,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220112, - 1745 + 20220130, + 1922 ], "deps": [ "closql" ], - "commit": "9b3fded4c6904268fbdf84fb457aa195b2c90cba", - "sha256": "0rlq18853q53nghinzk73xsrq38j4mm8yahgwlpkxycysnl99l0l" + "commit": "c18a2fc8b4a83ceea6a1128d7a77107983301e56", + "sha256": "0ykjv4xaz95syiw3dbf91c2c8716psc53f2l36xzkaxzj8nsz3vw" }, "stable": { "version": [ @@ -28730,14 +28879,15 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20210802, - 1740 + 20220131, + 1328 ], "deps": [ - "epkg" + "epkg", + "marginalia" ], - "commit": "0879f5b2cf87fff17dcfb74009d289d6a89c9816", - "sha256": "11sbf363qy3i87hppv4admqd2sy0kwpvjgih51hn3rbimbswkwab" + "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", + "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" } }, { @@ -29354,8 +29504,8 @@ 20200914, 644 ], - "commit": "382861b1967b7ced0806343b8410709b2ce91df0", - "sha256": "05w4wmbdzg4j3nppix6gb2knf9wfyzqjcf0i1adbk7rawgcymq1x" + "commit": "9911f73061e21a87fad76c662463257afe02c861", + "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk" }, "stable": { "version": [ @@ -29379,16 +29529,17 @@ 20220110, 807 ], - "commit": "41ef8097d2b6f891e5c3bd9e8084d9ffb9f7ed75", - "sha256": "1g460czxrjjv9sgnidrj6w6fnrmhfvj9l3g55ndpsxmnp9y2ps44" + "commit": "1652f3ff90e22841a42381886709b0db369b1c3c", + "sha256": "1hlf7b3y3jyc99dxis2sf7n8na1rkfmxwmls2ryrqiwdcgsk7cgb" }, "stable": { "version": [ 24, - 2 + 2, + 1 ], - "commit": "df48c260e74c3e9058ff8681ce9f554e6fa0fe34", - "sha256": "10s57v2i2qqyg3gddm85n3crzrkikl4zfwgzqmxjzdynsyb4xg68" + "commit": "7bf7f01683acf9b8f09bd8c7331854a9abc17f7d", + "sha256": "1wcl60gclg5syi3zr9n23wk9x6l6w8w2ng7v6ibmsr1g1svhlkk5" } }, { @@ -29878,15 +30029,15 @@ "repo": "xuchunyang/eshell-git-prompt", "unstable": { "version": [ - 20210817, - 553 + 20220206, + 458 ], "deps": [ "cl-lib", "dash" ], - "commit": "f638ba32b661d15895e767305f59f41eb01197ae", - "sha256": "1hn05bgznc1az4fb4grg8d9acwpmwr4bp6ibch901c79hp79qlkv" + "commit": "1eb1fd56649f291cac482fbf06dd43ef867873bc", + "sha256": "1l3dlzzkx3k532ig2hmpky50zcz73p7vsnlxr24ichq5sn2lwfg2" }, "stable": { "version": [ @@ -30172,11 +30323,11 @@ "url": "https://codeberg.org/jao/espotify.git", "unstable": { "version": [ - 20211114, - 2251 + 20220121, + 2057 ], - "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", - "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" + "commit": "ea6d6021e5acc550560325db2f09198839ee702f", + "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b" } }, { @@ -30288,11 +30439,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220118, - 1855 + 20220201, + 816 ], - "commit": "3a919560e701c3fc19dc7e03e49f0950eb120b6c", - "sha256": "0iizk76py74m9gm39x57dfjnaz745knmpddcwnh6xqmhsh4wgqar" + "commit": "5ff4fa8da09c5e408bc8a2a8e42e7c1fb93a3819", + "sha256": "0wr6j58fm4zbihmlrnlgc6n5wlpkx2a0xpdw0hjdxylag29d52z7" }, "stable": { "version": [ @@ -30456,15 +30607,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211206, - 916 + 20220124, + 1430 ], "deps": [ "csv-mode", "ess" ], - "commit": "05888711212f9a9d72ecd48904de0c66adf6575a", - "sha256": "1nm1vzjby8ind8pvqzyy5yjcf0la72azjf55pwr46rzrjgia0s1a" + "commit": "6277684e06d5c3a2cbd340f656b7ffca4046e45b", + "sha256": "1ijxrcfbk8l1jbij9nc7b9j2nk3k5imvjbs5319z85q10k5cz7f9" }, "stable": { "version": [ @@ -30487,15 +30638,15 @@ "repo": "jschaf/esup", "unstable": { "version": [ - 20200814, - 1400 + 20220202, + 2335 ], "deps": [ "cl-lib", "s" ], - "commit": "5169dd7fc8765a7377b0ab93aa63b7f0f934689a", - "sha256": "0mn9pffw7kzdzwv3jkhygdkmlqax9fsrbjznbck90ydiv095fmp6" + "commit": "4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f", + "sha256": "1zyix297qpgx0l90afg1pxalsjph6yb7b2qxy2rxmbl9fkn4b774" }, "stable": { "version": [ @@ -30883,15 +31034,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220118, - 2201 + 20220202, + 1351 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "be97395e31861fa7b84e7440a87db455e2089107", - "sha256": "11mcf6461z1v7asaa7kxa88y0x16m51g1lixkx7ggjdls21nbwf6" + "commit": "787455068f56f29493cc1e33d4e5c2986ea25577", + "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp" }, "stable": { "version": [ @@ -30947,14 +31098,14 @@ "repo": "wcsmith/evil-args", "unstable": { "version": [ - 20180908, - 2157 + 20220125, + 1626 ], "deps": [ "evil" ], - "commit": "758ad5ae54ad34202064fec192c88151c08cb387", - "sha256": "0k35glgsirc3cph8v5hhjrqfh4ndwh8a28qbr03y3jl8s453xcj7" + "commit": "2671071a4a57eaee7cc8c27b9e4b6fc60fd2ccd3", + "sha256": "13avgl0whfp1xdsmp0j7qr5p2nh59swb2lyfpr7fz6bkgifrn212" }, "stable": { "version": [ @@ -31085,15 +31236,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220118, - 49 + 20220124, + 225 ], "deps": [ "annalist", "evil" ], - "commit": "5cc50418d0654c4dae1b312f327493e96724cd5e", - "sha256": "014isydh72wynk5pfbxv9yc9vgxmzzhn8iywqpd73jps42q7kn5x" + "commit": "e69abfcb1cc0dd59dfe7c055b0779a6622f8282d", + "sha256": "1gsrh5scp8yksilx14cn3h2hy68xh8jhmm15wwzwlg457kc3jcm4" }, "stable": { "version": [ @@ -31421,8 +31572,8 @@ "deps": [ "evil" ], - "commit": "1b66053ea5f06b08a52bebdd42bffd8eff82032b", - "sha256": "1z0qdgvrjajf027zibvwwaa2ia1zczbw68mc67ihhdc2zdsmz5ik" + "commit": "8f20a16e74016f37ad76dc4f2230d9b00c6df3c2", + "sha256": "1g07vlqizsm9lfjibidbfb0krqx8qyxbvqrrccgqfmcsxqgyfyic" } }, { @@ -32411,8 +32562,8 @@ "deps": [ "evil" ], - "commit": "be97395e31861fa7b84e7440a87db455e2089107", - "sha256": "11mcf6461z1v7asaa7kxa88y0x16m51g1lixkx7ggjdls21nbwf6" + "commit": "787455068f56f29493cc1e33d4e5c2986ea25577", + "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp" }, "stable": { "version": [ @@ -32442,8 +32593,8 @@ "auctex", "evil" ], - "commit": "a4b8a4769efb4cf38d91f51145b275f64bdd832e", - "sha256": "00mrxmf6s3fss6jb0aic09vk2sk6zpy367nzy8i4r4s7zlnv4wsh" + "commit": "0fa85c3fc88d96621002b5a1b79efcc06776642f", + "sha256": "0r38d1z7xdmiwxvpkzfbisd8scjj5i4v1y629j5n73f2xapk83df" }, "stable": { "version": [ @@ -32614,15 +32765,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220116, - 1346 + 20220204, + 417 ], "deps": [ "evil", "tree-sitter" ], - "commit": "1f1decd46d1cd6e1551c25101428966d8c4a87af", - "sha256": "1dsvivdyp75ivrhpsd7fwddx25p5vg7q4a7mijba68cns7x39bxr" + "commit": "ff733576d1dc5395c08d8f0e396b7a7073e39674", + "sha256": "1pa6ffz5wssnrs2x81p06w4c7iba4jx4man0h8qgl3qfsl2nkchw" } }, { @@ -32651,8 +32802,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220120, - 123 + 20220129, + 446 ], "deps": [ "avy", @@ -32661,8 +32812,8 @@ "tree-edit", "tree-sitter" ], - "commit": "ad5d3c5060d8cf43d2053c2bc74b0beda1e664a1", - "sha256": "0az5p42vhpbrqhgavfk3jyp1izillvqsik9rpwh5g48c3qm42bjh" + "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8", + "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y" } }, { @@ -33450,14 +33601,14 @@ "repo": "SqrtMinusOne/exwm-modeline", "unstable": { "version": [ - 20220109, - 804 + 20220131, + 1520 ], "deps": [ "exwm" ], - "commit": "4c77d4e3df851ea96eac627bfd580f313e2860f3", - "sha256": "1jdmmncmyhivn83xj7arapww5yp8iqcbfffhlbhl8aiq0dc8lgdg" + "commit": "3225ec1803c3da9aee3f53562278c3558c179c26", + "sha256": "1hnap58i90nsajp6a0ib5z96ifykw85p2g21vbij827v419mq1mw" }, "stable": { "version": [ @@ -34293,11 +34444,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20211126, - 1803 + 20220131, + 627 ], - "commit": "a622c110a2ae6ababfaab0506647a7fbc81e623a", - "sha256": "1bfd983zdhq097bb101k8p7x4jkmkgaxfj7s7aiyf4s3zq84v6xy" + "commit": "824d330c32637d8e0ef349ffaa8e002aca56991a", + "sha256": "1f1i28jlghzm7fa4998izakasmr6jvzghx96shahc6walcr8zb2h" }, "stable": { "version": [ @@ -34443,8 +34594,8 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20220120, - 630 + 20220130, + 9 ], "deps": [ "dash", @@ -34452,8 +34603,8 @@ "seq", "transient" ], - "commit": "0187be7e538f89eacc06324a0e712cde2fe7d8a6", - "sha256": "1p0rpawqb0rc0fqg5yr4mnqiwi62frvlbkdfqv6xk3rmy4hsi0mz" + "commit": "953f0b2d130d3944557d2c909328afd8c8097e8c", + "sha256": "09r3k0ba89iv6vzhyzgl7aa496ycld0ab18z45qvp7m8aqkvf3jw" } }, { @@ -34660,11 +34811,11 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210924, - 952 + 20220125, + 726 ], - "commit": "a62eaa0b07d8d22f309ec07992283f0fc340ce17", - "sha256": "1bg3a840ifcyhs6n353zg3bfrd133s81kw1gnmi44bc2v4pwh1hi" + "commit": "204b3d489a606c6e7b83518e46be3bbcef1bcb3d", + "sha256": "0h22rh88i11sz0kh1pq9fc9w58lja00xrany6mcy1hr6l0wy2g5h" }, "stable": { "version": [ @@ -34782,8 +34933,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20211130, - 1023 + 20220111, + 1121 ], "deps": [ "async", @@ -34794,8 +34945,8 @@ "s", "transient" ], - "commit": "b547ff8b81aa956d582c1c8edbf4c52ba017265d", - "sha256": "000szg9gg0ma61s0kx7ab1gnywbbi6w43csrprjyrhbgldb2bwbk" + "commit": "57d3e873a5a5fde4f8dfdd99608780b7020c7b9d", + "sha256": "18li3w3qf9j1lb90p3vsn28wlqqad05rq7nhd988nzf7izxir094" }, "stable": { "version": [ @@ -35309,27 +35460,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20211203, - 849 + 20220205, + 205 ], "deps": [ "buffer-manage", "dash" ], - "commit": "7d0421805e4a287358a5c188ff868bd93be2192a", - "sha256": "0hv9lp4ybcl7vn27cx3iq64rk0fydinq6sgyslhc2616kll6fdb7" + "commit": "2da0e5e791896810747c710276ff3a1d0465d843", + "sha256": "0xix6j99hb1l0ml8ry2zcz74n86572bnq5czr0xni8hvrgxa9b61" }, "stable": { "version": [ - 0, - 10 + 1, + 0 ], "deps": [ "buffer-manage", "dash" ], - "commit": "7d0421805e4a287358a5c188ff868bd93be2192a", - "sha256": "0hv9lp4ybcl7vn27cx3iq64rk0fydinq6sgyslhc2616kll6fdb7" + "commit": "c1c696433a650b0273f28da4f57bde7960395386", + "sha256": "0ls1ghh7j0lmp3l03d5pmczqs54rxwd8p5wpf28mvy0w28vw2m33" } }, { @@ -35750,14 +35901,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210618, - 920 + 20220128, + 1518 ], "deps": [ "flycheck" ], - "commit": "576e7f3e96ef8757a45106346a5f45831a8fee13", - "sha256": "1680qkn6n145ib0q039081k9iwgl81i81d1wmy1myifq8h9pgjzc" + "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a", + "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq" } }, { @@ -37534,8 +37685,8 @@ "deps": [ "flycheck" ], - "commit": "5331235970e5bc7906e328b07e11ebc95b974d05", - "sha256": "1y54xg9faakcmajc5c0v6i1sq5fjxfhss2lshk895iql78xfjcxg" + "commit": "2d5b72903e69e1e5eec2d03b9006a62fbbf75233", + "sha256": "10s5v97sg0mb8wls9j0vvi626v2ay05f98xjxymfm7n6957k2wm6" }, "stable": { "version": [ @@ -38296,11 +38447,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210411, - 2342 + 20220128, + 1518 ], - "commit": "576e7f3e96ef8757a45106346a5f45831a8fee13", - "sha256": "1680qkn6n145ib0q039081k9iwgl81i81d1wmy1myifq8h9pgjzc" + "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a", + "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq" } }, { @@ -39421,11 +39572,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210724, - 1042 + 20220131, + 834 ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", + "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" }, "stable": { "version": [ @@ -39452,8 +39603,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", + "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" }, "stable": { "version": [ @@ -39484,8 +39635,8 @@ "flyspell-correct", "helm" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", + "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" }, "stable": { "version": [ @@ -39516,8 +39667,8 @@ "flyspell-correct", "ivy" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", + "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" }, "stable": { "version": [ @@ -39548,8 +39699,8 @@ "flyspell-correct", "popup" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", + "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" }, "stable": { "version": [ @@ -40056,8 +40207,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220112, - 1745 + 20220130, + 1941 ], "deps": [ "closql", @@ -40070,8 +40221,8 @@ "transient", "yaml" ], - "commit": "ab637b74d1a72432bba1f960f30d987a3dc07057", - "sha256": "18689lfsrvr6p11mkqrmkcnf9dmxn6npa4a8q30302hsxls14416" + "commit": "43055ac34f9de045e7f878e4be7a7f04b172f498", + "sha256": "1ds4ikqddnf4k25p6ng8g2vdxi2gl4qa6s0w0kxklgh3di8zmppn" }, "stable": { "version": [ @@ -40753,16 +40904,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20210906, - 1634 + 20220129, + 539 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "387fa2a61a9e4b50701aece19dd798361f51d366", - "sha256": "104nhnix34ymkkgdvxn612d1k4iy95swrmb5isknd48c5mys94gq" + "commit": "d82cc1a449d368f5a3dac61695400926da222a84", + "sha256": "0c8x5a0rlyys8dqxsliy4m35c338srffl5387bmyzj68dj43vbfh" } }, { @@ -40773,8 +40924,8 @@ "repo": "thefrontside/frontmacs", "unstable": { "version": [ - 20210515, - 1811 + 20220201, + 2048 ], "deps": [ "add-node-modules-path", @@ -40782,12 +40933,13 @@ "flycheck", "js2-mode", "js2-refactor", + "lsp-mode", "rjsx-mode", "tide", "web-mode" ], - "commit": "315d23d23b32f413ea5a4dcc6f4e270b7bef7b67", - "sha256": "08bhsad0fmlydl47iaqj10j1r815qiy3jnm29sk5v5xjzrpby65k" + "commit": "774b4b3a1f24c46c91f189a2c67d5fcf0785e2be", + "sha256": "0ks55xp65qg96vsj1nsrifbpvfz0k45glis4wsl6wyc7pfiss11y" } }, { @@ -40894,8 +41046,8 @@ "deps": [ "cl-lib" ], - "commit": "287587048730ab0e33c8682d381967e785fff74d", - "sha256": "1njg1lnyhjlmywbfandlqq6xf17hk9jlpg9bf8zd89fvrn7dxrk9" + "commit": "9e08ee114e5d99dba0360a52795ba191ae0f8ec1", + "sha256": "0kizzwqkrdy8d73xf5w19gxiicj5xi4bpy5j4zr338bsd44rh89y" }, "stable": { "version": [ @@ -41494,25 +41646,26 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220118, - 2341 + 20220203, + 2107 ], "deps": [ "transient" ], - "commit": "0f2cb17dd6cad1eb5c1447a1b5f80c933309a153", - "sha256": "11sl3bbnx10yjndszhr4fk3asjyz27fxf7igh2vi7vmahby52ckf" + "commit": "c1cc4da1edc46b763e0342ab4aa971e54f48658d", + "sha256": "11vc57nkgbsyl1wrjikxs0ixzkp7dksj51p4aa9girsm2hs3bs6v" }, "stable": { "version": [ 0, - 22 + 22, + 2 ], "deps": [ "transient" ], - "commit": "e204771601e5c985bb0d6b373666be4bc22582f9", - "sha256": "0rg15hhf0yzcacyk1bx93fn4g60vgnzyi0a677dqgm240dasp02g" + "commit": "c1cc4da1edc46b763e0342ab4aa971e54f48658d", + "sha256": "11vc57nkgbsyl1wrjikxs0ixzkp7dksj51p4aa9girsm2hs3bs6v" } }, { @@ -41665,26 +41818,26 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20220113, - 2232 + 20220131, + 1758 ], "deps": [ "geiser" ], - "commit": "de2260883726d23eb964050797fdcf48655f0dc4", - "sha256": "0fk5rr7mjmb4waiagi80dhddas5mrsgqr0flag5v5b0piblixxq6" + "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066", + "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7" }, "stable": { "version": [ 0, 21, - 1 + 2 ], "deps": [ "geiser" ], - "commit": "de2260883726d23eb964050797fdcf48655f0dc4", - "sha256": "0fk5rr7mjmb4waiagi80dhddas5mrsgqr0flag5v5b0piblixxq6" + "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066", + "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7" } }, { @@ -41985,16 +42138,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220109, - 2053 + 20220205, + 845 ], "deps": [ "dash", "magit", "s" ], - "commit": "86b996061503aa7811d48fe27081bdc33afacb99", - "sha256": "0p9nhq5sv55dgrav9sjv335wwq2x9gbgg0qcji9qrc75r0b261rn" + "commit": "c2d9f3c0beef75ce2ca8e1e4b582980f2ffaef34", + "sha256": "1ayk60r3g6v8v8mdaxrv8psk5dhw8ss9rzglw8qzgxhj2dih73d6" } }, { @@ -42284,15 +42437,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220101, - 1019 + 20220130, + 1941 ], "deps": [ "let-alist", "treepy" ], - "commit": "d36c2b2419b04d7bc559756d37d39d615add6395", - "sha256": "1029yzlimcbsxybwbajswh6ihy81wh4c7vbycnx2kzm7kjz4k4wv" + "commit": "38be4a4bd92f4cddcd93b6784007774ce892a6c7", + "sha256": "1as7cmpb7lrkcy25cp541hzc57260czkin2wpl48ng4qg8502ypj" }, "stable": { "version": [ @@ -42650,16 +42803,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220101, - 841 + 20220130, + 2254 ], "deps": [ - "dash", "transient", "with-editor" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", + "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" }, "stable": { "version": [ @@ -42943,11 +43095,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20211208, - 312 + 20220129, + 2006 ], - "commit": "09961648e654ba0f7239eedf5cbaea0f0cc0ccf1", - "sha256": "0zwbcp2881n92nd0y40sw6id6qbidprzr0bsh9vn64gmvch6jlnd" + "commit": "28e937fe4229e93ab3fe3dc31c22e390a42329ba", + "sha256": "1qp5f483szngx67386ladd9nxyydx3k9a540y34sgrwbyssx4qc3" }, "stable": { "version": [ @@ -43902,11 +44054,11 @@ "repo": "cute-jumper/gmpl-mode", "unstable": { "version": [ - 20171031, - 2054 + 20220121, + 631 ], - "commit": "c5d362169819ee8b8e8954145daee7e260c54921", - "sha256": "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9" + "commit": "97b103eea8b18f7e27b0f0be6cb4809a4156c032", + "sha256": "1592sn1wzlmg65wc05103dyklprrwn048qgfhlims9618zapk5yr" }, "stable": { "version": [ @@ -44414,26 +44566,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20211015, - 816 + 20220126, + 1436 ], "deps": [ "go-mode" ], - "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", - "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" + "commit": "0a296bc3b7b4dcf0c140a78c5ca3e1a8c6b7ea1a", + "sha256": "0dql0c272n6zmfgbk30abipkhhdfncm4kj6wb9pslfi4fmrk7czq" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "go-mode" ], - "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", - "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" + "commit": "0a296bc3b7b4dcf0c140a78c5ca3e1a8c6b7ea1a", + "sha256": "0dql0c272n6zmfgbk30abipkhhdfncm4kj6wb9pslfi4fmrk7czq" } }, { @@ -44912,11 +45064,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20220114, - 328 + 20220130, + 138 ], - "commit": "8b635f07b3b77e84999eeea75b194d95b6457561", - "sha256": "06la461j3zv460dkyc2mhab3ha9zyb6wim3m4sms84dj2ifnzljf" + "commit": "b6a5842fdd08872d9243375c46cd549f1399e5b8", + "sha256": "1570b0v4dr745hwvw20byzhkhn4cr1v2g0n3zalh4j8wq1qkb0cw" }, "stable": { "version": [ @@ -45185,8 +45337,8 @@ 20180130, 1736 ], - "commit": "e6233c7428f061498e71827ccefe9d0c72084ad5", - "sha256": "0bx6rhmg2wii2kmf5lq1zbzqizlkff80iz8mjkkr8z6vq2iibf6w" + "commit": "31c830a22def856285b6a761c524f8d2d0657bcf", + "sha256": "1vv40cnvs985b84sqrpwhgr2ml2xgnlfi9727qaxg5g9wnxckvlq" } }, { @@ -45527,14 +45679,14 @@ "magit-popup", "s" ], - "commit": "e4049844d2bd47baca207a87f49063255221f503", - "sha256": "05mmxdyvxdwfpmvwmijvxklqr47yvm6mlypcbi8vxbrcmvm8p5x4" + "commit": "5cd154fb15348403bdd5ad55cbd33871c9a8a8d8", + "sha256": "0l9c8k765cksjlmmdvyrci3d0aqiq1rvv4vgfm1jfwjq60dfvnhx" }, "stable": { "version": [ 0, 27, - 2 + 3 ], "deps": [ "dash", @@ -45542,8 +45694,8 @@ "magit-popup", "s" ], - "commit": "f04d77d687dcd5f2dbc546a92ab46a14b5c00d84", - "sha256": "1ig7ss0i4r7nsj1qffanlky17lka7328zx6386li0jikfz34jffv" + "commit": "6b4e239111e6284b3f9ac583de505c4fbf18b2da", + "sha256": "0980dq688xz07msh0rqc7l7qq3qkkkwxg7ymz3jfcdics6cvw90z" } }, { @@ -46795,14 +46947,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20201210, - 1933 + 20220123, + 1424 ], "deps": [ "org" ], - "commit": "eeb0209fd638192f0b833526deb222f9f61361cb", - "sha256": "10z24hh1g9bf00maiwkjs324da55qqzxrz196rzs53i8lkli0xkd" + "commit": "cbb5a0f11a8a91111d753c25c59582741ae49f2e", + "sha256": "1chykvq41ivmyg85ixh09q1wl4ayqdpbzacj4npy3jiafh6sksz4" } }, { @@ -47135,6 +47287,24 @@ "sha256": "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5" } }, + { + "ename": "harpoon", + "commit": "1b8efde9e17f716c518a0cfe8e65ba57cf662b48", + "sha256": "006b5919zdjbzfl0jdagnmalz5zapp4bj9l2fxphzn6isyw807r0", + "fetcher": "github", + "repo": "otavioschwanck/harpoon.el", + "unstable": { + "version": [ + 20220131, + 1558 + ], + "deps": [ + "f" + ], + "commit": "9bbca44630cd23dda8595e13f8d3cc9af28c85db", + "sha256": "1a6mlga3k2816gi7s0lmjdbbflinpbcg3pzpx1zr1aknxi8ciw91" + } + }, { "ename": "harvest", "commit": "c97d3f653057eab35c612109792884334be556fe", @@ -47571,30 +47741,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220114, - 1641 + 20220205, + 1456 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "837e5b8c99715791023dd47911f5f280808cb3c4", - "sha256": "17gb25yk04cc7vnpw9h3pj99bj1al9m1lw20gidg0mvdbq09sypz" + "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", + "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" }, "stable": { "version": [ 3, 8, - 2 + 4 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "94cf15d64bd1dbc7dc3194ab323e0f0ef263ea77", - "sha256": "1xkxlbjpqhfhakmfi664cq7i5968941vpngq94napmhbgqydp4qn" + "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", + "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" } }, { @@ -48479,26 +48649,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220104, - 1344 + 20220205, + 1456 ], "deps": [ "async" ], - "commit": "837e5b8c99715791023dd47911f5f280808cb3c4", - "sha256": "17gb25yk04cc7vnpw9h3pj99bj1al9m1lw20gidg0mvdbq09sypz" + "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", + "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" }, "stable": { "version": [ 3, 8, - 2 + 4 ], "deps": [ "async" ], - "commit": "94cf15d64bd1dbc7dc3194ab323e0f0ef263ea77", - "sha256": "1xkxlbjpqhfhakmfi664cq7i5968941vpngq94napmhbgqydp4qn" + "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", + "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" } }, { @@ -50041,8 +50211,8 @@ "helm", "lean-mode" ], - "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55", - "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb" + "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", + "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" } }, { @@ -52006,6 +52176,25 @@ "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" } }, + { + "ename": "helm-tree-sitter", + "commit": "866abc2f4ea48fbc1782ce40b0f16873825f65be", + "sha256": "11y7ssx0fj64r249g92a84ssyacf3ldkj6rd3zc0z3bk2zaznw5b", + "fetcher": "github", + "repo": "Giedriusj1/helm-tree-sitter", + "unstable": { + "version": [ + 20220124, + 2246 + ], + "deps": [ + "helm", + "tree-sitter" + ], + "commit": "1cace1f9a8c5c519b985f7ee542ba3375eabd0e1", + "sha256": "1ka0xq5ghhn4r82k1aq5v4scariwvpwbr7c179j36axxlyvr6zkn" + } + }, { "ename": "helm-unicode", "commit": "f720b9f9b667bf9ff3080938beab36aa0036dc92", @@ -53286,11 +53475,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20211025, - 2138 + 20220131, + 358 ], - "commit": "121f24c12c6711f65157259d90cbe88a53c10336", - "sha256": "0mwhqhf84kf76wrqz6l9rp4majfl7dnxs1dg49qls32lv44ihs2x" + "commit": "8275de778fa273f63a6254a17f80c83c6780cac2", + "sha256": "1i94x08fdkbcixfj5mq0mvdlnwgbc6a0gjdska58icksalc6814v" } }, { @@ -53681,14 +53870,14 @@ "repo": "ericdallo/hover.el", "unstable": { "version": [ - 20201206, - 2227 + 20220129, + 1935 ], "deps": [ "dash" ], - "commit": "d0f03552c30e31193d3dcce7e927ce24b207cbf6", - "sha256": "0ynf26gaj7n6cg0vgykq80hg21lxlwffwcssk9ppin0rqmc74m06" + "commit": "2b826735bb8d3bcfced489a1e0fa21b10fbc967e", + "sha256": "1ihpwl8rlpxmalpccnkd3xk6ngd4gxz29gjyyhka7p825as5nywm" }, "stable": { "version": [ @@ -54821,11 +55010,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20220120, - 133 + 20220121, + 2251 ], - "commit": "03b5de12a6414f6e4299fc166f1dcd7ce12b37fb", - "sha256": "0qhifxkz2kn4cnd9wyrvxy7784r47v233rsvr20xf80xzxdnf4a7" + "commit": "5881f796ad167a5fd46e8e964733725aa825516f", + "sha256": "1a1pkq0q8g40s033ldlyvbn1s83lw9irc9hskv78pjgch1k3qz8y" } }, { @@ -55683,11 +55872,11 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20211208, - 729 + 20220203, + 1519 ], - "commit": "1c576624758429118794db9407c9627dfff7c975", - "sha256": "0a704nk7ly4wy5nmgqkdrg3lp3lpyk701myp9b72dn6diiv9r4nd" + "commit": "90a0f4e6992a99d000d016b5a82fe1a10fcc5e1a", + "sha256": "0s7vvn300x7cazsp13jzp28r1jrf9bg3asvxm92xi64d45pkki4q" }, "stable": { "version": [ @@ -56230,11 +56419,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220118, - 125 + 20220203, + 153 ], - "commit": "d6aa7d32aee6665784766858e40b5e4e13190652", - "sha256": "08sizq24n2w6cr22hmnlprdvnvkslgj8rlv41zb9g75yjn5sd9gy" + "commit": "f892e6e74ffdf9f80019cf85f4e128dc66359266", + "sha256": "09kzmw9i4d77qjz1i37v40g683d9q7rw79bnxkj56acpd7h9dvk0" }, "stable": { "version": [ @@ -57488,8 +57677,8 @@ "repo": "wpcarro/ivy-clipmenu.el", "unstable": { "version": [ - 20200302, - 1419 + 20220202, + 2122 ], "deps": [ "dash", @@ -57497,8 +57686,8 @@ "ivy", "s" ], - "commit": "ef25acf3f058fe1ede3a29fae2e9cdac8b08cd17", - "sha256": "1yzvaf95pncfi1r3xj8h6393dfvx291q3ahdwpp7qn3jh71kjx6k" + "commit": "7c200cd4732821187084fad23547ee3f58365062", + "sha256": "1zf0xx3j0mcyppx1a8dhx8h80xi3dxl4fsc6y9pkhrlimlz36qv6" } }, { @@ -58160,8 +58349,8 @@ "espotify", "ivy" ], - "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", - "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" + "commit": "ea6d6021e5acc550560325db2f09198839ee702f", + "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b" } }, { @@ -58391,11 +58580,11 @@ "url": "https://bitbucket.org/sbarbit/jack-connect", "unstable": { "version": [ - 20200519, - 1027 + 20220201, + 1417 ], - "commit": "fae8c5f9b383f7606f3883badfd1294e8affb0db", - "sha256": "0r6dihw5dar7w6h5xvif25fv9alwarb74mmaxq2ld8rbhv4il66c" + "commit": "1acaebfe8f37f0194e95c3e812c9515a6f688eee", + "sha256": "1f55fkmhs4vjjsvf4mvhmqp7qjjl0m2qdgz2gbrkgx45v8hzzyx0" } }, { @@ -58949,11 +59138,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20210615, - 41 + 20220131, + 304 ], - "commit": "73aebe62e8adf8e737c9a94361cce45063d05ae4", - "sha256": "1zagxpz598ssn88mch1mzc2aqa7sx29q7y1ifw4mrglsicgrxlv7" + "commit": "e08326a467ccb1ec9ddf99c1f5d53f55c50e52b4", + "sha256": "1rgi5qwrd9pfz6yqmfgmx2inlxqykq615aay5vi7wajdiss36i3f" } }, { @@ -59725,14 +59914,14 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20211219, - 829 + 20220122, + 352 ], "deps": [ "json-mode" ], - "commit": "255e99ba789fc69f977129a1ea22e57334874cb8", - "sha256": "09674zsxlza4b1p6z2r73zhmfa08v2ywkn388qa7lkpyjvd0n09j" + "commit": "962e5a2221136aa07f512834925c381cfeed2d92", + "sha256": "0pxcya18gbgzx772sh68803dbhxpss4smh6ar9vlc87mqwg5cqnk" }, "stable": { "version": [ @@ -59833,20 +60022,20 @@ "repo": "jcaw/json-rpc-server.el", "unstable": { "version": [ - 20190714, - 1521 + 20220205, + 1503 ], - "commit": "2f41d292b87916f6989e7ff5dc94da18ae6a9e4e", - "sha256": "1z5v7z98dinlayxzik45gjja93daxym75mh2shsy4wz8yclkw22p" + "commit": "9bf7efd5c69f429acbac41f33a1c9fdaddcb9914", + "sha256": "1zpgc20b0rdfl7kr1smm8xww4j852w341hxl7awi4ixapgjpd0h0" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 1 ], - "commit": "1623346b308dc8f593346dc947fdc4092d674834", - "sha256": "1kkn4xjn9i207x580902jfpcrhpkvpyzxk4jh1bclbryki9602zv" + "commit": "349e1f4722474bf1f75dbc8eb9d9c59d790b8083", + "sha256": "11911dk8nkacml6p29m5kpcxhjyas5ymarjsi802s426gpn8wj94" } }, { @@ -59896,14 +60085,14 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20211228, - 1346 + 20220121, + 2109 ], "deps": [ "dash" ], - "commit": "440655734197472c9404a051edd8ea066b07c120", - "sha256": "0xmdkgyzx1mz3aqj8wxscdv26nddw42gdjvfcjfbhl8is8v9l9wx" + "commit": "7c9961b084b1ea352555317076bc27a512dd341f", + "sha256": "1x752dr3qzgmmzxf2lz77ikd44l1fc00qfds9nzkwxm9l4s48xhz" }, "stable": { "version": [ @@ -60077,8 +60266,8 @@ "spinner", "vterm" ], - "commit": "ec9b332e78e146a6dbd348574190b2e7887133ab", - "sha256": "1gnzylfdp0n08g4psbrns6g3pki2m6kck6rsyf7d60ba0jpfyliw" + "commit": "92b47f1d4afa1d4ddffd432e23ad35e55c64a7a4", + "sha256": "0grr50ym834p73w1k7abbiswf1qviydm12f803v4i15l6miwvwpn" }, "stable": { "version": [ @@ -60674,28 +60863,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20211023, - 1347 + 20220131, + 1652 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "ea6394619219b6d54b843836e3a6b2e7d8aaecec", - "sha256": "1awgh70g7k7bjjga8kd6rfd8k3fqzkswgxyf4qgrsjci80is8jcn" + "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2", + "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s" }, "stable": { "version": [ 1, 6, - 6 + 7 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "f17f29d63cfbe2c9203bff1877db983c5663825e", - "sha256": "1r6bi26c6hqx64s54vjzm86q7bdn6x7m03g07x8v7h9v3xvlpdpf" + "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2", + "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s" } }, { @@ -61013,11 +61202,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220117, - 1747 + 20220126, + 2100 ], - "commit": "72d9add8ba16e0cae8cfcff7fc050fa75e493b4e", - "sha256": "07lwnz2i063v517lw739xpqgh04mq3ri060xni7qvvm3baiqjlry" + "commit": "ebe6ea5e4ce73fb7b30f9d6647d7635396410837", + "sha256": "02izx6cgdzi5882zny38gwsc6frdry854f6ihfspfv53qiwslxzd" }, "stable": { "version": [ @@ -61504,17 +61693,19 @@ 20210318, 2106 ], - "commit": "31308184cf2c127e77b3f61c100179f854d4df3f", - "sha256": "1mw883x1c6gngdajnycymyr7v4pqm1vqaa1429nf7y0wqh9xi3y3" + "commit": "6bb8fe8e3e581bb30ebb584d9079a2ca83a30b6d", + "sha256": "1nf9lz0lj82z945h0rknl6wk0kblmrlc68gnjlr74lh62hg6gih3" }, "stable": { "version": [ 2, + 1, 0, - 0 + -1, + 1 ], - "commit": "dedcb6bcabe3d8d6758dcee607e8c33b174d782b", - "sha256": "1v3iqh13lcn9jvw8ldymyp35j1k44wrqnhdmki220q940mar5cgz" + "commit": "8451d298c1260ba488545194d9111d48c224a5b1", + "sha256": "0hd38xb13b9k76lirmflr1xlqya6q6kl56qy0apk01cv8dkqh4ga" } }, { @@ -61581,6 +61772,21 @@ "sha256": "10a84q8ilzs5b8f8yf2awlyfa8v3s6gr1lz459nlnkq9fflxwdj1" } }, + { + "ename": "kmacro-mc", + "commit": "08973ee8f00035da7092e9eb8b850323ae83a916", + "sha256": "0ysgfrv0y4i4v6nppcs3gflx5qyx3jnkgygv0y24f833qnrnjgkd", + "fetcher": "github", + "repo": "vifon/kmacro-mc.el", + "unstable": { + "version": [ + 20220123, + 2254 + ], + "commit": "c7fe2f8200ae993787246ad6c8a5021b4946b118", + "sha256": "0q3gwf42fsii6c1ql8imjryv0a47gam72yw5gbqsrhwiqr81lyll" + } + }, { "ename": "know-your-http-well", "commit": "2ab50ae6278022281b2b7297c086089e5e669c7a", @@ -62027,11 +62233,11 @@ "repo": "reactormonk/kwin-minor-mode", "unstable": { "version": [ - 20220115, - 1522 + 20220120, + 2125 ], - "commit": "ec1e794168692c71e5bf89e124981f790b2a726b", - "sha256": "1c9jq6msrvw9mh2rhcrr402k4c0hhn3d3i7cr1zmiz1r3nffmm5p" + "commit": "20fac6508e5535a26df783ba05f04d1800b7382c", + "sha256": "1zs0wn0ff5hbv4rgqa7137s3269dqi7fg9bam56rw5qrr72lq5a2" } }, { @@ -62205,8 +62411,8 @@ "highlight", "math-symbol-lists" ], - "commit": "215a0e2434811f026c357f92ca15652e31a945a5", - "sha256": "026vp7h5i6yqvafap9n1g3sh0a3zz8pgbxy4nkhnfg7spdr29svm" + "commit": "3629d0081b3b1ded717c2dd8611132d45c0e8cc4", + "sha256": "11kw2ns1y636h50d44frbycv8q619ysvaz55dccbsxwbcpha0lnn" }, "stable": { "version": [ @@ -62369,32 +62575,32 @@ }, { "ename": "languagetool", - "commit": "ce91d4013963eacf1525809684e64ca52239fb73", - "sha256": "1cbhamz8yhfnyhzbn4j0kp9sbsycq1hi0j2kr3yhbf66fgi6x9f6", + "commit": "a13cea5ae978736cd2ab2752c5b49a360559f6fa", + "sha256": "0996wf63amacp7c73bxsysmkl7v536433ll61yd7h9zi2kysjzfd", "fetcher": "github", - "repo": "PillFall/Emacs-LanguageTool.el", + "repo": "PillFall/languagetool.el", "unstable": { "version": [ - 20210722, - 702 + 20220127, + 2215 ], "deps": [ "request" ], - "commit": "d3665a97cc87577f434a7476e1194b43f35408a8", - "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql" + "commit": "ea50c120ee3418489b43d51ed750288791d6eb95", + "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa" }, "stable": { "version": [ + 1, 0, - 4, - 3 + 0 ], "deps": [ "request" ], - "commit": "d3665a97cc87577f434a7476e1194b43f35408a8", - "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql" + "commit": "ea50c120ee3418489b43d51ed750288791d6eb95", + "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa" } }, { @@ -62881,8 +63087,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20211220, - 917 + 20220124, + 1813 ], "deps": [ "dash", @@ -62890,8 +63096,8 @@ "flycheck", "s" ], - "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55", - "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb" + "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", + "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" } }, { @@ -62990,8 +63196,8 @@ 20211214, 1449 ], - "commit": "3ec65b8931e8989ac590e95921e46f9e2fac6821", - "sha256": "10dxcwl94192yhilp9dimm2zrxpcz48rayd9w0vzk874qmn5mzz3" + "commit": "f47df6a18060002b47352b9c4b502556204df61b", + "sha256": "0g7qxl8b6cazp4vlqr8r6pksmm9vlrl92142k18vmfbabnjgfdm9" }, "stable": { "version": [ @@ -63224,11 +63430,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20210602, - 709 + 20220203, + 947 ], - "commit": "fb8f971c1b1b9d413399ccd3be8685fc5ed0a4c5", - "sha256": "013krafi3ki4h1g7kcdykgjs9ccbx6ys3zl6dvgvnvlkgcn5wyb1" + "commit": "d7dd9188a65e2ab7cf73c2e575a830baae38cb0c", + "sha256": "0wvx4wcn845v1fh5jlljlh7l28nwycpivaay7flqb52zz47xj116" } }, { @@ -63306,8 +63512,8 @@ 20220102, 1653 ], - "commit": "c196a9ba1f052f4fee68610a25ba43699ec432cb", - "sha256": "0c9mcqf5hl1x5hjwxlcdv5sngc0cgxfywfp6mc24ylqkqvf730bd" + "commit": "4c9f2ede47f710dfb0548d4e32793ad5766ca8fa", + "sha256": "1qcmcmi8s174v8549r86438smsxvnbfjhhq2iyhwwwxr3hxvr7l1" }, "stable": { "version": [ @@ -63572,17 +63778,17 @@ 20211119, 1813 ], - "commit": "6d6dacd08ca9fc691acbee8bfad76887dea8914c", - "sha256": "1a03vrfb1wn4qigkslflm21v0fpzdl8g4r3mprr0vgi2w84zs5b9" + "commit": "222e084b09a8b95ff194d3e9e3d8b89941c2052c", + "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6" }, "stable": { "version": [ 0, - 34, + 35, 0 ], - "commit": "48d3f23922bfd36177562988fe7d1c63e8f893ed", - "sha256": "1a03vrfb1wn4qigkslflm21v0fpzdl8g4r3mprr0vgi2w84zs5b9" + "commit": "b7cfd2109934bc15967723dead5b98822af58473", + "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6" } }, { @@ -63593,29 +63799,30 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220102, - 1539 + 20220204, + 952 ], "deps": [ "fringe-helper", "ht", "indicators" ], - "commit": "ff58aceed180bb6bc0d4477620689c7656144055", - "sha256": "1sbvrnin5q178b72aaqpz47jf5gn3d3znjqs4j7ydv4g1pxj3960" + "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8", + "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "fringe-helper", + "ht", "indicators" ], - "commit": "4d73b84a84227b01b7fbc6f717f6c380682cde2f", - "sha256": "0qkgmg60jfcwfsc693x9c066vgbclgqwzkqbmjrc32kcs57zhvni" + "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8", + "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs" } }, { @@ -63629,8 +63836,8 @@ 20180219, 1024 ], - "commit": "7f5f8d232a647e3966f84aaf35aca7cfb1ea15ca", - "sha256": "1bbqlgl955y24jsggzc763dagsv7vnlzcav98f15j9gh54p6h8ws" + "commit": "9aba9e57432873c2634ef504240e0a4431d3cadc", + "sha256": "001ljhsg7h3qxw3xd4c457dc2wrm1sybla04h78kq82cikmmnqgi" }, "stable": { "version": [ @@ -63962,8 +64169,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20220110, - 1932 + 20220203, + 1437 ], "deps": [ "ace-window", @@ -63972,8 +64179,8 @@ "swiper", "zoutline" ], - "commit": "9c03f3be2bae318363f1a35a01ab9906124610c5", - "sha256": "1jxc4pmlmsd7mca4x62kxyf7ynzr094m04bywmazh6yypb7nri5l" + "commit": "80a4f6e9a7fb39e514a5ddfa919fa14f73716b71", + "sha256": "0vkvsg0x24yabkhcal25xlz0r5zbvdhd4x0zni9w5wg3rcf2rvmj" }, "stable": { "version": [ @@ -64313,8 +64520,8 @@ 20220103, 717 ], - "commit": "bbbcda1aa32c6c59b63e9593dd3477bc4da5c34a", - "sha256": "0dzk6sx3hqhkd9axp594yfl47hh8jqkp9wyx6m4hycz85sp83ndw" + "commit": "b17645f2dfdf8d6b945123cafc253b1fc71f336b", + "sha256": "1gqk2klypf4r6yx5lvlpsiwn9fb5w3lqm99rq1bkx0iq1qm5aa85" }, "stable": { "version": [ @@ -64324,7 +64531,7 @@ "deps": [ "cl-lib" ], - "commit": "2c91d49be2450650236638a8100d9373ccd59d70", + "commit": "af7256e46b42cb954e16f9dec3511687697d9704", "sha256": "0i9468rh61l4xq918fgwk6li93lpm6zbn0lkpxr7pbvkgrl5xsr6" } }, @@ -64407,11 +64614,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20220107, - 329 + 20220130, + 237 ], - "commit": "27c81c6a28cefeaf20d6f00284a7b14d3ebf1001", - "sha256": "16sgd951mnp7g7hs8v24c85asfcwccdf6yafkd9qxhd048ngzdz9" + "commit": "d6efd5dbecd873b65da5c55270cfa8fe09ff6f07", + "sha256": "0lcdvf540dwsk5v3v17add2s6vv1yg24z479f6vngwssn281scqc" }, "stable": { "version": [ @@ -64979,11 +65186,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20190212, - 2346 + 20220206, + 207 ], - "commit": "d686e4cfafeac24e07e3efdb9763472f78d878f4", - "sha256": "1qh21z83qsvw1s9vhqcmwbvhd0q0lgj8hvpjb2rmn4kqkcvqbn2a" + "commit": "f1f4217b442fd52fb91cdbea34ff2c6af99ec8de", + "sha256": "145swf80935wq7pgz46f0g3ix4j0szi6r8cxwq5aw9fc8y1438n3" } }, { @@ -64997,8 +65204,8 @@ 20160813, 1407 ], - "commit": "e22807f83a0890dc8a904c51ee0742c34efccc6c", - "sha256": "1c89hsi0h783s96d322mvqwlf00ndm2qnrc165wpxrdbns38kbbv" + "commit": "9db6372791bbd0cf3fa907ed0ae3e6b7bcf6cc57", + "sha256": "0zvdbrr205p4wbm7zcs0f72w0jcs8zfyif9fl7x561nv2lylxnlw" }, "stable": { "version": [ @@ -65017,20 +65224,20 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220117, - 1522 + 20220204, + 1512 ], - "commit": "453ad37fee78ff033a10c234085609a8288ab2b1", - "sha256": "0jd7bggydgfas7gd0bmf4q8dhfkza86imp99jhkap87qxpylsbkk" + "commit": "d2a48068c4ce29966229f128d50163762b685091", + "sha256": "0hx5x7mv98sr935v97j2zxzjcmvzkh6h2zxra5vjxvwgwykqk9am" }, "stable": { "version": [ 0, - 7, - 6 + 8, + 1 ], - "commit": "3036a821193988ed5dba6fbcc0f5797c743856ec", - "sha256": "17wkp0hljpxj48bkjrg2ypwrgwrggd4asppyw8apbky9q8q2imgs" + "commit": "0b3bfd1dbb61f29d21b8aa17c60848456aad76c9", + "sha256": "043j28jrpifzqqdia4y2kdy0l0xw5cnh96mv3wr3sfbi3x33m44p" } }, { @@ -65161,8 +65368,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220120, - 202 + 20220129, + 1427 ], "deps": [ "dap-mode", @@ -65172,8 +65379,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "d20fda0477da5740c916614dc6e07deefc8b5835", - "sha256": "12lrw9ybddzjrqchvrg8d63mpfsq8fjnkp63algndw9clfn8haqi" + "commit": "5cef1b6a34327bf236c8b7b23c44bdd968b4585b", + "sha256": "0kvjkpv0yvahmlkqyzl9ayl3mmmr4gcmi3p5pp8092ah0xgys86p" }, "stable": { "version": [ @@ -65596,8 +65803,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220115, - 1742 + 20220201, + 852 ], "deps": [ "dash", @@ -65607,8 +65814,8 @@ "markdown-mode", "spinner" ], - "commit": "1d9da9f24fd477faa2a38b369842a27fe5bda160", - "sha256": "1p0jdfrn3v4qh0x29i5x6x5lkqd2y9wi6rx5w7kwbv5c5wfxcgw2" + "commit": "fbfaa80095a82f7473cb7e45fe73b32ecc1900ae", + "sha256": "0lg9sl5gfglx070230i4gszcp58b1s5pdgfq50hy6wanifvxsvah" }, "stable": { "version": [ @@ -66175,16 +66382,16 @@ "repo": "SqrtMinusOne/lyrics-fetcher.el", "unstable": { "version": [ - 20210828, - 813 + 20220204, + 916 ], "deps": [ "emms", "f", "request" ], - "commit": "f0212bea838f0c284ea97e051c9c6c63f1b527ff", - "sha256": "03mnj12b7y597p77066c979d0pbyz4a092vgjyb830dhihms2x5y" + "commit": "f6948259b388102208d8a29dabf383f10f801cab", + "sha256": "1p7dpnjspjcxs3wi7fmfnwxgl5ha3d420imhni4wlgdx2nyjqp8f" }, "stable": { "version": [ @@ -66438,11 +66645,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20210907, - 804 + 20220204, + 1229 ], - "commit": "6fe271f371ccb06b599a782839030bb8dee8535f", - "sha256": "178whq47zs055srly8wzdai5p0d0s1n3p349kb5wx2d9c2lg0pnm" + "commit": "0168a410ea2e25c1e98c9be6381ba0872d1e1ae1", + "sha256": "19v5902fij5q6cfzxx8b9lsm5kkgrzsd9lccj7di1aj2yf02n4jx" }, "stable": { "version": [ @@ -66462,8 +66669,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220116, - 1908 + 20220203, + 2302 ], "deps": [ "dash", @@ -66472,8 +66679,8 @@ "transient", "with-editor" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", + "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" }, "stable": { "version": [ @@ -66552,14 +66759,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20211101, - 948 + 20220124, + 557 ], "deps": [ "magit" ], - "commit": "5b60f0c88c33b8dbf73a41b388f55bf8e73e1d8d", - "sha256": "03i4rjwdqw2hf6nl5vwgh5zm235svrrnrj0wq82yk25f58dgskb6" + "commit": "d02a69c0c1b411157e8ba34d6e986767c5ea758c", + "sha256": "1adqc4c9xqydmmk1zh4ar590hznfq4ls8g9x5xc0id7mc0pc9rjs" } }, { @@ -66570,15 +66777,15 @@ "repo": "dandavison/magit-delta", "unstable": { "version": [ - 20210104, - 1541 + 20220125, + 50 ], "deps": [ "magit", "xterm-color" ], - "commit": "56cdffd377279589aa0cb1df99455c098f1848cf", - "sha256": "19q04y61hkzxkqw2xi1g7m4bwaxpfwza7if6cm41g72kdb8r68vb" + "commit": "5fc7dbddcfacfe46d3fd876172ad02a9ab6ac616", + "sha256": "1kph5r9dy21pgfknpcdzzqfn6rqig5nvp8ksh16y13k3axlzvkiw" } }, { @@ -66831,15 +67038,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220101, - 841 + 20220130, + 2007 ], "deps": [ "libgit", "magit" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", + "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" }, "stable": { "version": [ @@ -66987,14 +67194,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220101, - 841 + 20220130, + 2007 ], "deps": [ "dash" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", + "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" }, "stable": { "version": [ @@ -67057,14 +67264,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20210525, - 2329 + 20220204, + 455 ], "deps": [ "magit" ], - "commit": "fef1b7772fe192c434089b67644ff93765e384d4", - "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" + "commit": "5fc67d0ca96d5db8f51ed9f2d9e3a7f69e7cd497", + "sha256": "1gzv5d1iar53b020qy17hrvqc5h0phx4hz22lkdmw0br554vyzgl" }, "stable": { "version": [ @@ -67773,19 +67980,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220114, - 2142 + 20220131, + 738 ], - "commit": "c66d301dd12e0346cbc6756895c6cfcf17d3e8ae", - "sha256": "1hs37r1hr1mdzh9h9bgs5rmr3z95xlqglw2nwc72ys35k90yk27z" + "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a", + "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg" }, "stable": { "version": [ 0, - 11 + 12 ], - "commit": "9229d88ae4757f3439e81f51799758c009838cb4", - "sha256": "0gaqybj52skqcmxcx6k3zmw6lznzlr1fjvlaraic9m6n85xkvzki" + "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a", + "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg" } }, { @@ -68189,15 +68396,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220111, - 2155 + 20220130, + 952 ], "deps": [ "request", "seq" ], - "commit": "6113fa77d1cceb5bfe06d016dc2c81850c4b498e", - "sha256": "00npr64vkc20w17hlcn6xcysj67m0ad8hk1nig0xjhg3mrb76z5v" + "commit": "5a0cc2fcc5fa0dad2d884dcc9989222d6df9e88e", + "sha256": "0ndawsh4gg2lcgs7php8660wvc2qbwrqnb6cbw7dkzhhcnyyi266" }, "stable": { "version": [ @@ -68804,20 +69011,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220119, - 1855 + 20220202, + 1100 ], - "commit": "371f6554acfa4ecb9fc121f23539f77064f97115", - "sha256": "1csw64pva8x63v233v2rb2iv99139hv7yprjsmchbrjlakvs1df4" + "commit": "845c4693ade5aa24715d3c0e4da678ca3fa98b51", + "sha256": "124afg43kxlizn69hfhd7w157i3c59ifap1ilfcpga3dgvhn3ws7" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "b01c6a968e8be9990b1306ee62737dbf13525177", - "sha256": "082f013f8gbd67s6q9636lqhlhwlbg6z6n7icrqfj9x6671phwgn" + "commit": "6bb3fee0b91a74622e891537307918e828a4ed89", + "sha256": "04vin23bmds8dp2i1xihph9r7v43lcfz6fm23f4nvcyka9rqxc0z" } }, { @@ -68831,8 +69038,8 @@ 20210720, 950 ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", + "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" }, "stable": { "version": [ @@ -68860,8 +69067,8 @@ "auto-complete", "merlin" ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", + "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" }, "stable": { "version": [ @@ -68893,8 +69100,8 @@ "company", "merlin" ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", + "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" }, "stable": { "version": [ @@ -68955,8 +69162,8 @@ "iedit", "merlin" ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", + "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" }, "stable": { "version": [ @@ -69312,8 +69519,8 @@ 20210131, 2152 ], - "commit": "0652273fe1bfbeb165715613e00583b96ed07c2d", - "sha256": "1qr1zg0ppl6xlg91a21j4dlbysglwyjs8x139b2gyf95xlfkxpkw" + "commit": "bf7e45439b044d18d0fdf3151fbdd7994875edce", + "sha256": "1i8frxbqmq5qakl2gnrmz7v3kvbfz6jp45ayn9kk4mq1j2ync3lh" }, "stable": { "version": [ @@ -70376,11 +70583,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220120, - 804 + 20220206, + 751 ], - "commit": "e3bbb6293ba243a8e1bf9d0b7167641a9f3b4cd7", - "sha256": "1bp52pfpgc2w52l80vly18bz6nhfg0xa6y0sawsk05fy84qq9bdh" + "commit": "6789e5790c8faec1cdac5036a5910d4644707eba", + "sha256": "18jw3dyf1mpfkq8rnqlzwp805kqqf3my0av72kbzynw5biggaqzk" }, "stable": { "version": [ @@ -70723,11 +70930,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20220115, - 1428 + 20220120, + 1155 ], - "commit": "90503f872b42670d4dbe62ce033042cac7062aa4", - "sha256": "163lggazsic4ivxcky2k93l1qcax973yxd6594wx3s5gadkqsyv0" + "commit": "aa6666eb344947bf1eb9d14619f4249403048321", + "sha256": "09yyihx6cpa724z6cj2rqspajwj325ipgpmckklpgq6l4h5xnwy4" }, "stable": { "version": [ @@ -71011,8 +71218,8 @@ 20210306, 1053 ], - "commit": "273be57ac69667558efc9548c3b50531f0027efa", - "sha256": "0pg8zcxi84gccyk5v2mq7ypcp8qhlcq2vs8ad2v2w0a19ipk7m5g" + "commit": "7329757e1ad30e327c1ae823a8302c79482d6b9c", + "sha256": "0pkar3dyc47vqalrsrzrsny81615v4yi5y5hr4gdkhnbb54hsw4r" }, "stable": { "version": [ @@ -71937,13 +72144,13 @@ "version": [ 0, 4, - 11 + 14 ], "deps": [ "cl-lib" ], - "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", - "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" + "commit": "910f4c929e1d9c1844ddc467f72eef2e03aa3f97", + "sha256": "13lmhp2vm953s4phqdd119kp7s3p0kb3kqz4z6g3ga6m6py3gq3i" } }, { @@ -72657,11 +72864,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20220103, - 1622 + 20220124, + 1806 ], - "commit": "20e1dceb459856c8c4f903e6d8562991069bb8c1", - "sha256": "11m3y6kbjm0nqmdqbcv4xrchcabh4x1w4gy1p8gp36k600s1h7zj" + "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", + "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" } }, { @@ -72978,25 +73185,25 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20211030, - 1339 + 20220206, + 1052 ], "deps": [ "request" ], - "commit": "d821e0359883ae5ccc12a1cb0f684909cbde98a3", - "sha256": "0p595lfwzzmjzxx4mdzp47bab07ypxkk3jk3yzvd1dcf2lgd0h9k" + "commit": "c94ab2fc0beb80f4cb378dceba566b9314095152", + "sha256": "0s7inq1j053lnfgyn7nsh3s12bx1wc9f1fp001n5gj4qna8lbfw9" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "request" ], - "commit": "7cfa76d79b8432b0edb4c188c7a9b6634b78fe53", - "sha256": "0ikkg9llch1rh0infwcwf4104ahckxbsrhpbmy01p928rjkhvl3q" + "commit": "221d8705eab4b66b1a4fa42655ac38271dc7a6e4", + "sha256": "14cr4r360invcx0a7036gaa1dbrpxvsh1i7885nfkk9iwmnwjwbc" } }, { @@ -73404,8 +73611,8 @@ 20181024, 1439 ], - "commit": "e234b25bb51a4d3ce5376febb4ad9a11e77d5ca3", - "sha256": "0j0c4zdii67j6r69wjc726yjs5ad2nc75k93d6w9v9b7wxvjf4wb" + "commit": "f404f0059d71c8c86da7b56c48794266b5befd10", + "sha256": "10wk52s3ni9admzgm55vx6ci7f2dkwsh6z2rga63pyg52s88hj5b" }, "stable": { "version": [ @@ -73503,14 +73710,15 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20211120, - 1627 + 20220121, + 1723 ], "deps": [ - "magit-section" + "magit-section", + "transient" ], - "commit": "3d04d92d9c3896d07bc9fed7e4f40032025fbe7b", - "sha256": "0rzgnr18gk37y8i4d7rgwjhrxwby0zpkam8k7rf4jq35jjhqr5a4" + "commit": "00b2b8da57dc411cbaa464521d6f6f5f1dd9eb87", + "sha256": "0rpz1rfvrkw43mjaviy8p865xnsqm76rfmhgs8945wkms54g6qky" }, "stable": { "version": [ @@ -73741,8 +73949,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20211116, - 1718 + 20220124, + 351 ], "deps": [ "anaphora", @@ -73752,8 +73960,8 @@ "s", "virtualenvwrapper" ], - "commit": "7347ad1f3db7351c2e7f9a06d2ca8873130dbbfb", - "sha256": "178sq7rsghqhmhjdxixrybls00g7mp6wbmsx9lzg8c0ywpr9n332" + "commit": "ddb59e309018416d1f867b6dddca44f17a1b6bb9", + "sha256": "1qj1yzpgcdn550lb1c9hqc3wb46pah6h00y3m3q3n2v6cks8lnmc" } }, { @@ -73764,16 +73972,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20210911, - 1751 + 20220125, + 2030 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "a802ef9b589dda41bcb5d6cfce2faf8948c20c8c", - "sha256": "0fcskdyapz59cvik117vzj7hyv8kvvp6kh0aing2bgndwvai4apg" + "commit": "221902b1acb3ed4f9527eaee6584c2d9ff0d309f", + "sha256": "0l6izdzsaxx0zfhm502blvrlvw012mld2niln404c7ca9b49ma19" } }, { @@ -73799,14 +74007,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220109, - 1843 + 20220129, + 1234 ], "deps": [ "cl-lib" ], - "commit": "3c6601f7f45dd42c8f951c2b160470c8dd33c949", - "sha256": "17lg31ln2dgjvpm4il4ibyd7ii5dhkv0jwikxazvxd7jiyjah6xh" + "commit": "ba3facc3f6204ca82fa5b139dc01d8ce9e202443", + "sha256": "0w2r49c94xaag4nyfzz8ga05b15nc5zgm8y6sw63vaxbzg291nmz" }, "stable": { "version": [ @@ -74119,20 +74327,21 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220114, - 2112 + 20220126, + 1122 ], - "commit": "87d5a5a8aa323077c0b79fce42d062839eb2ff2d", - "sha256": "0xlqw79ahqz37dhgzlma9gwnm93vsnqg1vjzmzkcvkq3fjkbklsq" + "commit": "0c357ce78516ca176156a12eb362fb1d854074b6", + "sha256": "1aj749afw6nvq20wfmicwly9glv4mb4ga5dyiy92h6srkkf39y1a" }, "stable": { "version": [ 0, - 34, - 3 + 35, + -1, + 0 ], - "commit": "51c287ead807b6e3830bc5d393a7e9a89f36db86", - "sha256": "03rivc1lg9bcggrz4y75nk3wz4s0mbyqwdpcy4bldka2c2kz9892" + "commit": "6a9f66ef324aa286d4fb8721a10837784e87ee98", + "sha256": "1s84gxiiicwrjijjdvz5vkgww3zay8m6xr0gxig749kd1dx9x6w6" } }, { @@ -74628,6 +74837,21 @@ "sha256": "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x" } }, + { + "ename": "numbex", + "commit": "127a0664d008e6a6219118d3e4852a46433b6147", + "sha256": "1kky6c5ff99byzmkash3kr1lh6fjq49ixy9769wmmqs2rmz1r3pk", + "fetcher": "github", + "repo": "enricoflor/numbex", + "unstable": { + "version": [ + 20220206, + 251 + ], + "commit": "21fb1d4c998c914a91302fd5dec85fc803393917", + "sha256": "146ln9wbmk9j62klh6yi4b7hfijnnfayr660hvjzyvd4jj0lr8wa" + } + }, { "ename": "nummm-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -74658,8 +74882,8 @@ "dash", "s" ], - "commit": "7b803432ce62fc54a5c9d87294e3a499e55381ae", - "sha256": "0vmkfjd16v40gfh6w4lqn84jdljk5rz1rmh7sbb8dnfxfkvh9y9f" + "commit": "d57dc535cb19c42c969fef7184451918c91864bc", + "sha256": "0s2dx8xbyyscbx1swsl3j9drvlyf1mgk5vq3kfia7d2q8hg5z6sc" }, "stable": { "version": [ @@ -74724,6 +74948,21 @@ "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" } }, + { + "ename": "nxml-uxml", + "commit": "fe5ce2d30569e0e957e175346579409567bdb0bd", + "sha256": "1xjzrnq75syi6a555j3395z0ynfxy7ywg61xzrcirm5i1h5z7afl", + "fetcher": "gitlab", + "repo": "dpk/nxml-uxml", + "unstable": { + "version": [ + 20220130, + 1405 + ], + "commit": "94440741f7e8b83504d53991f26f63b4855cce27", + "sha256": "17k0d6ik2zj99kdvxdj5jg2kjj83lpy983mgcr3vv36axlw58wyr" + } + }, { "ename": "nyan-mode", "commit": "4d8c3000df5f2ee2493a54dee6f9b65008add753", @@ -75604,14 +75843,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20210718, - 2008 + 20220202, + 1609 ], "deps": [ "restclient" ], - "commit": "bfbc4d8e8a348c140f9328542daf5d979f0993e2", - "sha256": "0nq5w2gankvb7ix8rv33814j7qvhiawd9r15b9i6syn1i5k5pxhj" + "commit": "586f1fa07f76aaca13cb3f86945759f4b9fb8db7", + "sha256": "12cgjk3lpx8d0ms2j6b33s65jr4bg8g9cw9h2l82bm39nd6h5q9d" } }, { @@ -76055,8 +76294,8 @@ 20210923, 1348 ], - "commit": "7090b8dde4019fabef39cea329bc8e741f594aca", - "sha256": "07bn785bjl3s5d05mwyg5w1p940nbfvm1d2k9mgi7n76apj2q62a" + "commit": "fb005d5abc34bad8b7c39b9da04a16d997932a0d", + "sha256": "18ay9jrmc6ldywzrjac2gcjqczbsny7a4r2vf8kxaz8camgh7081" }, "stable": { "version": [ @@ -77192,26 +77431,41 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20220117, - 1642 + 20220122, + 1913 ], "deps": [ "org" ], - "commit": "559a40dd036b6e8204b6a078ad4dc9439bc20e5c", - "sha256": "0y6fw53vasas7hcq9r711rvsjbc7p897pjrhqpzda8nyyvd673h4" + "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f", + "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6" }, "stable": { "version": [ 0, - 2, - 4 + 3, + 0 ], "deps": [ "org" ], - "commit": "a1aa8496f2fd61305e43e03e6eeee2ff92aa9e24", - "sha256": "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp" + "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f", + "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6" + } + }, + { + "ename": "org-arbeitszeit", + "commit": "0d99045c0514613c6f3e3b0e167b5476fdaf6e43", + "sha256": "12w1yi3dzax0rywm83p7mkqj7fd05vg0lg2c9p20ckw7blxxk7xx", + "fetcher": "github", + "repo": "bkaestner/org-arbeitszeit", + "unstable": { + "version": [ + 20220127, + 754 + ], + "commit": "5b307ebc0db0d58ed6b94d4db30f2653b5782e41", + "sha256": "0dcawxni158af3jdhr22zkh39b39qvzsdk6kc5l8vjwjd37r1kks" } }, { @@ -78404,16 +78658,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20211110, - 1423 + 20220121, + 1503 ], "deps": [ "dash", "org", "s" ], - "commit": "399020d435d296014f92fa5f632d7481ee002661", - "sha256": "01q8w49dh9fpr2sc70p92cxjm66fnrrgnk4ba321aq9dlfmly2zg" + "commit": "64930ad82c0220ad7d80ec0896b8647a3206d2d3", + "sha256": "0r4kn82jwv6w6ngz5azqq7jyxlfcspjj8lpscq8cnha5112qw7nh" }, "stable": { "version": [ @@ -78516,16 +78770,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20211114, - 1616 + 20220129, + 2049 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "01e6a7c17e210dac0608154dd69d637e9733498d", - "sha256": "19nljq73gnhjk7zz8y5wgap8j41jd7zifjcmfddrj27kmprw2h5z" + "commit": "f424364605b21e5f1686f8ce2645afe543538684", + "sha256": "1646hr3mmg0ppa4xx9gjc1zkdryfs2m0j39cjhrfxcn05gsykklh" }, "stable": { "version": [ @@ -78798,20 +79052,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20220117, - 438 + 20220204, + 42 ], - "commit": "b3932a64ca0d3017255fc99b9cde253eb17b08f5", - "sha256": "0456i9784pvqkxwdyrrkgair2y4i46r9svx67fz5qljxd1z4yjkx" + "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d", + "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j" }, "stable": { "version": [ 0, 2, - 4 + 6 ], - "commit": "d52a7b52b652bb87a82be02f66ba14d54dee0cb5", - "sha256": "0in83jlrwjn81qgw1i7n228sbf314bj8hkrl14ahfn0zmfll60sw" + "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d", + "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j" } }, { @@ -79795,8 +80049,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220110, - 2258 + 20220202, + 1733 ], "deps": [ "avy", @@ -79809,8 +80063,8 @@ "parsebib", "s" ], - "commit": "1ebe9997a82554466ca4d3a8c8b05e1bc77423ce", - "sha256": "03f2xhs7dfzdpf173c5cklmvlz82wkgjj677w3nh2cxkxdm820bq" + "commit": "9db9afb50407cdb1a8ec7c28bea69d0b6208fbdb", + "sha256": "1qs8c1sdz53pr2p53lqd1kx1747r4i2h9ynwi6dq6xab148zmdjg" }, "stable": { "version": [ @@ -79893,8 +80147,8 @@ "dash", "org" ], - "commit": "eac6aa8694b37623cef14d208ed88415499072a1", - "sha256": "01ri6h144s0bgf45azbqzkm2h4x0jlz9n2azxq27dk2n7k3lzv6l" + "commit": "341e829a730dd9eb1c14e2588fecb3ad7361f989", + "sha256": "0cj5ijf4bndx8n0ziwjp4q8wj779xhm12k0m0ld9hy21vn22z8l1" }, "stable": { "version": [ @@ -79957,8 +80211,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220120, - 257 + 20220131, + 654 ], "deps": [ "dash", @@ -79967,8 +80221,8 @@ "magit-section", "org" ], - "commit": "817d8036fbf028d2c5c386720fbf9946d03fe891", - "sha256": "18rma7hm43zm7s8c0fjrdaphmbzsjryly7g46hgf3qwrn55n0y8m" + "commit": "eed1df90f571b19cae1581e7f5d938892b00c24d", + "sha256": "1pd887c4g9rykfz4sf7n6845b9md1sh64bychjbbwbj63375xvsm" }, "stable": { "version": [ @@ -80046,16 +80300,16 @@ "repo": "org-roam/org-roam-ui", "unstable": { "version": [ - 20220104, - 1733 + 20220131, + 1539 ], "deps": [ "org-roam", "simple-httpd", "websocket" ], - "commit": "5ecd418060bf606924ac86faa1aa4036d4c785fb", - "sha256": "1gj8bca7y8zjjnqjs0mg6vv2nvjrkqbqrj055zwkhz9sj36q5s5h" + "commit": "309fe3c58c7081de4e2c9c64f7b40ea291926048", + "sha256": "14qgr3jwn42a8wy07g03j55j5shnvv52ma2wq1zf34dag7d4fghw" } }, { @@ -80987,11 +81241,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20220119, - 248 + 20220206, + 1209 ], - "commit": "74fc34319ce26455f58c7ae476b482d323796276", - "sha256": "0s0bx2vgn2rzcda9sfcfds3x68d2gnz90qviphpf6bi27ab83a20" + "commit": "bdaebcb4ef44c155a92d9c89a21a1d29019ee026", + "sha256": "1djpjs0v0w6drqpi39y58hs563rqszcfwmldnwcmyp3f3cgqd8k3" }, "stable": { "version": [ @@ -81014,17 +81268,17 @@ 20220109, 2003 ], - "commit": "6b5acc29867787660d46f13fe1555e49ef0ddc2a", - "sha256": "1la2gg39s5xjw3v75y19hvmw9cyhg6z3lmaggh9qpbd80cm1xyyw" + "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250", + "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95" }, "stable": { "version": [ 1, 1, - 1 + 2 ], - "commit": "6b5acc29867787660d46f13fe1555e49ef0ddc2a", - "sha256": "1la2gg39s5xjw3v75y19hvmw9cyhg6z3lmaggh9qpbd80cm1xyyw" + "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250", + "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95" } }, { @@ -81620,11 +81874,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20220109, - 1727 + 20220127, + 1502 ], - "commit": "b46158737eb6fb409ecef1a072184c5f7ae4b85d", - "sha256": "0wwlvc1nl5w3987wql3fp7j5qqxzjx0h5df84zbr77qjx637cs4d" + "commit": "36d7aec5549655174467db45d1dba6647b9e19b1", + "sha256": "0cg8rxl8wrcgm910jm0m61wbxk5i9f8cxcb289p7ip5bjbijmic9" } }, { @@ -81650,14 +81904,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20220109, - 1733 + 20220127, + 1516 ], "deps": [ "cl-lib" ], - "commit": "3e99ebc8ad013d846d9d987a7dce54dd6f83e52a", - "sha256": "1aj4g7gh498xccq0hb6gxvxm20124754cnhp98pn7yaz5a56967b" + "commit": "f5254db6ae78e30c2786c53991e98e86ed344ac6", + "sha256": "1l63bcvlnqnj5z10cyanybc5jz9yimf53vffycf9wbsph5lpfs12" } }, { @@ -82566,14 +82820,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220119, - 1939 + 20220204, + 1606 ], "deps": [ "org" ], - "commit": "5fd3bdcb0f3d49748302aeaf28b61fac9975eda9", - "sha256": "1sw7hr5h6lzamhw9zrqlahdn40dqpmnl8cg3sm8sw73g62pj85k2" + "commit": "e52b7e50db825027b5e770c433793b3284ce4367", + "sha256": "0gfzkzlfl5119nxlrc8dm1y6gqppvqc21ljy68nz2npp6fcswkb7" }, "stable": { "version": [ @@ -82662,14 +82916,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20201202, - 1658 + 20220121, + 1015 ], "deps": [ "org" ], - "commit": "0bd966ba241a2458d5097e256543eceee50d462c", - "sha256": "1a1cwq8gaq3q6g7lfm2finz4srla5iyg8s81k2991fz2fh1iir9k" + "commit": "a8019237a8f5e016a7c952fc2f673a2498a0e779", + "sha256": "0pa7pwk0yjcgak3f9w9jggj3ghlig1azf15ng954r646810j9i4v" } }, { @@ -82687,8 +82941,8 @@ "org", "s" ], - "commit": "4d2e0aa7f92d07e16cea2dd5e1d250a3f243c3cf", - "sha256": "1h5930953nnddg7ysr87m5r6gm517zbfi7jbc77hmrywgibqvpik" + "commit": "fc6b2594706c44d266d0863c323b1b58ab9d18ba", + "sha256": "01kydlzrc2qi4hrklzqc89fk9wpkc52slsslbv42ifsimlj2bnkq" }, "stable": { "version": [ @@ -82925,14 +83179,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20211128, - 1509 + 20220205, + 1046 ], "deps": [ "org" ], - "commit": "ec6092d2d5ed0693413a86ad83a2c0936861d130", - "sha256": "0xbk5q9vcy4n814a077kgsvhsbbr51v5lyqdpyy9j4sakh1sxw3k" + "commit": "2f1509cc145c3604a0b17a306603f231d067ea16", + "sha256": "06p6r86way5cxvp6z65j5hdmv09frk69qly2c02zg64xxymc8n55" } }, { @@ -82943,14 +83197,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20201218, - 1356 + 20220206, + 1046 ], "deps": [ "org" ], - "commit": "1a49535cf927cd52ffa05c815b890888c4addf86", - "sha256": "001dv3zxsvh5zgrwn5jmib82bns4phbbd5kcy5mvmk7nyayrmq9p" + "commit": "c9c1be3ff0ac2464f0d514939887f34f9b4198b2", + "sha256": "005qrg580328l4h67i0mm2r540dknmn0bnqyy2vdpk75qc2rirca" } }, { @@ -83362,14 +83616,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220114, - 2049 + 20220115, + 2346 ], "deps": [ "cl-lib" ], - "commit": "61589823b393d0fe7d9bd6627571f6985f65537d", - "sha256": "16v7wjh45qg1hx5vw00irmf35g08kdqlx2g9pnic4ch403sd62y6" + "commit": "415552b9548fb4fd929a62ec09563e94dfbec5c9", + "sha256": "0y5b6y0a39x82qrg7bjk1gs5xn0qj68gywz2wkxkh5g4m90kylsg" }, "stable": { "version": [ @@ -83466,11 +83720,11 @@ "repo": "tttuuu888/package-loading-notifier", "unstable": { "version": [ - 20210724, - 1700 + 20220130, + 318 ], - "commit": "895ab23f970f954349ccb6c89d397ad7d86087f8", - "sha256": "0maa3w06wx54f482z2k6d0vq8mr01j75nnbb7d0mjw15d6qi7pbk" + "commit": "bc06ba97a0537aa202f277e5597ac96ca39307ab", + "sha256": "0wp3jdbzcjpbx4720nd31fzs5app6phdrbcwisw89361wvmmnhkj" } }, { @@ -84070,11 +84324,11 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20210127, - 1749 + 20220129, + 2216 ], - "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b", - "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000" + "commit": "4f6ad761a7d508bb6b3e6539559929d2706caa10", + "sha256": "13d8psgd2j3vqmgwwf62gwyq7h6qlj8rrs31fxwjqmzzdblwqy1y" }, "stable": { "version": [ @@ -84461,15 +84715,15 @@ "repo": "volrath/password-store-otp.el", "unstable": { "version": [ - 20190713, - 1748 + 20220128, + 1320 ], "deps": [ "password-store", "s" ], - "commit": "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5", - "sha256": "1c9lvxi0yf0x3ywciv58zkn9ss6n41305g5rp4l32a33sq51s567" + "commit": "be3a00a981921ed1b2f78012944dc25eb5a0beca", + "sha256": "0hqfxdpis2if5fl5avar93mr2gfqqnd87s835hiibqq0800dv3v7" }, "stable": { "version": [ @@ -84783,11 +85037,11 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20210805, - 1537 + 20220131, + 2316 ], - "commit": "5f2943fd70d94065496c52d21f05eb89028637cc", - "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi" + "commit": "94a19b693a226aa11b15627e01f9f4c9af752bab", + "sha256": "0y0mnm2fhshvvc9iz4mgzvxhvhj0xriinn155dilnm4skglzgxk1" }, "stable": { "version": [ @@ -84969,16 +85223,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220107, - 1241 + 20220125, + 1708 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "4e6c778194bea39d81871a3caa0b72539fdb6868", - "sha256": "076597i0c3s8l010m6xirass0grcs3pjxs7l19xj8219x9lkf8l5" + "commit": "72ef774320d9eacd4d79b5016e9e989ab176afba", + "sha256": "15da6k648r0ir515bpyqf88wg7f8rxqz60zk88c4277ywa61z1zq" }, "stable": { "version": [ @@ -85410,16 +85664,16 @@ "repo": "SqrtMinusOne/perspective-exwm.el", "unstable": { "version": [ - 20220103, - 909 + 20220125, + 1939 ], "deps": [ "burly", "exwm", "perspective" ], - "commit": "3a4d382a744149b8bdbea5b62f66f6705fd5e2c7", - "sha256": "1kpciigv0lxdxswnqjdbqlk30jlzvzy9li21z1kbnr5plflj3ffb" + "commit": "541946caa0359c14c90da58196bec7baed122a46", + "sha256": "0mcrvv9mhg0cfkcp64hkdd9wh9j04hw0d9dz1ghafa4h6hf3azfl" }, "stable": { "version": [ @@ -85876,11 +86130,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20220109, - 247 + 20220120, + 1959 ], - "commit": "010d0f6987ab7336ac9475e8e2298caa56981085", - "sha256": "0z0cskqg9mjk7v2631pir3bmgyp2clmhq432blirfla269bry30c" + "commit": "5f26bec865ee159dc30d3922f17bc42adfcfed50", + "sha256": "0132az773sk6w1wdz4a1wxmxy5w69x4h2jrgd67h94k845nyl348" }, "stable": { "version": [ @@ -85992,8 +86246,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20210619, - 1706 + 20220120, + 1919 ], "deps": [ "async", @@ -86001,8 +86255,8 @@ "f", "php-runtime" ], - "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", - "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" + "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c", + "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr" }, "stable": { "version": [ @@ -87540,14 +87794,14 @@ "repo": "polymode/poly-org", "unstable": { "version": [ - 20220119, - 910 + 20220201, + 1514 ], "deps": [ "polymode" ], - "commit": "e8e5375f82c1d1a6b4b0ba6ae7ea181ff6f49e3e", - "sha256": "1v1k0aah4c6b1zrswjgcfnsaypxxgiyai33j4slxvalbj4nsa5g5" + "commit": "01fd0f4b7eaeabf070af831f4825993210f64f2e", + "sha256": "1cp017g5a7mk61mw1dhykqlyc1nzk50diw8ykf4napbky643c803" }, "stable": { "version": [ @@ -87700,11 +87954,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20220119, - 1503 + 20220125, + 1433 ], - "commit": "d0913ed53d27ee90b8a31b7a78a29502a5314087", - "sha256": "0h4xndlgyqv1ywqnvl6zb08brviiznmarnn56sikmjzkh9i64zdh" + "commit": "f2a2b9772722aaadf13bd4d35652637b495952d4", + "sha256": "1n6jj3lz72kh2kqp53fx7h2ggbh6c4s96v6cyhwjs4sls40xrbjl" }, "stable": { "version": [ @@ -87813,8 +88067,8 @@ "deps": [ "yasnippet" ], - "commit": "115a0d5066f89554bee9cb1045bcda5a18ebd441", - "sha256": "1g11w52bf724zwwsvrcylk3ndjci2cnbzing77c91psz6d7zjkvw" + "commit": "81a1348f81b0d8a3097d1ca3f2fb2f57964d56d6", + "sha256": "0p2lnvcfjs8v012xrdphjbbdz1nkw9cqhiznadrgd3r0h49r13ys" }, "stable": { "version": [ @@ -87850,8 +88104,8 @@ "yafolding", "yasnippet" ], - "commit": "61f54d0620229afdd049dfe75681942bcf52e53d", - "sha256": "1z04y3kxbj2lisawl5yxwg7q8qry02fhmv0is6wwv3gmgnbk1kns" + "commit": "4bdffa94cd89da91b75e9edc56e9e2197ce072a3", + "sha256": "0vr4w7923g3a5sikw4px82plgjk9b3wki8ciqamp7i1p5i5lxbhz" }, "stable": { "version": [ @@ -87928,11 +88182,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211226, - 2111 + 20220126, + 844 ], - "commit": "527a85c49174e6e79220f0ed0761c204a979eae6", - "sha256": "1l9n67jsj1y5q9hhkrmsxcjw1q3ychk7npl8fd1gbzxy2csc7vi2" + "commit": "a50edecacf2939fc50ad2bc48f1015486a09f885", + "sha256": "0p12zz2lhm10yikhnq52z66xwy64gcvig42bzajv5q7x09qvvna7" }, "stable": { "version": [ @@ -88146,8 +88400,8 @@ "json-rpc-server", "web-server" ], - "commit": "9e68b419acf9245208f8094e10041b7f04511473", - "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" + "commit": "21af54b2fc9fd8876664c8e6c2ff2e4ffbbad249", + "sha256": "1x117hnsn88gj7m0kwrl8gps5qrzzjmx9ki045ndgfpqayyfyplp" }, "stable": { "version": [ @@ -88196,11 +88450,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20220110, - 422 + 20220124, + 859 ], - "commit": "6c0e63d6b3b6638c11729c5db28019a38ff44f5b", - "sha256": "0l3c7d24lirks8i4s715cdv2x022h4l6p5kg81ramqzd843335qf" + "commit": "c91d4d53fa479ceb604071008ce0a901770eff57", + "sha256": "15h809mf8d8w8axbfzjs40j8yrh5ms88x4pmlx1qlcac8j6qrilf" }, "stable": { "version": [ @@ -88291,14 +88545,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20211022, - 655 + 20220122, + 1904 ], "deps": [ "cl-lib" ], - "commit": "390a95fe5b71cfc20e18d034b4b35b5c159a83fc", - "sha256": "0n5fd38qqsj2m6m6dkm11ndk0blxnn5z5rdpb9blrni7p45d6z8b" + "commit": "566c77844f053cb39fa7acdfbc143a855450f0b5", + "sha256": "0nhh2bq35s8rgz6g38i97759d92d6z5yak66687lnk481wca3x4l" }, "stable": { "version": [ @@ -88707,6 +88961,21 @@ "sha256": "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd" } }, + { + "ename": "pretty-speedbar", + "commit": "f91b1b66d4c9b7c47bc83e8c22b295b8804d3283", + "sha256": "14rd1h5pc31yv7rycpqdq5yhwif1b941fknr86qm055dlnrqqqa8", + "fetcher": "github", + "repo": "kcyarn/pretty-speedbar", + "unstable": { + "version": [ + 20220124, + 16 + ], + "commit": "ea3daaf6a526a1ad4ae385066c99fd9643da7f94", + "sha256": "0irnp6v1i930s8fh1iqmbs4amyia9qdnggq7n5hxfi4ni0p66yqq" + } + }, { "ename": "pretty-symbols", "commit": "ed01ef6333e4558877b0e357ff8bf601fb88b757", @@ -89169,11 +89438,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20211220, - 1144 + 20220203, + 1326 ], - "commit": "4e6f66c329e57d66269b4bd3fc02518eb0c677bc", - "sha256": "10imlg3qmyskpzbw5i1ac1chn5yiyl3wi3wx9l3sn4kkjgggiicl" + "commit": "df3d73e1f0ff625a09196ff3ba6f4be82a53fb3b", + "sha256": "1iy5i8mdvzgfirsv5k59v8i45fcm6cimlfl546hgzb9ygl6l15vr" }, "stable": { "version": [ @@ -89674,17 +89943,17 @@ 20211013, 1726 ], - "commit": "41e22cde8d8a44c35127a26c19e08b180e0b30a4", - "sha256": "12ixcl6983q1l3qgrxq9fs1v1v7ihc74k6xy52f63vm48z580lrr" + "commit": "3ea30d80847cd9561db570ae7f673afc15523545", + "sha256": "1yh2ayksfc3x6kavix8nk4y51gpajjrrf5cd9b18rkw2rn5xnb55" }, "stable": { "version": [ 3, 19, - 3 + 4 ], - "commit": "cc7b1b53234cd7a8f50d90ac3933b240dcf4cd97", - "sha256": "115mdsx8jck4202hhnnirq60y3ya6swhh31f9bwj7fqcmv9qn3lw" + "commit": "22d0e265de7d2b3d2e9a00d071313502e7d4cccf", + "sha256": "0vhzy6xy7r7622yid374b4fhnws0x9xpfcnhd1gwp0fmi5g3q54v" } }, { @@ -90086,11 +90355,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20211204, - 1256 + 20220204, + 1645 ], - "commit": "e147a72f3c6b7bb40ef7fa37d12ea54afa09cd7e", - "sha256": "06lkpzz6ri092awgba575vq4qy3ym4qbk6hrwfpvmy81n26v7wsw" + "commit": "e6681214afc6b5ae06e4813492633bb4ad9b2b1b", + "sha256": "0jqii5ijbnppayawrl27b22accpxayf5i4h15zx1s0wpb77km0s8" } }, { @@ -90580,15 +90849,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20220112, - 157 + 20220130, + 722 ], "deps": [ "async", "xr" ], - "commit": "75ead11eeaaf801e342bb18d7c0ff93ed1c123ff", - "sha256": "1wlvgh214fn2d4h7wiq68hwshncq85qp9j5agkvh7avla56vi97j" + "commit": "028e443527166e8cd6ecc903e635fbe89aca9c91", + "sha256": "1qpskp8jqxwfbg274lkl95fmilygzxqpy2i7vv0vdl7pdknvbkgk" }, "stable": { "version": [ @@ -90765,8 +91034,8 @@ 20210411, 1931 ], - "commit": "ccd9aee3c0a64c8a9de52be03daa0fcb7a6dd84b", - "sha256": "0024ppkkk9saj86ncld39qgxf365yfqx264hbad0k4xp0qrlig9k" + "commit": "d7013f6799d28a69dbbf3329da7867a8afacce82", + "sha256": "19w4i7yymj204v147z4ggqwb0ghiz6zsh1ykda3x3rc32d5aap3h" }, "stable": { "version": [ @@ -91089,20 +91358,20 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20220118, - 300 + 20220128, + 1953 ], - "commit": "049bd0a118e0ea133b777b40af1728734c4bf481", - "sha256": "13x6vvzxwmcjs6gd3xmhszy139dxa4vylvn9bq4677cj62yf5xpl" + "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1", + "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "152c4355ca315b1e5861496d5abed9365d856e57", - "sha256": "1d2ymwfdsdqii0drpypbl4mla2mq4a8avch4j4zj7g9h8z7h6wq5" + "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1", + "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n" } }, { @@ -91290,11 +91559,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20211126, - 1944 + 20220123, + 1721 ], - "commit": "43e509ed323c105f9b312813a1ae953d1a2efe3e", - "sha256": "1b6prwdy3dnkdsxy1lwws1jmq5r80g729z18np8ylp9j3pzz0nrh" + "commit": "0bc3cdb32636278b1dc0bcc55741b147441347f6", + "sha256": "0dyf35fhm2wzq6p2wcgdhf81y4rs92j5np7jvrwp9ic9xzw51cx5" } }, { @@ -91331,8 +91600,8 @@ 20211010, 1334 ], - "commit": "a2c51cd1d54d507ec1902bc5c7bc888fe5a23c8d", - "sha256": "0zikg9gbcdzjlm6kdg71i28zxic4k22iijfvf7x4dvx5pc8pw8f6" + "commit": "fe3a99ff8cbddcf5391458f356cecf2e8c3a2b84", + "sha256": "07ssxr563lw748qwvdmp64dc0hlb1pf9kiv062xy2bp8hkxr0y9z" }, "stable": { "version": [ @@ -91756,11 +92025,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220118, - 1424 + 20220204, + 2212 ], - "commit": "e9b40d2902e2fe7a46757a4fc64c780a18c94169", - "sha256": "1b97q81qhn3v42ivfzckqv7rc1k3j060gzp90p7qg73nslxiz1vg" + "commit": "cef5a55d2b766973db92f9d9ab2210c03fa8ba02", + "sha256": "0zzk0s4akx6ffsbhylgfflcypkkg36a3accxhmmdd11yn5rckv7f" } }, { @@ -91771,15 +92040,15 @@ "repo": "otavioschwanck/rails-i18n.el", "unstable": { "version": [ - 20220111, - 1811 + 20220126, + 1643 ], "deps": [ "dash", "yaml" ], - "commit": "b2048154beb384e9a732d3b4054dd18d974e9675", - "sha256": "1ci7an9jjnnl25gly1bg4njhcs20nvavpgbk34z9kvahpy12df48" + "commit": "8e87e4e48e31902b8259ded28a208c2e7efea6e9", + "sha256": "0mddr1gjhaxgc9rqmbkw2fymz3blvm0cvg15c9lrary1z1almj64" } }, { @@ -91805,15 +92074,14 @@ "repo": "otavioschwanck/rails-routes.el", "unstable": { "version": [ - 20220111, - 1811 + 20220126, + 1631 ], "deps": [ - "inflections", - "projectile" + "inflections" ], - "commit": "9df7e0499e093463267d210f14e96cb7f2263387", - "sha256": "1njw56h8w2pq8za1cg1s2jj06ryfaxpk694ab4jgmf4dyny5qw91" + "commit": "eab995a9297ca5bd9bd4f4c2737f2fecfc36def0", + "sha256": "0109mfxz7h7423yri1g0l4fr911iw7n6wkivpjcv09f0nq82jxch" } }, { @@ -91953,16 +92221,16 @@ "repo": "asok/rake", "unstable": { "version": [ - 20180212, - 1008 + 20220131, + 808 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "9c204334b03b4e899fadae6e59c20cf105404128", - "sha256": "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja" + "commit": "759fb373b90dc4cf762a58217e81d8a3fecb5563", + "sha256": "0w677abkmrghphi2gwbxypyb59znyv331shmg4j8y5fcqf1whm14" }, "stable": { "version": [ @@ -92951,11 +93219,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20211108, - 2240 + 20220206, + 1140 ], - "commit": "9d64b65855464bd92ccecf93c19db8b1fc12d7a3", - "sha256": "1fixdmrpa9jbjmpqf201420lpg6wcgngzddz7h5c4j68gw1a7jd0" + "commit": "2b38ca25e3392636fe936d3edad447970279a463", + "sha256": "0fqrhfk3jg4dyf4z8nx6sgpi9l5mxzld2w0icz81kr8vm9p92nmx" } }, { @@ -93119,8 +93387,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20210603, - 2305 + 20220120, + 2200 ], "deps": [ "ht", @@ -93128,8 +93396,8 @@ "promise", "request" ], - "commit": "1a6eaf3d1a5e44205399526c0f425281b8d9ccc3", - "sha256": "070zghnrh4ywndk6bz1vd750g2nxj4rd42gphymyz8x7kazqqh1j" + "commit": "edabb5df2aa0fee0c0f34b862505977dc13449cc", + "sha256": "0g6kj94904ymsk54y5f6ynh5w562hy6bx9lngnwrqxcga1xydk71" } }, { @@ -93319,11 +93587,11 @@ "repo": "alk/elisp-regex-dsl", "unstable": { "version": [ - 20100124, - 1028 + 20220125, + 506 ], - "commit": "ac89ab8b7691a165ef3007cb84417125cfc0632e", - "sha256": "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx" + "commit": "8802555ecdab8b50bb64181798497c10cdb5034b", + "sha256": "0a3jyxrgr2sqigv86zr9irf0g8rvvc2bwjc3z2m8pbk75hm00k50" } }, { @@ -94261,6 +94529,30 @@ "sha256": "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7" } }, + { + "ename": "rhq", + "commit": "7538e3b243c20552f73d9a3c7524f0a106a62cb7", + "sha256": "1nv7hxw2yc8p5s95mf2lw50z69wpkcw63rq2k8x38r87bxfrifnh", + "fetcher": "github", + "repo": "ROCKTAKEY/rhq", + "unstable": { + "version": [ + 20220128, + 1344 + ], + "commit": "8d7e25de54f0b11df90a21d3fd2f7fd7608607f0", + "sha256": "17qiigk6ikfcyjgwxifmvwkyl8pa6iapyxz2qs0sbskw5d4mhdan" + }, + "stable": { + "version": [ + 0, + 5, + 0 + ], + "commit": "f554339b7a0be35ba43631a316a797edb888b206", + "sha256": "0pnh1mgv5xi11nrd0w2in5p412pqa29x3xvxj5q24lrwcjpl37lw" + } + }, { "ename": "rhtml-mode", "commit": "f9e14e9d8df9c2ce13e290a5f3d3bf9b247037f4", @@ -94426,8 +94718,8 @@ "popup", "posframe" ], - "commit": "5c2ade217134f6f20cd405447af20825e5b44513", - "sha256": "1yp92sfirvcz3s2q8j8g6qlcmb7pn30m9ww4nc332m1axah7l05n" + "commit": "bb1b5282f08187a00fd59ece7aefa6f476c77c1e", + "sha256": "164q3j88r2hnqaaf6qahy2db7a7s4j31fwz9bzz00p1gn4chrm5w" }, "stable": { "version": [ @@ -94857,15 +95149,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20201228, - 1319 + 20220203, + 211 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "92ef785010f6a68cbf73861e75ac6cf4e1832291", - "sha256": "1di1b9psmaqzhp0ik3niwgy43i0vj16m5fx7xnsyi0bvwv45cab8" + "commit": "4215ff1f2d1cee24a144ff08297276dc7b971c25", + "sha256": "11bada87rji78pw0d3l9g70vz2i1cvdlwxl4ixxcyc6whlfbff3f" }, "stable": { "version": [ @@ -95355,6 +95647,26 @@ "sha256": "132gsmgqnfzx8q0f4gchjzhm3wqm5frjrsb8q9cmqsa5y2g7qjmf" } }, + { + "ename": "run-command-recipes", + "commit": "797acbc65d7043abd094604ac7840dfaab0ef2c7", + "sha256": "1ifj1rk2yx379fkbagn90idhzglc0wgq749ab1w65yj00fmybz05", + "fetcher": "github", + "repo": "semenInRussia/emacs-run-command-recipes", + "unstable": { + "version": [ + 20220205, + 1840 + ], + "deps": [ + "dash", + "f", + "run-command" + ], + "commit": "93de193267da8be1d1f6a23faf3988797f597846", + "sha256": "1pz5d7dh6k7qbv5qq21g279il43zy5aipncbfh1kgnkq5ackk779" + } + }, { "ename": "run-stuff", "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", @@ -95454,11 +95766,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220108, - 1844 + 20220203, + 1832 ], - "commit": "49ff6cceba7a546595c5b0cc18c7501b22e0c9e9", - "sha256": "1cj59mwrp4igfcrsya3nlrgp465r0gmnyzglmgsg24pyna3rycwz" + "commit": "832980d96a3b7e985bc8bfb1dc2bd7e9599c6312", + "sha256": "1dlg6526zfpflmvsq12fql0ri6l8mchs0bi8malx9v8rxn84k3bp" }, "stable": { "version": [ @@ -95501,8 +95813,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220116, - 2233 + 20220204, + 1613 ], "deps": [ "dash", @@ -95516,13 +95828,13 @@ "spinner", "xterm-color" ], - "commit": "f92e9cdfa44c7948417093d6f275a2a8241cae8f", - "sha256": "00i500k8cjc4vskvqlcn095vidyklc61np2i8nh8bazqh1k9d15g" + "commit": "7261c78004317628d2fdaf425a4c1a1bdb687605", + "sha256": "0fzkpli0l8ir4wa4hibkhgia2gxc5pb56zr7mpfyd736j3016acl" }, "stable": { "version": [ 2, - 5 + 6 ], "deps": [ "dash", @@ -95536,8 +95848,8 @@ "spinner", "xterm-color" ], - "commit": "513845b99a61e1137049a2157a122bcfd8a13c2c", - "sha256": "1jx8gzcm9ka2chpq51jx4mfa12wqrj2dsrpxwylfcb9qkqjncbn5" + "commit": "4aca1c28676fa53d5784b7aee3565f26d43751e9", + "sha256": "0lnymi6nxn5dafm8q0av07dcjwrqxd3gm4hj1pi26kw62aw0ws24" } }, { @@ -96026,8 +96338,8 @@ 20200830, 301 ], - "commit": "51e17a6fecad2dd35e02518934597b3b43273a3f", - "sha256": "1aclnsa72pazi1xagymgpfc998sring4xaflg3ha6f9lbdn2qkqq" + "commit": "a83597a7e67a2aa05a0a8c0c9af0c70c61a263e2", + "sha256": "18nxc94gii1hq5m9p9am00mfc2yprhwdrd9d3hs84868lwv7rack" } }, { @@ -96156,8 +96468,8 @@ 20211020, 420 ], - "commit": "d96c462e7f340f142ce3c5ffd31fa267223fd854", - "sha256": "0w8xlnpawkq580gc6cvxzln29x9v5g05ab7i8wwg1r5jhw9bjvgs" + "commit": "aac29628d4eea2d6ec0bfda39503c1f71a379bc9", + "sha256": "0pa054hanclapkj73wwwwwjmk2b3p36w2p44d1fz3w3lfjkf852v" } }, { @@ -96413,11 +96725,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20220117, - 606 + 20220126, + 2331 ], - "commit": "556e9a7a8119e24503f54b25f5c2a8084752d64d", - "sha256": "086p847snpz62b6g7k8sz7izfrbkza1g178q3lj4vysdg8w1fhf7" + "commit": "1e9e09f0ccadf805e9bb4dbd1050944f82c5ed0f", + "sha256": "0n472jp8j1al7c4cf1k8l5my1hzln68ix5gl8vz8kpaxhlh0s8p0" } }, { @@ -96842,11 +97154,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20220119, - 50 + 20220123, + 27 ], - "commit": "823eec0246388e8dcf5581533dac96c2626d51f3", - "sha256": "1h6a5mvfcyz3x0s15g4mi503fg3mqbwajns9y20148gydvfjbxjl" + "commit": "26908ea0e88727f5eb6c5ebae7f9fbbe117ef25f", + "sha256": "0fd7nq7nxl9gjb37r14z5rdrk97p9z80z91i9744c1p6x714w702" }, "stable": { "version": [ @@ -97050,15 +97362,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20211116, - 326 + 20220202, + 1359 ], "deps": [ "dash", "edit-indirect" ], - "commit": "59c4e3718943dbe8d14bdbba5de24fe2c80f0b56", - "sha256": "06wx9nz688x15rz1mcl3jcbaa3pn6xls7my2srn5id1rdbwyl52x" + "commit": "a2cea75f7b66a02e28334291fc6fb371cd5741b1", + "sha256": "133r9s2zbc1k2jd9ajxbxss0iy9xsjphxzwfhfvvay8jqy0r71gi" }, "stable": { "version": [ @@ -98589,14 +98901,14 @@ "repo": "jorenvo/simple-mpc", "unstable": { "version": [ - 20200523, - 1804 + 20220204, + 2207 ], "deps": [ "s" ], - "commit": "ce731fa390b7e4edfc461a9cfb4443c1aab4b011", - "sha256": "14fb52r5fzdcqqbh5kkajaz43iqq8g64g0rsswwwv6g1j23y93k3" + "commit": "265ee01f6c7c6c44f103b740c37df14f4c1fdb16", + "sha256": "14z8sqs094xq1n3hynglh1bj38kmzwfd9h66nxp95wdxanzlzghz" } }, { @@ -99048,28 +99360,27 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220115, - 2013 + 20220204, + 1357 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "fad4f25ff0eb7e2df2ab587976f569d8694f641d", - "sha256": "0p5c54c1l5a4k41ji92ykcl9mlggcv0f7rlf5830v4967qfgww2r" + "commit": "2080537746ba808b9c1683a280e803e65f196a9c", + "sha256": "0shi2zazr44bnc1j985wvx2248gl2gp20v1kyb2mzsydw3w462vw" }, "stable": { "version": [ 2, - 26, - 1 + 27 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "15cf0609d30255405957bf0612fd6291fea438bc", - "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" + "commit": "cf30941e5858e93eb91574ad91499075222a447b", + "sha256": "0wrq7s39lwca9wi01fj0wa2z6n0yyrv17c471kdkxxqppl4whi8m" } }, { @@ -99288,11 +99599,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20211222, - 1234 + 20220131, + 1646 ], - "commit": "2e00c3bd4bdf6658f258cc78b3254f0ec24591e5", - "sha256": "0qlc5ny85dd03i0fj10ypjxkziih23k031m1wlvhjsdjg2ibs0f7" + "commit": "8074da031ed9d677abc77fb3dab4bb42c6be76c3", + "sha256": "0yp1fzm7kiqd7316v6ndgildf81mslylnmqhx1xn8g8hsp2fl2l6" } }, { @@ -99787,15 +100098,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20211101, - 1101 + 20220204, + 1134 ], "deps": [ "cl-lib", "dash" ], - "commit": "f59a40d54f35299007c396bd667ce3e9ec4714e3", - "sha256": "0n0c2knva2c6ajdhqglr2yzhr53sgqr4bscsd1lwmwajgb0iyrw3" + "commit": "37f77bf2e2199be9fe27e981317b02cfd0e8c70e", + "sha256": "095aqr4mz6yx8xa2gr7k5nf6a82qxdrjh8qv47hfhbc3832gy8jk" }, "stable": { "version": [ @@ -100299,15 +100610,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210826, - 832 + 20220206, + 815 ], "deps": [ "dash", "s" ], - "commit": "4d921b6e9c98fa208578b2b409e627580d1ab8c2", - "sha256": "0bh9brzqsvm6dj961smp4592bgjrhhq600qbqbgps8rnbbcjnl3r" + "commit": "f629aa45bbfbbde99390e7d4791f14b649d79f35", + "sha256": "070nbk9a68ww1mrb4xpda59s3wlcxvz0x2krc0f1g546vj3drakx" } }, { @@ -100726,11 +101037,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20211025, - 1535 + 20220127, + 1004 ], - "commit": "a111e7169405778d95f7a1e61a7d197ca1217edf", - "sha256": "130sz27mq3w0svv114qnwqjdbvrnljprab7v0acp5zwj9gqgwkk5" + "commit": "2db1859743fe9fc58eab4e6f6c1e37825ad7b69c", + "sha256": "0vikil31dwpmnd5iv3iwb8wrnny2xibydvc2mlgsvxjqjw7d40ng" }, "stable": { "version": [ @@ -101089,11 +101400,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20220114, - 1455 + 20220128, + 1519 ], - "commit": "45ba182eabeaf80b7c6c4bec192d8380023ab0d5", - "sha256": "0crwjad4ccnb76pwlg03yj5rmf1rhijk1sllij9n054in6ichk02" + "commit": "a09347a354a14f5407e99fa730e01345d03e03fd", + "sha256": "0nnc6pk5jjx4yhadcph9q9aqb0ks8gs9ybhd32wm32653518hmv4" }, "stable": { "version": [ @@ -101217,11 +101528,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20211202, - 1925 + 20220204, + 53 ], - "commit": "4d1ce0ca8a4c84667301b3e347fe594989c25e60", - "sha256": "0fmaxsx6yn3j9i4k6kzap0s2fc5899j623sz9v71g5pjg4pfwmyy" + "commit": "38cfd66c3044f26cd1c7d6e599bc73f9b9fc0760", + "sha256": "1s5hi5kgq6m2ms9k2f0an3h0mf1lm9s5yriprkp7kmr4d4rk3c6s" } }, { @@ -101831,11 +102142,11 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20200916, - 132 + 20220202, + 728 ], - "commit": "95abc25cc67d652ce2ba79907224e581aef62e93", - "sha256": "1kx2ik7k0ads71r2xq4c8jkk460m44prggiiskj1g88yxx0rnqkj" + "commit": "88dfeae8f9612cb3564a7393aa8a5c867aacbaf8", + "sha256": "0sj1fsgcgfzz6dfpmp8r5gmdwpbdzpk5g5lm8j7c3nqj6wqgg7g6" } }, { @@ -101931,11 +102242,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220108, - 212 + 20220202, + 2241 ], - "commit": "a47c0df8b5df36f5a8ca41f3f5dc60e1fbd09924", - "sha256": "1if3xyma26vzsivpvyf9vxsy0yv64vbl1kkd5rvnx48ly4axqk3a" + "commit": "48318da86b2b214106c3e6248c7865407aeebcd4", + "sha256": "111h20gp0ns2c4cj9rh2bqlp4mksv1w4ybli64fnm300jci1p2lg" }, "stable": { "version": [ @@ -102063,11 +102374,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20210626, - 2228 + 20220126, + 658 ], - "commit": "7c5fe8af2d62d8f6d32ebe2d3bfc53051a9432d1", - "sha256": "1ca1ai742g2901pni08clk37h1ls4n65pzxpsfzsxnr7i46yh989" + "commit": "9311f9b4f8d25ce54fb7da9bf59d955fed366a4d", + "sha256": "1wgm4q46nja71grwbdnacnlazj3cgfr6r1glpkyx8y3dn9amdhip" }, "stable": { "version": [ @@ -102359,16 +102670,16 @@ 20200606, 1308 ], - "commit": "8254ffb2eee53f97e9c6210078db55c15340ead3", - "sha256": "1saj40x6gj3w261g7792h92m2wy9fa7klf4s8xya778j3yvy62n1" + "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5", + "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "262b2fc5b533f6f609c43a6f543c9d0d185b8f55", - "sha256": "0g0jnry8y858dl3z5w4zd02s0lq9qvha848xb8i1xpsx8xh8plf9" + "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5", + "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf" } }, { @@ -102771,11 +103082,11 @@ "repo": "cryon/subatomic-theme", "unstable": { "version": [ - 20190607, - 1022 + 20220128, + 1615 ], - "commit": "a13cdac97a6d0488b13bc36d4c2f4d4102ff6a31", - "sha256": "1l7yvplvjfcv1d1ij0inijm47nx42d3r00w43xjqnyhk9rrvazh1" + "commit": "9d0ac6aa5272d0285965a48505eb35658c5472b0", + "sha256": "0fs1y53b025fwd690dl5iipsh3nz5g0jvj8ny1az614697yx90xw" }, "stable": { "version": [ @@ -103854,8 +104165,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20220112, - 1901 + 20220127, + 144 ], "deps": [ "evil", @@ -103867,8 +104178,8 @@ "seq", "undo-tree" ], - "commit": "d0fb945e5978b1ee2fe164b6bb30900969762193", - "sha256": "0c2iw3p1jw7hk8dxni7c4b3l23x8x406k94xgaj7h7mk6y36p0x0" + "commit": "f04d372646d13c3c4ee1aae1230815e8e4d18280", + "sha256": "0avpjfpnmx3az3ahxgzd4ki4hm2n5xsdsjcki51b41vlrkwmijlk" }, "stable": { "version": [ @@ -104078,6 +104389,24 @@ "sha256": "12jk28jbkq1pcpgsbknk8xzzghjh2dhwb54kag2hynldn4qgfkrz" } }, + { + "ename": "syntree", + "commit": "765e71a13aab2829d02e9567654aaf9a3de64098", + "sha256": "0ck61zjqqv1yqlvmq165avhn9ck3x1a7myldmqpy3q7gg4qcz71z", + "fetcher": "github", + "repo": "enricoflor/syntree", + "unstable": { + "version": [ + 20220122, + 2341 + ], + "deps": [ + "transient" + ], + "commit": "45d010b071c32cab4a3a5d336d6c01cde49657f8", + "sha256": "0dlq1z4d1sfhzv14y8b3xk9ixjsjd9wl66nbd18aqkm86rx0320f" + } + }, { "ename": "sysctl", "commit": "72ab5a8c1bc5901477b888a1abf8835a5af7cb41", @@ -104653,11 +104982,11 @@ "repo": "kanchoku/tc", "unstable": { "version": [ - 20201022, - 1646 + 20220122, + 1443 ], - "commit": "5c6bbb0ff08e5d81e905198156ae5600df7ff7ab", - "sha256": "0n78aiwdkb7k8hj1cxg2gawlgq228vi2v0fyjicry6l4i1p4d1ds" + "commit": "d0adf22f5aed4d9608778108b60a06c9ea58b289", + "sha256": "19wbpa06bfydsgik28c8j9irvsax4drv9hy5ci3ph7sgwnq692nv" } }, { @@ -104731,28 +105060,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220119, - 6 + 20220206, + 849 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "5739794d2d0c8a4e7b77c2e37a097e19f80ac9f0", - "sha256": "1am0b2bjjkw7zd0yq39v015a08dcbk43j4d4h8y2q8hj53ryfk5a" + "commit": "13077c5e5eaa5621fbb68838ca3c15238faf73e0", + "sha256": "0z5h4g2c5ldfdsxzsiyj1dfwrk684vwhb7vx25mjvv01591mgq5c" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "7b1107bc11285ef3ed182f638980fba6d7ab2508", - "sha256": "1f9asfgjxq73h203cii86irlz4zg29xkr9f5sl59l70bhzchfyx9" + "commit": "4c981d6d65d612948227bde6ae8b7d601e0a190f", + "sha256": "0f600wd1wz2mfk6cbaxpd6f1sdpbkq5n4d1km5nzgynbjpr2is91" } }, { @@ -104852,11 +105181,11 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220116, - 2206 + 20220203, + 2002 ], - "commit": "17f3020b8ecd7fdd16b34aeb11c91a620ac42c3a", - "sha256": "0ddjkxxg6f998p87b7dpdmxyj14x542p455321y4kra420n0lmzi" + "commit": "6ca08f66585dee09d1e48ee600cbaab579720488", + "sha256": "09l7scif2sc0m9ral5nzv4rf02pwsk7z5822y77klj36zsrxigdc" }, "stable": { "version": [ @@ -105693,11 +106022,11 @@ "repo": "GongYiLiao/theme-anchor", "unstable": { "version": [ - 20211224, - 2042 + 20220204, + 321 ], - "commit": "aad9c0c0c888325cf6f9bb2310677d667b364f21", - "sha256": "1cpr11kasmskwx3b5v5x5j6mndlz0dm854p4d793m3m9fwdk3303" + "commit": "c6f715d4ccd30e83922e39cab856578ce19224bb", + "sha256": "1k6vb1r1lzksnki4rxjjcbvcpc59q76vhc3dq7kmi5d20fdgrm9v" } }, { @@ -105875,18 +106204,18 @@ 20200212, 1903 ], - "commit": "68c1c9216dfed14d37cb84f62e526ad817349cd3", - "sha256": "0xvk3m3asiy648zxsr1zdvar7dzxa3xmiw8sprix32djvfrwcllk" + "commit": "2f2a408f31d3f3e87415865676479091fea1749c", + "sha256": "0mw3lhw0g7b5abaq57q97376bpn4n6q7pb9yazmr8csv6apjk0xd" }, "stable": { "version": [ 2022, 1, - 17, + 31, 0 ], - "commit": "ef52e26081223b80bdc2d8bfadc628c4dead17b6", - "sha256": "1rpimfpgxhbxri6zh1n5m218ln20xkn9y3qmjqahr78rxy9hsbni" + "commit": "a0a3b22d57d9ec2ee61e37c882467f5580749b1f", + "sha256": "18gp39nfw9lzg7d399sr2llaf87yg8rwwf4palncz7spvl0ikyfr" } }, { @@ -106191,19 +106520,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220119, - 2057 + 20220126, + 2034 ], - "commit": "8e28f7ba737a53cb304a4d4c5317f36d2273cc60", - "sha256": "135igyyhl1f4kmlcr05x6srwrx98v6m6750migi7dsmga00ragpg" + "commit": "f0e8cee8caef2f3a411cbf276940dfacfc4d4158", + "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1" }, "stable": { "version": [ 1, - 8 + 9 ], - "commit": "3da96d529c09dc1000de425f937380895ab9efa6", - "sha256": "0k2l15lkk3b5y7qfzhjid8l1clam5j9nhm635a1qmhjgcdln18x3" + "commit": "d623d3fba1a3a50bd677b4b4a22b1e13bdf86e68", + "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1" } }, { @@ -106422,16 +106751,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20210922, - 2254 + 20220126, + 1813 ], "deps": [ "dash", "org", "transient" ], - "commit": "3662c323f02e89d48c206103b43a185b930220e7", - "sha256": "02wwsaj7vc5vs8xij6kzgqqdwigy0qcvridbp8zsjmhy2rgq4w3w" + "commit": "585cd45b2c1442888a465e4e9d538eeb1a7b3c0a", + "sha256": "1m7pxf54l7qazh7fj2b6b0z9h2zfaxspxlx7lyxrfncdmp1bcswz" } }, { @@ -106442,11 +106771,11 @@ "repo": "rpdillon/todotxt.el", "unstable": { "version": [ - 20200530, - 2337 + 20220204, + 1903 ], - "commit": "b51f7fa1357d2cbc1b72b10d15f8c6f009ce5a46", - "sha256": "1asf33na834mc4ppvfyjxa70v4r80dnq641si5kd86gjfzjjjfmi" + "commit": "ddb25fb931b4bbc1af14c4c712d412af454794c4", + "sha256": "1mb7cp0czhfzq0wb69lcihblr77f4fvq7ffcl64kkddnlp1ychr3" } }, { @@ -106553,11 +106882,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220118, - 2058 + 20220202, + 1805 ], - "commit": "763c141ee79d67d8f57bfe8960f4691a357067c6", - "sha256": "1dknbml53m2n7ajm36dj118lxbky9lhlv4yj50dhrbxffgwrjmdd" + "commit": "5df42d3f5569d9005f9180337aa88befaf77c491", + "sha256": "120lh5c01wbv92zljw8jhx16cdjp154bjas8k0bi461x1xa5mzl5" } }, { @@ -107014,11 +107343,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220117, - 1122 + 20220130, + 1941 ], - "commit": "a19faa1c71428e1f5b2bb548b966e9f9b1a9eca2", - "sha256": "07vn0j3vk62w8rai8lwr7i16qqnx4zvzh0li20bfzgyi81za6md8" + "commit": "440a341831398b825dc2288a10821cf7be1999ca", + "sha256": "0vaaxjkk6rllypfspvi2gb0kcfkgh3sipg6nmfwaz62y1kviwc1s" }, "stable": { "version": [ @@ -107258,8 +107587,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220120, - 122 + 20220129, + 448 ], "deps": [ "dash", @@ -107269,8 +107598,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "ad5d3c5060d8cf43d2053c2bc74b0beda1e664a1", - "sha256": "0az5p42vhpbrqhgavfk3jyp1izillvqsik9rpwh5g48c3qm42bjh" + "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8", + "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y" } }, { @@ -107296,26 +107625,26 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20211211, - 1220 + 20220129, + 1630 ], "deps": [ "tsc" ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", + "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" }, "stable": { "version": [ 0, - 16, - 1 + 17, + 0 ], "deps": [ "tsc" ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", + "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" } }, { @@ -107357,26 +107686,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20211228, - 1446 + 20220129, + 1702 ], "deps": [ "tree-sitter" ], - "commit": "3c0c82f9fb0a796f5ebd7e1e4c89f13d5ab6ef58", - "sha256": "0jijx5l4wx03wnq5v3qlfw3kwzssiv5glqxz9clr827qdzgpxnlb" + "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc", + "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18" }, "stable": { "version": [ 0, - 10, - 14 + 11, + 0 ], "deps": [ "tree-sitter" ], - "commit": "53fb0fb0c00f622a4661721ce04b8b5f73eb80f0", - "sha256": "1xv3pfbddyky68bc3ckxz5gji54ysl1frazlw6pn74xmr62y99xq" + "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc", + "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18" } }, { @@ -107423,8 +107752,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220119, - 1620 + 20220129, + 1122 ], "deps": [ "ace-window", @@ -107436,8 +107765,8 @@ "pfuture", "s" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107467,15 +107796,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211107, - 1818 + 20220124, + 1914 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107506,8 +107835,8 @@ "evil", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107537,8 +107866,8 @@ "deps": [ "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107569,8 +107898,8 @@ "pfuture", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107603,8 +107932,8 @@ "persp-mode", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107637,8 +107966,8 @@ "perspective", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107670,8 +107999,8 @@ "projectile", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", + "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" }, "stable": { "version": [ @@ -107927,20 +108256,20 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20211211, - 1220 + 20220129, + 1630 ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", + "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" }, "stable": { "version": [ 0, - 16, - 1 + 17, + 0 ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", + "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" } }, { @@ -108418,11 +108747,11 @@ "repo": "md-arif-shaikh/tzc", "unstable": { "version": [ - 20220118, - 557 + 20220126, + 604 ], - "commit": "d1f08fff5d4f9c2584a3b405464c6a92000f62b3", - "sha256": "108920snw6i0lbdy7ky336n5lkf44bv1cfn0an12amfa3jb5w1wg" + "commit": "3af821d2125a67786f93d50d532a71f681f381cc", + "sha256": "0zd0g5qdm4w0jj37n0ijcknz74xgb3f9s0w72qz8zapf5n8q9mbp" } }, { @@ -109243,6 +109572,30 @@ "sha256": "0fgipv93x47cvyww07cqx8xa95jz36y6fy5rmaq40jnnmdkgq862" } }, + { + "ename": "unmodified-buffer", + "commit": "0a8d1d4a74ceed49d0506c19715e1dcf33ba90bd", + "sha256": "105vgslgjfwhdvmmwxrz32mz8rpz74gvxkylvvb2jrfddfx575hq", + "fetcher": "github", + "repo": "arthurcgusmao/unmodified-buffer", + "unstable": { + "version": [ + 20220129, + 2013 + ], + "commit": "9095a3f870aa570804a11d75aba0952294199715", + "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "9095a3f870aa570804a11d75aba0952294199715", + "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8" + } + }, { "ename": "unobtrusive-magit-theme", "commit": "6dd57561738c2dc3ed6dc03f57d2487ce949f035", @@ -111066,11 +111419,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220119, - 1100 + 20220201, + 1229 ], - "commit": "be9e32f04ea7f190c57d18e59eb4fdd53e89e542", - "sha256": "0bc5n14xzdlwyxx2h4pw4ffzb16jzsmm4a3pr99i5di8gr57d5rh" + "commit": "e292c57d53823038733105d22f576a83b5dfdaae", + "sha256": "0687q8m5a3rqwdjgr898gz4nckyi5awksz5z6m6qhga3zmhcmqkw" }, "stable": { "version": [ @@ -111089,11 +111442,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220119, - 1101 + 20220201, + 1228 ], - "commit": "0198d598657ce02c95a977eb27b681a5cc7604a7", - "sha256": "1zvhiz45nnzh5k1pki4j6mx5vr3nyqp7q5vb5816f646j8kf7lby" + "commit": "b99fdcfdb5259b2d831302f38288bdbb3a21ed19", + "sha256": "09nbdyw4kjbfpyswjwn0rdffpcmcnl5y32vrncaxwx44rsg3y1cr" }, "stable": { "version": [ @@ -111181,14 +111534,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210902, - 828 + 20220202, + 1722 ], "deps": [ "vterm" ], - "commit": "ea0bfeaa200d9ed02b51bbbd83222657b02637e7", - "sha256": "0bwgzpf2wyzdj9smwys06zx4yha72pw50wzdh4zld45ph40pb6qw" + "commit": "2a6861ef6af91dad4be082139214a30116b50acf", + "sha256": "19rr03fqicykw73wbpw2nzz0b0dc62qpqh7gddmgz8lv39d6xmfb" } }, { @@ -111309,16 +111662,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20211118, - 734 + 20220204, + 936 ], "deps": [ "org", "org-roam", "s" ], - "commit": "398ca17f83ea59f54f61898fefdb55332cd3ba46", - "sha256": "0qa49s0nhqbh9bmxi1zglnx3yajqcdx8j7yiy23lxbya2fpl557i" + "commit": "38efd2e08345d02f64b768629e26fa4e4e7beb85", + "sha256": "1n1fhy9456d10isddfp29dqnjccs6hs4ymdxcs05c55sw2vgjc1l" }, "stable": { "version": [ @@ -111343,14 +111696,14 @@ "repo": "embed-me/vunit-mode", "unstable": { "version": [ - 20220118, - 1929 + 20220121, + 1644 ], "deps": [ "hydra" ], - "commit": "7f36752161b1a172ff74b3fd9f1289f89471e002", - "sha256": "1na722d9mgcmsqf0pdwnr7wy4zl8d4f3yj1ckpi4rmh5mj0g1blp" + "commit": "13311cc9fba6e73cf859dd5defefd330cc41b489", + "sha256": "0k7xj2a0xdc4g0bi1fxmwy1bl1ha9z68f7l1qc296r8q3hq8ghi9" } }, { @@ -112727,11 +113080,11 @@ "repo": "progfolio/wikinfo", "unstable": { "version": [ - 20210711, - 249 + 20220121, + 2017 ], - "commit": "c75c588a3ebf4cf155c33ca018c56ac914092860", - "sha256": "0vrbqaby2q34350mkpykxqw5kfagrdsz12l3fbmdpqvwh1vhjwdm" + "commit": "b149228023d4abb29555ce69877df521887cafe9", + "sha256": "153jmq14x4bim9v5xhd4zd100bqy2amj62sqjlmxf60pmd6xqc69" } }, { @@ -113117,11 +113470,11 @@ "url": "https://hg.sr.ht/~arnebab/wisp", "unstable": { "version": [ - 20210405, - 1410 + 20220204, + 436 ], - "commit": "c15e50edbfadf6cc46b8ed22a13438ecdb6757ee", - "sha256": "0jg9r9ykad05ng1y12mcva52bi8apid9vxaxxww262hgl647cl2v" + "commit": "08b3d086d1f1ac77a7d14f763063e75c29e600c8", + "sha256": "08zh4fdmdpi3wd2ysfv3awbq9lfvscanz3478k4fliw6igidk3qa" } }, { @@ -113162,11 +113515,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220107, - 1056 + 20220130, + 1942 ], - "commit": "a4e720b12a0946a271a274bbe0b45ae07f83520b", - "sha256": "06a66119rp5vfqdzqk10df3qyh9jvjl6j3pqm03jy0b110v2bfa8" + "commit": "edf4445edb613c8355c45209264f691268116f0f", + "sha256": "1rrzn34cqi2vf5vp4ip15qcprbm9y7jw9kh2yxkw82mxm8gh7m3h" }, "stable": { "version": [ @@ -113405,6 +113758,21 @@ "sha256": "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc" } }, + { + "ename": "wordel", + "commit": "a0186cd951d0d4a6eb5b1f872d7114e24ce479a2", + "sha256": "0xdj3fqkq1cixmr7nnzl0ch4zl9mpd0x1y8svdcqz0a1ncg6pg9g", + "fetcher": "github", + "repo": "progfolio/wordel", + "unstable": { + "version": [ + 20220124, + 251 + ], + "commit": "c2f0d61646d2744167661e5ce60fae679d50c850", + "sha256": "12b42qcmc8k15n2zdvl264sz9w697f6dm9vynyw7gk3g16rydbhj" + } + }, { "ename": "wordgen", "commit": "5cfdc64a9aa79575dad8057c4cd747d2cdd460aa", @@ -114750,11 +115118,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20210811, - 1934 + 20220201, + 2104 ], - "commit": "6562d021cfc76b88a7b39b49adc44fcad835bd3f", - "sha256": "1xh36s2vy521hni9993ajnqv3apinqsiq09yfhfkz4skw22p891g" + "commit": "927e6d26956ac7219b8a69d641acf486854fba16", + "sha256": "17zz614fy7r2azgqfwiyl9gr9y3fxls65b0nahdb5dlsr9gsjiw5" }, "stable": { "version": [ @@ -115460,11 +115828,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220115, - 1539 + 20220130, + 1555 ], - "commit": "e519713330fd2eebf9ee9d3ec695a32b567c587d", - "sha256": "1z26w72g4ckfa7gid6rb89fv08k76aqk5n8474zqs3sagrjjgqbr" + "commit": "50e9bb9bcd62edf29d29a29b2b9b6b845db68174", + "sha256": "0yp0szhncygbb5cl7ai0296fiiz401r1wf7xm9kix3h2211zm5id" }, "stable": { "version": [ @@ -115783,6 +116151,21 @@ "sha256": "1vx4j9n5q4gmc63lk1l4gbz5j5qn2423cyfibqcbynkkbwgas11z" } }, + { + "ename": "zk", + "commit": "4ae4dee35fd931915f6162a8c2f46df21dd07c09", + "sha256": "0b8kcz415c5vl6cyw2ygi8znd6sq449rsba12znvlgc9gg3rhx05", + "fetcher": "github", + "repo": "localauthor/zk", + "unstable": { + "version": [ + 20220205, + 2000 + ], + "commit": "44b59d15e4ec491129104b6d1a1a0ed8bdff645f", + "sha256": "1fgcdip4jn8j5668ws0pxma8hibsnsamk1gq0fb4mcb24mczxvc3" + } + }, { "ename": "zlc", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", diff --git a/third_party/nixpkgs/pkgs/applications/editors/heme/default.nix b/third_party/nixpkgs/pkgs/applications/editors/heme/default.nix deleted file mode 100644 index 7d1830c842..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/heme/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "heme"; - version = "0.4.2"; - src = fetchurl { - url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; - sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v"; - }; - postPatch = '' - substituteInPlace Makefile \ - --replace "/usr/local" "$out" \ - --replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \ - --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.out}/lib " \ - --replace "-lcurses" "-lncurses" - ''; - buildInputs = [ ncurses ]; - preBuild = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 - ''; - meta = with lib; { - description = "Portable and fast console hex editor for unix operating systems"; - homepage = "http://heme.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index b3145f342c..709a9b4251 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -82,10 +82,10 @@ with stdenv; lib.makeOverridable mkDerivation (rec { libnotify ] ++ extraLdPath)}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ - --set JDK_HOME "$jdk" \ + --set-default JDK_HOME "$jdk" \ + --set-default ANDROID_JAVA_HOME "$jdk" \ + --set-default JAVA_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ - --set ANDROID_JAVA_HOME "$jdk" \ - --set JAVA_HOME "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$item/share/applications" $out/share diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 4922322f55..3f07b10a32 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -264,12 +264,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.3.3"; /* updated by script */ + version = "2021.3.4"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0wbr7hjbj9zvxn4j7nrp7sdzjk78hcg7ssz430y35x9isfiqv5py"; /* updated by script */ + sha256 = "09dkxj5vn99gkgc1yd18w7gqkw2vzci0z9q2fcih0zn7lvqp0im3"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -277,12 +277,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.3.2"; /* updated by script */ + version = "2021.3.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0csc52wwqggdxc61qkmbs84hdvyj3x60rcv5jrxcwp3bjq94kskw"; /* updated by script */ + sha256 = "18z4mvxhds5fgdwcfywc4pj8s9ifvsknhradgzmxsvji0fbp0awx"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -290,12 +290,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "19xxbjcn17n3fk1vdb31nihn9cv5q65wfxdan6dx7z0wq5c4x9zd"; /* updated by script */ + sha256 = "1j889b2r950bl9wiqq1z8v8s2qicidfcdar300cy666i8rc25qlr"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -303,12 +303,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0ys8f2h0qaj8s9ga94hg73vah552a6al4r1ypdp05f7j1m7lzajf"; /* updated by script */ + sha256 = "0w36qnqgkvw6j1ks09h515237bhqfaixrimzg2r494ic98amvkps"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -343,12 +343,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1xd88rd1w3ghkm6jq8ilhhjy972qfm57si581rnsjpz65rj6xpgm"; /* updated by script */ + sha256 = "1s36basydp7cxgbgdapjhkslx0x9vv3639xhm84ny76hf7s03bpi"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -356,12 +356,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0639mzjh1hw158gmf4qqld03371z60k3xyca21l1pnv3551svd6d"; /* updated by script */ + sha256 = "0rwykngqgby05mh47kls8wzi68gfka2z04k6kdmsxwn1hhx5gnbb"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -369,12 +369,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.3.2"; /* updated by script */ + version = "2021.3.3"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0arnh9wlw874jqlgad00q0nf1kjp7pvb4xixwrb6v1l9fbr9nsan"; /* updated by script */ + sha256 = "13q6hk5l3fqmz818z5wj014jd5iglpdcpi8zlpgaim1jg5fpvi8x"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -382,12 +382,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1xax3738myxjzm0p8zm8aaa2nw0336h80nrm9dqby2j7dass2jnm"; /* updated by script */ + sha256 = "18ny40zl9hgkynkc5yyy2xqngl9diifh2gqrfnz7rfq14kp10xb9"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix index 0faf03659c..2280c6d9e6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Jonathan's Own Version or Emacs"; + description = "Jonathan's Own Version of Emacs"; homepage = "https://github.com/jonmacs/jove"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix index a468e34393..b19c3f531b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lite-xl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-yMdfJ8qE2Tv+CtvbPN6todzY/pDrYo+vaBeppuUt5F4="; + sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix b/third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix deleted file mode 100644 index 12b66370d5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchurl -, autoconf, automake, pkg-config, shared-mime-info, intltool -, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip -, dotnetPackages -}: - -stdenv.mkDerivation rec { - version = "5.9.4.5"; - revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b"; - pname = "monodevelop"; - - src = fetchurl { - url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2"; - sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; - }; - - nunit2510 = fetchurl { - url = "https://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip"; - sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; - }; - - postPatch = '' - # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19 - - # cecil needs NUnit 2.5.10 - this is also missing from the tar - unzip -j ${nunit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\* - - # the tar doesn't include the nuget binary, so grab it from github and copy it - # into the right place - cp -vfR "$(dirname $(pkg-config NuGet.Core --variable=Libraries))"/* external/nuget-binary/ - ''; - - # Revert this commit which broke the ability to use pkg-config to locate dlls - patchFlags = [ "-p2" ]; - patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ - autoconf automake shared-mime-info intltool - mono gtk-sharp-2_0 gnome-sharp - dotnetPackages.NUnit - dotnetPackages.NUnitRunners - dotnetPackages.Nuget - ]; - - preConfigure = "patchShebangs ./configure"; - - preBuild = '' - cat > ./buildinfo < export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX - > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH - > - EOF - done - - # Without this, you get a missing DLL error any time you install an addin.. - ln -sv `pkg-config nunit.core --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.core.interfaces --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.framework --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.util --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ''; - - dontStrip = true; - - meta = with lib; { - platforms = platforms.linux; - maintainers = with maintainers; [ obadz ]; - broken = true; # 2018-09-21, build has failed since 2018-03-08 - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/third_party/nixpkgs/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch deleted file mode 100644 index 969aad33ec..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -index 02d3a01..c6daaad 100644 ---- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -@@ -452,34 +452,6 @@ - - PreserveNewest - -- -- System.Web.Mvc.dll -- PreserveNewest -- -- -- System.Web.Razor.dll -- PreserveNewest -- -- -- System.Web.Helpers.dll -- PreserveNewest -- -- -- System.Web.WebPages.Deployment.dll -- PreserveNewest -- -- -- System.Web.WebPages.dll -- PreserveNewest -- -- -- System.Web.WebPages.Razor.dll -- PreserveNewest -- -- -- Microsoft.Web.Infrastructure.dll -- PreserveNewest -- - - - -diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -index eab7c32..4a75311 100644 ---- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -@@ -1,13 +1,6 @@ - - - -- -- -- -- -- -- -- - - - diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix index c2a696cd42..2c0a50bfed 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix @@ -7,6 +7,7 @@ , makeWrapper , pkg-config , python2 +, python3 , openssl , SDL2 , fontconfig @@ -24,16 +25,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "unstable-2021-10-09"; + version = "unstable-2022-02-04"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; - rev = "7f76ad4764197ba75bb9263d25b265d801563ccf"; - sha256 = "sha256-kcP0WSk3quTaWCGQYN4zYlDQ9jhx/Vu6AamSLGFszwQ="; + rev = "92bc1725f1733547eb0ae25b740425f03f358c2a"; + sha256 = "sha256-bKTteaj6gddp0NuV5Y0pfHotezU9Hmb136xOC9zkJ/M="; }; - cargoSha256 = "sha256-TQEhz9FtvIb/6Qtyz018dPle0+nub1oMZMFtKAqYcoI="; + cargoSha256 = "sha256-TaZN49ou6bf1vW0mEsmaItp1c73d0M826MMrSGXpnGE="; SKIA_SOURCE_DIR = let @@ -41,8 +42,8 @@ rustPlatform.buildRustPackage rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m91-0.39.4"; - sha256 = "sha256-ovlR1vEZaQqawwth/UYVUSjFu+kTsywRpRClBaE1CEA="; + rev = "m93-0.42.0"; + sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ="; }; # The externals for skia are taken from skia/DEPS externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); @@ -72,6 +73,7 @@ rustPlatform.buildRustPackage rec { pkg-config makeWrapper python2 # skia-bindings + python3 # rust-xcb llvmPackages.clang # skia ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json index 3c0de3008d..d0553830a6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -1,18 +1,18 @@ { "expat": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb", - "sha256": "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI=" + "rev": "a28238bdeebc087071777001245df1876a11f5ee", + "sha256": "sha256-TSaVtKEk7J0fckDvpI6/U5Aq7d37nsixp0Ft7sMHi8w=" }, "libjpeg-turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "64fc43d52351ed52143208ce6a656c03db56462b", - "sha256": "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig=" + "rev": "24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20", + "sha256": "sha256-bhbUnA36rKYLJSLpElmXJqccXQDjjbMcNMsVM4Eekrs=" }, "icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "dbd3825b31041d782c5b504c59dcfb5ac7dda08c", - "sha256": "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE=" + "rev": "a0718d4f121727e30b8d52c7a189ebf5ab52421f", + "sha256": "sha256-BI3f/gf9GNDvSfXWeRHKBvznSz4mjXY8rM24kK7QvOM=" }, "zlib": { "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix index cdfacaf92e..31c43fb19a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -13,17 +13,20 @@ , nbdSupport ? !stdenv.isDarwin, libnbd , textStylingSupport ? true , dejagnu + +# update script only +, writeScript }: let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.4"; + version = "2.0"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-zgVN8pVgySEjATJwPuRJ/hMLbiWrA6psx5a7QBUGqiQ="; + sha256 = "sha256-W4Ir8+ESyftcDJqyKjCkWl1eTRbj90NgUrtyCqJrmlg="; }; outputs = [ "out" "dev" "info" "lib" "man" ]; @@ -65,6 +68,20 @@ in stdenv.mkDerivation rec { moveToOutput share/emacs "$out" ''; + passthru = { + updateScript = writeScript "update-poke" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of 'poke 2.0' + new_version="$(curl -s https://www.jemarch.net/poke | + pcregrep -o1 '>poke ([0-9.]+)')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 06876d37ee..67f1f7e604 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-L3r71srvdSsCc1HZcu6lsH+oTJQ7TatVd2Oy3meAVYk="; + sha256 = "sha256-EUcYQKc/vxOg6E5ZIpWJezLEppOru79s+slO7e/+kAU="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index 2c3ddbf80b..9207d375f3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -1,19 +1,19 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python2, qtbase, qttools }: +, python3, qtbase, qttools }: mkDerivation rec { pname = "tiled"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yQWe27zLWOnRQk+MEpuWs8CFP/le3PQ+yziB0ikNang="; + sha256 = "sha256-rJY2PNUxKAv+uQKBwu5kPuwyWkzOK9bg8NJViSgG29I="; }; nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python2 qtbase qttools ]; + buildInputs = [ python3 qtbase qttools ]; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index 51a9b9af5b..0cb09814c0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4186"; + version = "8.2.4227"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0g276mbmq69z7c4kgj59r0azxmx9ih2sd8v83dx2gfph6wgw65ph"; + sha256 = "sha256-Xj4ymkrWY5GWpQhEDYtPtaRovBa6j19dW9GWg9WSdig="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 72c7537451..133c5fe9cb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -125,7 +125,7 @@ let rm -rf "$packed" # this fixes bundled ripgrep - chmod +x resources/app/node_modules/vscode-ripgrep/bin/rg + chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg ''; inherit meta; @@ -161,12 +161,9 @@ let krb5 ]) ++ additionalPkgs pkgs; - # restore desktop item icons + # symlink shared assets, including icons and desktop entries extraInstallCommands = '' - mkdir -p "$out/share/applications" - for item in ${unwrapped}/share/applications/*.desktop; do - ln -s "$item" "$out/share/applications/" - done + ln -s "${unwrapped}/share" "$out/" ''; runScript = "${unwrapped}/bin/${executableName}"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 8990ef75a8..d307db0b1b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4"; - x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y"; - aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22"; - aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my"; - armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4"; + x86_64-linux = "0nszdd3bmixspv9wc837l9ibs996kr92awpnhx0c00mh823id9g8"; + x86_64-darwin = "0fvxlkgsr19rwbjlqqsql7rb1ah15svr4bd9zwxg0xv23q51xadc"; + aarch64-linux = "0037k2iv8cg45rx8sprm3zdj0ai76xn2l4ynij0hp7s2sh947d4s"; + aarch64-darwin = "0z3zrd90cxh892g5n5ga8xxwczfqd03lcnhz8b8k0lh2l9321inc"; + armv7l-linux = "193b560pvznkwk58bhqbr3jgbwx26vg26s5sqaibcw3z41v58a3c"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.2"; + version = "1.64.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 0ca39a7284..d5d52010e0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0"; - x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46"; - aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai"; - armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb"; + x86_64-linux = "0s45ydca4lmcyki58n4zmvdpn32x7z1q249i3qxcn2a5ay2mhhxc"; + x86_64-darwin = "1wab60dx5hfgmsw313qk8cbwvyq291d1q82hwll129dgcfhkrzrj"; + aarch64-linux = "1mkvca3hjcqf3k0v04lynmlm5j3lj86l5j15a505a3f8xp97yvdy"; + armv7l-linux = "1lcaq5k17km9p6xx26dpxgq5zrnjvh3yf8svz5nb5fa01v8fz4ds"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.2"; + version = "1.64.0"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix index c2f201774f..66b1bb0f97 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix @@ -5,16 +5,21 @@ , python3Packages , nodePackages , wkhtmltopdf +, callPackage }: with python3Packages; +let + werkzeug = python3Packages.callPackage ../../../development/python-modules/werkzeug/1.nix {}; +in + buildPythonApplication rec { pname = "odoo"; major = "15"; minor = "0"; - patch = "20211029"; + patch = "20220126"; version = "${major}.${minor}.${patch}"; @@ -22,7 +27,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz"; name = "${pname}-${version}"; - sha256 = "sha256-/E+bLBbiz7fRyTwP+0AMpqbuRkOpE4B4P6kREIB4m1Q="; + hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 7649068247..5c9de939de 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif -, ApplicationServices +, potrace, ApplicationServices , Foundation , testVersion, imagemagick }: @@ -18,23 +18,15 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-20"; + version = "7.1.0-23"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3"; + sha256 = "sha256-NNdtJvgExAFPgJxkSDq8N/UqCbuMRw2N5hPnWGszJtI="; }; - patches = [ - # fix a type confusion bug introduced in 7.1.0-20 with commit 075565e93c71bcaaabf0ce70b7d1060bccdf0020 - (fetchpatch { - url = "https://github.com/ImageMagick/ImageMagick/commit/62845d5672eca4446b952dd0ab2e3e0dab0309d4.patch"; - sha256 = "1kni5i8b5hl69niypidm90mhir8cafi6r9i857fxdlv045h3dg4p"; - }) - ]; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny @@ -59,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool ]; buildInputs = - [ zlib fontconfig freetype ghostscript + [ zlib fontconfig freetype ghostscript potrace liblqr1 libpng libraw libtiff libxml2 libheif djvulibre ] # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index d62addea4f..7feeb08105 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -52,8 +52,7 @@ , libaom , portmidi , fetchpatch -, lua5_4 -, ... +, lua }: stdenv.mkDerivation rec { @@ -104,7 +103,7 @@ stdenv.mkDerivation rec { libheif libaom portmidi - lua5_4 + lua ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk diff --git a/third_party/nixpkgs/pkgs/applications/graphics/deskew/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/deskew/default.nix index 66309ebf7a..c19b5de2b6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/deskew/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/deskew/default.nix @@ -3,33 +3,35 @@ stdenv.mkDerivation rec { pname = "deskew"; - version = "1.25"; + version = "1.30"; src = fetchFromGitHub { owner = "galfar"; repo = pname; rev = "v${version}"; - sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8"; + hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA="; }; nativeBuildInputs = [ fpc ]; buildInputs = [ libtiff ]; buildPhase = '' - rm -r Bin # Remove pre-compiled binary - mkdir Bin - chmod +x compile.sh - ./compile.sh + runHook preBuild + patchShebangs ./Scripts + pushd Scripts && ./compile.sh && popd + runHook postBuild ''; installPhase = '' - install -Dt $out/bin Bin/* + runHook preInstall + install -Dt $out/bin Bin/deskew + runHook postInstall ''; meta = with lib; { description = "A command line tool for deskewing scanned text documents"; - homepage = "https://bitbucket.org/galfar/app-deskew/overview"; - license = licenses.mit; + homepage = "https://galfar.vevb.net/deskew"; + license = with licenses; [ mit mpl11 ]; maintainers = with maintainers; [ryantm]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 54efd0bf13..57439313bf 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "16.4.0"; + version = "16.5.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "624f776478b6960adb1be565077f79aed72c95de5e995fc1216b78978c9c6857"; + sha256 = "a8ebf2560820d2d05677b9b16fc863f555dde8235b3e34acd7916eee3544eaa9"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix index 4c47283c42..2518eb0942 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix @@ -49,9 +49,9 @@ in mkDerivation rec { meta = with lib; { description = "Pixel-oriented paint program, modelled on Deluxe Paint"; - homepage = "http://evilpixie.scumways.com/"; + homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone downloadPage = "https://github.com/bcampbell/evilpixie/releases"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix index c2ce284037..fdf6831b97 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/glabels/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create labels and business cards"; - homepage = "https://glabels.org/"; + homepage = "https://github.com/jimevins/glabels"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.unix; maintainers = [ maintainers.nico202 ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix index fe387ddc27..f92f368661 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }: +, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences +, runCommand +, graphicsmagick # for passthru.tests +}: stdenv.mkDerivation rec { pname = "graphicsmagick"; @@ -33,13 +36,23 @@ stdenv.mkDerivation rec { # Remove CFLAGS from the binaries to avoid closure bloat. # In the past we have had -dev packages in the closure of the binaries soley due to the string references. postConfigure = '' - nuke-refs ./magick/magick_config.h + nuke-refs -e $out ./magick/magick_config.h ''; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* ''; + passthru = { + tests = { + issue-157920 = runCommand "issue-157920-regression-test" { + buildInputs = [ graphicsmagick ]; + } '' + gm convert ${graphviz}/share/graphviz/doc/pdf/neatoguide.pdf jpg:$out + ''; + }; + }; + meta = { homepage = "http://www.graphicsmagick.org"; description = "Swiss army knife of image processing"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 08293f748d..6e3908db2c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "470b"; + version = "472"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "0v52krjcqykrm3zqj6idzvbpjv4fhbgvq2jr8k0g63f7db7p08h9"; + sha256 = "sha256-6BhicOKQez9gk73WHaPeN/FXcUetdklhh8jePSgvN6E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix index d3640a656f..110a7e513e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix @@ -9,20 +9,27 @@ stdenv.mkDerivation { }; buildInputs = [ libX11 imlib2 libXinerama ]; + buildPhase = '' - gcc -g imlibsetroot.c -o imlibsetroot \ - `imlib2-config --cflags` `imlib2-config --libs` \ - -I/include/X11/extensions -lXinerama -lX11 + runHook preBuild + + gcc -g imlibsetroot.c -o imlibsetroot \ + -I${imlib2.dev}/include -L${imlib2}/lib -lImlib2 \ + -I${libX11.dev}/include -lXinerama -lX11 + + runHook postBuild ''; + installPhase = '' - mkdir -p $out/bin - install -m 755 imlibsetroot $out/bin + runHook preInstall + install -D -m 0755 imlibsetroot -t $out/bin + runHook postInstall ''; meta = with lib; { description = "A Xinerama Aware Background Changer"; homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; - license = licenses.gpl2; + license = licenses.mitAdvertising; platforms = platforms.linux; maintainers = with maintainers; [ dwarfmaster ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 24f3a555fd..271173a8b0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "share/extensions/"; }) + + # Fix build with Poppler 21.11.0. + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch"; + sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg="; + }) + # Remove mandatory break from end of paragraphs, added in Pango 1.49 # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 # TODO: Remove in Inkscape 1.1.2 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix index afaa681437..7a601b9641 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "menyoki"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEPt96z/odQ05hosN+GB5KLsCu8onR9WWamofJayhwU="; + sha256 = "sha256-2k8CRya9SylauYV+2aQS2QHkQhyiTHMgGp1DNoZ4jbU="; }; - cargoSha256 = "sha256-nwxBreouL3Z47zHSH+Y/ej7KU2/bXyMQ+Tb7R4U+yKk="; + cargoSha256 = "sha256-NLPqJepg0WRt/X3am9J7vwIE9bn+dt2UHE26Dc/QRMM="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index f2ffa143ae..4952ecf84f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CFKo8YEAXAniX+jL2A0naJUOn3KAWwcrPsabdiZevhI="; }; - vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM="; + vendorSha256 = "sha256-3y42rbhurGhCI9PuSayxmLem0tv/nTjBwYxF3Dk6/yM="; # No tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix new file mode 100644 index 0000000000..8396ba5563 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix @@ -0,0 +1,132 @@ +{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot +, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig +, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim +# Qt 5 subpackages +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt +}: + +stdenv.mkDerivation rec { + pname = "pixinsight"; + version = "1.8.8-12"; + + src = requireFile rec { + name = "PI-linux-x64-${version}-20211229-c.tar.xz"; + url = "https://pixinsight.com/"; + sha256 = "7095b83a276f8000c9fe50caadab4bf22a248a880e77b63e0463ad8d5469f617"; + message = '' + PixInsight is available from ${url} and requires a commercial (or trial) license. + After a license has been obtained, PixInsight can be downloaded from the software distribution + (choose Linux 64bit). + The PixInsight tarball must be added to the nix-store, i.e. via + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + }; + sourceRoot = "."; + + nativeBuildInputs = [ + unixtools.script + fakeroot + wrapQtAppsHook + autoPatchelfHook + mailcap + libudev0-shim + ]; + + buildInputs = [ + stdenv.cc.cc.lib + stdenv.cc + libGL + libpulseaudio + alsa-lib + nss + gd + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + nspr + expat + fontconfig + dbus + glib + zlib + openssl + libdrm + wayland + cups + avahi-compat + # Qt stuff + qt3d + mlt + qtbase + qtgamepad + qtserialport + qtserialbus + qtvirtualkeyboard + qtmultimedia + qtwebkit + ] ++ (with xorg; [ + libX11 + libXdamage + xrandr + libXtst + libXcomposite + libXext + libXfixes + libXrandr + ]); + + postPatch = '' + patchelf ./installer \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.cc.cc.lib}/lib + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor} + + fakeroot script -ec "./installer \ + --yes \ + --install-dir=$out/opt/PixInsight \ + --install-desktop-dir=$out/share/applications \ + --install-mime-dir=$out/share/mime \ + --install-icons-dir=$out/share/icons/hicolor \ + --no-bin-launcher \ + --no-remove" + + rm -rf $out/opt/PixInsight-old-0 + ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/. + ''; + + # Some very exotic Qt libraries are not available in nixpkgs + autoPatchelfIgnoreMissingDeps = true; + + # This mimics what is happening in PixInsight.sh and adds on top the libudev0-shim, which + # without PixInsight crashes at startup. + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${libudev0-shim}/lib" + "--set LC_ALL en_US.utf8" + "--set AVAHI_COMPAT_NOWARN 1" + "--set QT_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins" + "--set QT_QPA_PLATFORM_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins/platforms" + "--set QT_AUTO_SCREEN_SCALE_FACTOR 0" + "--set QT_ENABLE_HIGHDPI_SCALING 0" + "--set QT_SCALE_FACTOR 1" + "--set QT_LOGGING_RULES '*=false'" + "--set QTWEBENGINEPROCESS_PATH $out/opt/PixInsight/bin/libexec/QtWebEngineProcess" + ]; + dontWrapQtApps = true; + postFixup = '' + wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs} + ''; + + meta = with lib; { + description = "Scientific image processing program for astrophotography"; + homepage = "https://pixinsight.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.sheepforce ]; + mainProgram = "PixInsight"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix index ffa76a6c07..7a5dde82f1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-WLDQaN6wHnadvp0JyUzlcZVNiSbFudmmBSNYRMaE6U4="; + sha256 = "sha256-NtnnZV/+8aUm8BkUz8Xm3aeSbOI2gNUPNfvYlwUl01Y="; }; nativeBuildInputs = [ cmake wrapGAppsHook ]; @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # We also need zenity (see below) - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "/usr/" "''${out}/" - ''; - cmakeFlags = [ "-DTEV_DEPLOY=1" # Only relevant not to append "dev" to the version ]; 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 00b3d80adf..70cbabb4e7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, fetchurl +, writeText , cmake , pkg-config @@ -18,6 +18,7 @@ , libuuid , wayland-protocols , Carbon +, CoreServices # optionals , opencl-headers , OpenCL @@ -26,30 +27,37 @@ , nixosTests }: -# cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently -# related to -# https://cmake.org/cmake/help/v3.21/prop_tgt/LINK_WHAT_YOU_USE.html -let cmake3_22 = cmake.overrideAttrs (old: { - version = "3.22.0"; - src = fetchurl { - url = "https://cmake.org/files/v3.22/cmake-3.22.0.tar.gz"; - sha256 = "sha256-mYx7o0d40t/bPfimlUaeJLEeK/oh++QbNho/ReHJNF4="; - }; -}); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.14"; + version = "0.0.17"; src = fetchFromGitHub { owner = "mgerhardy"; - repo = "engine"; + repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-v82hKskTSwM0NDgLVHpHZNRQW6tWug4pPIt91MrUwUo="; + sha256 = "sha256-h+R9L0BBD3NSFWUh43g4V2LBcNyqVInBeJiOLY03nRk="; }; + # Patch from the project's author for fixing an issue with AnimationShaders.h + # not being included when turning off some components + patches = [(writeText "vengi-tools-fix-build.patch" '' + diff --git a/src/modules/voxelworldrender/CMakeLists.txt b/src/modules/voxelworldrender/CMakeLists.txt + index aebe5f97b..903e62b37 100644 + --- a/src/modules/voxelworldrender/CMakeLists.txt + +++ b/src/modules/voxelworldrender/CMakeLists.txt + @@ -27,7 +27,7 @@ set(FILES + voxel/models/plants/3.qb + voxel/models/plants/4.qb + ) + -engine_add_module(TARGET ''${LIB} SRCS ''${SRCS} ''${SRCS_SHADERS} FILES ''${FILES} DEPENDENCIES frontend voxelrender) + +engine_add_module(TARGET ''${LIB} SRCS ''${SRCS} ''${SRCS_SHADERS} FILES ''${FILES} DEPENDENCIES animation frontend voxelrender) + generate_shaders(''${LIB} world water postprocess) + + set(TEST_SRCS + '')]; + nativeBuildInputs = [ - cmake3_22 + cmake pkg-config ninja python3 @@ -69,7 +77,7 @@ in stdenv.mkDerivation rec { #libpqxx #mosquitto ] ++ lib.optional stdenv.isLinux wayland-protocols - ++ lib.optionals stdenv.isDarwin [ Carbon OpenCL ] + ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ] ++ lib.optional (!stdenv.isDarwin) opencl-headers; cmakeFlags = [ @@ -82,7 +90,7 @@ in stdenv.mkDerivation rec { "-DGAMES=OFF" "-DMAPVIEW=OFF" "-DAIDEBUG=OFF" - ]; + ] ++ lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; # Set the data directory for each executable. We cannot set it at build time # with the PKGDATADIR cmake variable because each executable needs a specific @@ -97,7 +105,10 @@ in stdenv.mkDerivation rec { ''; passthru.tests = { - voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {}; + # There used to be a roundtrip test here, but it started failing on 0.0.17 + # Relevant upstream ticket: + # https://github.com/mgerhardy/vengi/issues/113 + voxconvert-all-formats = callPackage ./test-voxconvert-all-formats.nix {}; run-voxedit = nixosTests.vengi-tools; }; @@ -110,10 +121,12 @@ in stdenv.mkDerivation rec { filemanager and a command line tool to convert between several voxel formats. ''; - homepage = "https://mgerhardy.github.io/engine/"; - downloadPage = "https://github.com/mgerhardy/engine/releases"; + homepage = "https://mgerhardy.github.io/vengi/"; + downloadPage = "https://github.com/mgerhardy/vengi/releases"; license = [ licenses.mit licenses.cc-by-sa-30 ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # Requires SDK 10.14 https://github.com/NixOS/nixpkgs/issues/101229 + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix new file mode 100644 index 0000000000..00cdf8ae6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix @@ -0,0 +1,15 @@ +{ stdenv +, vengi-tools +}: + +stdenv.mkDerivation { + name = "vengi-tools-test-voxconvert-all-formats"; + meta.timeout = 10; + buildCommand = '' + mkdir $out + for format in vox qef qbt qb vxm vxr binvox gox cub vxl csv; do + echo Testing $format export + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output $out/chr_knight.$format + done + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix deleted file mode 100644 index 27b0305615..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv -, vengi-tools -}: - -stdenv.mkDerivation { - name = "vengi-tools-test-voxconvert-roundtrip"; - meta.timeout = 10; - buildCommand = '' - ${vengi-tools}/bin/vengi-voxconvert ${vengi-tools}/share/vengi-voxedit/chr_knight.qb chr_knight.vox - ${vengi-tools}/bin/vengi-voxconvert chr_knight.vox chr_knight.qb - ${vengi-tools}/bin/vengi-voxconvert chr_knight.qb chr_knight1.vox - diff chr_knight.vox chr_knight1.vox - touch $out - ''; -} diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh index 3305fd7dd9..72b76131f6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.2/src -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix index 95896626f2..af8e47dd74 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix @@ -4,1843 +4,1843 @@ { akonadi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-21.12.1.tar.xz"; - sha256 = "1ih83d8rs1frzhx1i2fgd5ndq259xqqp8aylirswpal7wpqk6f6l"; - name = "akonadi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-21.12.2.tar.xz"; + sha256 = "1i1q8zda3hl564w02478wyqv35wj8npkqayy7b13shkq9b9j3nj8"; + name = "akonadi-21.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-calendar-21.12.1.tar.xz"; - sha256 = "0371mda45nh49l9mmwz64s6qh1yv36khnvll2g2krj8955y7jhz7"; - name = "akonadi-calendar-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-21.12.2.tar.xz"; + sha256 = "001ndvgqn6x70s7gdya1f1vr080mfkypam3k6z0i2ivlpymc3wly"; + name = "akonadi-calendar-21.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-calendar-tools-21.12.1.tar.xz"; - sha256 = "1ksagjidqs5ja145wkrn3xq9hk9wc4v7n1747bin0c3ks2s685ri"; - name = "akonadi-calendar-tools-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-tools-21.12.2.tar.xz"; + sha256 = "0f0l6wj3h2afbmvnq60cg0x03a412849dg4l9dwgdn8yxvnxkhw6"; + name = "akonadi-calendar-tools-21.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-contacts-21.12.1.tar.xz"; - sha256 = "1yh3b5q7dkgg57048lm1lyy9yxs9fwia7m6d1359fck1flh8lna3"; - name = "akonadi-contacts-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-contacts-21.12.2.tar.xz"; + sha256 = "1aq81569kz529n66dl5jjzamy6kxw0xk5bcmjfvb3wpxznhiigqm"; + name = "akonadi-contacts-21.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-import-wizard-21.12.1.tar.xz"; - sha256 = "09dzs9sk2baa5xgb81qxswvfmm23v3w02w9b9yyxgs38xrwqjf2p"; - name = "akonadi-import-wizard-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-import-wizard-21.12.2.tar.xz"; + sha256 = "0b4mphxbqzf3akhafxc4fvil83l3z4qcf8xnblw23ficqqs8s0di"; + name = "akonadi-import-wizard-21.12.2.tar.xz"; }; }; akonadi-mime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-mime-21.12.1.tar.xz"; - sha256 = "1jigq9rdxz5s6sl72ms06y7516hpmsm637zpqdrrg2gsb2f6y0d6"; - name = "akonadi-mime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-mime-21.12.2.tar.xz"; + sha256 = "1nd6bf26lb5wfhzh4kn37iwmb6savcq9wsaph5c7jg6m0bdix1fn"; + name = "akonadi-mime-21.12.2.tar.xz"; }; }; akonadi-notes = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-notes-21.12.1.tar.xz"; - sha256 = "1l9cmb7jhqx5r6zyz21dzqfydisjjs23qcb0bp83byb3mqsq8jnv"; - name = "akonadi-notes-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-notes-21.12.2.tar.xz"; + sha256 = "1s3bxnqsjnlgsnia0nvqyc3m1ppzanzna9598lgwbmz053rgn7ck"; + name = "akonadi-notes-21.12.2.tar.xz"; }; }; akonadi-search = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-search-21.12.1.tar.xz"; - sha256 = "0b8lz4l2iq5ihfwyccaxjiw9yykxi0z240lmd9aiq4rv1wxzy22n"; - name = "akonadi-search-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-search-21.12.2.tar.xz"; + sha256 = "1hp2x8y59azl59znrqhrjn4n1bs2iqnkdsldv1f2k1ima6z5f4qy"; + name = "akonadi-search-21.12.2.tar.xz"; }; }; akonadiconsole = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadiconsole-21.12.1.tar.xz"; - sha256 = "1d2wclbjpbx0jr2r7nz0m4wxls9763vbpnbbidprwbap5p5njl9z"; - name = "akonadiconsole-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadiconsole-21.12.2.tar.xz"; + sha256 = "1rqfmhi1mzh6yzjg7jf6adf1xqvpbhcxgld2pp4rd9g5mi9rlxlk"; + name = "akonadiconsole-21.12.2.tar.xz"; }; }; akregator = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akregator-21.12.1.tar.xz"; - sha256 = "1yf7631v1qc2a3j4b8bm0997cpg04vr0cgkdfqd3gazm2b367vf4"; - name = "akregator-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akregator-21.12.2.tar.xz"; + sha256 = "1srsm25qvbww0hl7r878n32b71g0p222zxyys7chzrg8izrh12b8"; + name = "akregator-21.12.2.tar.xz"; }; }; analitza = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/analitza-21.12.1.tar.xz"; - sha256 = "0dldw4zg14ih4fj90xbl3x57wzmqjf0wayi78p95lzm323rxkyvm"; - name = "analitza-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/analitza-21.12.2.tar.xz"; + sha256 = "1ak2wyfx67cwx85d5053f6flxwas973mhnm25mf4jw0qll72vid4"; + name = "analitza-21.12.2.tar.xz"; }; }; ark = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ark-21.12.1.tar.xz"; - sha256 = "1mkqp6pn259aadwcnw7nmsrn4kx957m6axq2hnj18xrxbapm8xm0"; - name = "ark-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ark-21.12.2.tar.xz"; + sha256 = "1g05lyv8ll85myw0i62bxr4kmfd3dhldvmbgpgym9r1rgan12q90"; + name = "ark-21.12.2.tar.xz"; }; }; artikulate = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/artikulate-21.12.1.tar.xz"; - sha256 = "044xm6aqy7mnnm4hy2cczjrgfkwghsm4pdif66hyk2mlybs78g5x"; - name = "artikulate-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/artikulate-21.12.2.tar.xz"; + sha256 = "1g0h0dqqsf3x8q292hfhrizl9dlqzm8gjynzcyrzx0gvbfadj2l1"; + name = "artikulate-21.12.2.tar.xz"; }; }; audiocd-kio = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/audiocd-kio-21.12.1.tar.xz"; - sha256 = "0j22dk41mc26g4qwy2f7xq32d17v03nk8f49a9v8afzpka6dmyfv"; - name = "audiocd-kio-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/audiocd-kio-21.12.2.tar.xz"; + sha256 = "07nk060vkyn94ihs9v054zhsckfwpn8z911gy3hnyf1wdmnpfh2n"; + name = "audiocd-kio-21.12.2.tar.xz"; }; }; baloo-widgets = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/baloo-widgets-21.12.1.tar.xz"; - sha256 = "01kbg9biyrjc9704g6wnvgcq08ry7idsfxh5sv2y4ncsidgb3l4i"; - name = "baloo-widgets-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/baloo-widgets-21.12.2.tar.xz"; + sha256 = "1ax7pak9qb60yzdca8frkb8qs4khs6f2wbkwyb48s7zmdxqyw1bj"; + name = "baloo-widgets-21.12.2.tar.xz"; }; }; blinken = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/blinken-21.12.1.tar.xz"; - sha256 = "06v2d9l2c4p7n1vmaz86hmdb4lancfm4244sczykygjkcd7qiy6f"; - name = "blinken-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/blinken-21.12.2.tar.xz"; + sha256 = "0h0nw79zr891f54y2r3d3n837bzn24pfvkxsab1f0a228kjakw09"; + name = "blinken-21.12.2.tar.xz"; }; }; bomber = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/bomber-21.12.1.tar.xz"; - sha256 = "18ymdm1qb0k9vq7r27dlv146xjgp6gxb86nxhpcrgm18xicbidah"; - name = "bomber-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/bomber-21.12.2.tar.xz"; + sha256 = "1348mdiykfg1c3gr5fkcf71mxf7lyapwg5ym3jqp9vyc56vhwfjs"; + name = "bomber-21.12.2.tar.xz"; }; }; bovo = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/bovo-21.12.1.tar.xz"; - sha256 = "035pyyvdmbagpqnlf7ngvjzssiy0y9f87vj9wdxdnyglcvhycrf4"; - name = "bovo-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/bovo-21.12.2.tar.xz"; + sha256 = "0i2i5ici9v402lrh83mhfsrxmqi0fs75rkfvhsbza3wab7b165kc"; + name = "bovo-21.12.2.tar.xz"; }; }; calendarsupport = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/calendarsupport-21.12.1.tar.xz"; - sha256 = "0glb8s5byaywvk66428pkq0lq0myhf8dlpg52i9ysq5ph3qjijyh"; - name = "calendarsupport-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/calendarsupport-21.12.2.tar.xz"; + sha256 = "021rr06ln7l0v2xjzsij4r71jwpy1w1r761bjad0ywprwkdc93bm"; + name = "calendarsupport-21.12.2.tar.xz"; }; }; cantor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/cantor-21.12.1.tar.xz"; - sha256 = "0l4vlx2w8bv53j1pd0fbwkgzv1p4m24apinxv4z4ia4f93h93vg1"; - name = "cantor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/cantor-21.12.2.tar.xz"; + sha256 = "0vq8yvdglf43y5r2f9bvamm9bp82q92hw9sr8xmgb5hqz5mkap78"; + name = "cantor-21.12.2.tar.xz"; }; }; cervisia = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/cervisia-21.12.1.tar.xz"; - sha256 = "1q9pwqz9ps7dq29ywxyzbnbvy6676bd4q52d4jpq3aff4g2l9p98"; - name = "cervisia-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/cervisia-21.12.2.tar.xz"; + sha256 = "1vpm3cjknpa4s9mjdfngpvidqihfh5sb427yhnydr1q2dmllr9nn"; + name = "cervisia-21.12.2.tar.xz"; }; }; dolphin = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/dolphin-21.12.1.tar.xz"; - sha256 = "0k15mxrxplfghya8mv42w53v06ag9msnrd2yqdxlnmri5db1cjva"; - name = "dolphin-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/dolphin-21.12.2.tar.xz"; + sha256 = "0c0gk1djgl1d1qzibw5f1w29cnlxl6kan8pkg0izaqvnbmmx53wn"; + name = "dolphin-21.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/dolphin-plugins-21.12.1.tar.xz"; - sha256 = "0y920vvybdsvnrngjsf9ikblmmzmlshrg1zrn44ikyz15b4ar8bw"; - name = "dolphin-plugins-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/dolphin-plugins-21.12.2.tar.xz"; + sha256 = "1mrsampq1zq5rri1kx77dz0afz4a6s8pvb1255q0pl7imgxhiaqc"; + name = "dolphin-plugins-21.12.2.tar.xz"; }; }; dragon = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/dragon-21.12.1.tar.xz"; - sha256 = "04rz1pm6azrqy4nzs20g8wj4knd4yvd10alcypyxbcb08npwx51z"; - name = "dragon-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/dragon-21.12.2.tar.xz"; + sha256 = "07zn4ishffh9g8hvkpfgm7j9cimw3plcabzk9p157nhgxr62z4sb"; + name = "dragon-21.12.2.tar.xz"; }; }; elisa = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/elisa-21.12.1.tar.xz"; - sha256 = "1n4hga9g4kqnn016mm4dnq5wslxy9yaxdgazf9n3119i4mi4mjhs"; - name = "elisa-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/elisa-21.12.2.tar.xz"; + sha256 = "0zwy0bi4s25y6adgjhrhw992i2c1kjwpgvp9yg902h8zpsdynwh5"; + name = "elisa-21.12.2.tar.xz"; }; }; eventviews = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/eventviews-21.12.1.tar.xz"; - sha256 = "1g6bhp869ic12jz3dzjx2hsc435i9zfxbrys34sxsa0448kk3wd3"; - name = "eventviews-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/eventviews-21.12.2.tar.xz"; + sha256 = "1v3bpd0b3ph7v0kg8pyp4rr4j8cxy7y4csym5dlqn6l81db7d3gr"; + name = "eventviews-21.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ffmpegthumbs-21.12.1.tar.xz"; - sha256 = "1mg10gxyirjglxd0hcayyddi2z0kbig1k24ms77aqwaiy66z77g3"; - name = "ffmpegthumbs-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ffmpegthumbs-21.12.2.tar.xz"; + sha256 = "17cyrimlnf1npffmxinnj3q5ynqg3agx35b55iqnw3xixrz4snzr"; + name = "ffmpegthumbs-21.12.2.tar.xz"; }; }; filelight = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/filelight-21.12.1.tar.xz"; - sha256 = "0rky4nmnlqzpf820kx2w3g9qi2x77x1advqzc21la2yc6f27m83z"; - name = "filelight-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/filelight-21.12.2.tar.xz"; + sha256 = "0khhwnms2ysy9ijpmmagm68w1zixmxs7svaaldd30xb3w52f78v2"; + name = "filelight-21.12.2.tar.xz"; }; }; granatier = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/granatier-21.12.1.tar.xz"; - sha256 = "0dbhf6p0c2yihzkzn5ns4bq2n209c2234i6a9p8rffdd7x5n9pmm"; - name = "granatier-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/granatier-21.12.2.tar.xz"; + sha256 = "0j7yizbljqx1a4wd4prmb3463r67f3lk5gv5x8j1yx2zmiaq0qki"; + name = "granatier-21.12.2.tar.xz"; }; }; grantlee-editor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/grantlee-editor-21.12.1.tar.xz"; - sha256 = "1r3qh8z1f2ywm7qgqv9jca4l39p53nsc4i08rvdxhc85j1jj8cwb"; - name = "grantlee-editor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/grantlee-editor-21.12.2.tar.xz"; + sha256 = "0wxkg56s83i61i17cb2y6ziminaq2gammynrwm5jvkpi5vqwvi2s"; + name = "grantlee-editor-21.12.2.tar.xz"; }; }; grantleetheme = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/grantleetheme-21.12.1.tar.xz"; - sha256 = "0ij225hva80983b4sbl5apfh5jfq9ppy8db5rfi2514crkmva8p2"; - name = "grantleetheme-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/grantleetheme-21.12.2.tar.xz"; + sha256 = "0z1p0s7fakfbscppmrgp1irf3dm2ayadyd3yb5zdsr9xahs0b9md"; + name = "grantleetheme-21.12.2.tar.xz"; }; }; gwenview = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/gwenview-21.12.1.tar.xz"; - sha256 = "1gm86h5srjym8ig1vbfyshnrpf7vwb9bvl6hb8nhfqhcmldawlnb"; - name = "gwenview-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/gwenview-21.12.2.tar.xz"; + sha256 = "1jkv34llga981dq08npk8alrg9h27prdpffcxkm368i77mvp9hv6"; + name = "gwenview-21.12.2.tar.xz"; }; }; incidenceeditor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/incidenceeditor-21.12.1.tar.xz"; - sha256 = "1iam11jmp6q2k7r558dawcqrq5f9sixixdnvhywxj8fnvkjs005k"; - name = "incidenceeditor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/incidenceeditor-21.12.2.tar.xz"; + sha256 = "151jhn84d5amv3abvp6cd2q10mf4mmv3q5hn0inqrmapy3v6bn8i"; + name = "incidenceeditor-21.12.2.tar.xz"; }; }; itinerary = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/itinerary-21.12.1.tar.xz"; - sha256 = "17xy62bcjrbf75hbjj417k7hbs9m1874bwi3h6iii848c3j98ppn"; - name = "itinerary-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/itinerary-21.12.2.tar.xz"; + sha256 = "02w6696kdzgz2r9677nr1jyhd9mfhc2zhmasy70nblz0jn22bcq7"; + name = "itinerary-21.12.2.tar.xz"; }; }; juk = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/juk-21.12.1.tar.xz"; - sha256 = "00kvx7yj45cm4fzdni6sd1csb09f1xm92hpx3ii1dmdm7cy1rg17"; - name = "juk-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/juk-21.12.2.tar.xz"; + sha256 = "1qgxpy1ksrgvdik69vppzdl1crscn69284q4wvwc5qh9v6rhv1xn"; + name = "juk-21.12.2.tar.xz"; }; }; k3b = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/k3b-21.12.1.tar.xz"; - sha256 = "03swyl3hxzwa73hsc223a7wcf3hq5p0wws7rjrzbazvy7pcac436"; - name = "k3b-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/k3b-21.12.2.tar.xz"; + sha256 = "0rjg3zs85gw62r3z3msp438jnf0ghc6y577br59ig19m10x33rz9"; + name = "k3b-21.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kaccounts-integration-21.12.1.tar.xz"; - sha256 = "15j9778r07zvqhv0hkh18h6fqq97is04sii0pxss6w2nqfghxzr8"; - name = "kaccounts-integration-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-integration-21.12.2.tar.xz"; + sha256 = "0c4yxrhbas0wsmrxr0pwkpgw9gzdvvf5r5nxd15f656bwwhmqlwy"; + name = "kaccounts-integration-21.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kaccounts-providers-21.12.1.tar.xz"; - sha256 = "12ll5nilk3adw6ia23n7rcy4wz0sg59is5kkxiarl8mjzd9vw4v4"; - name = "kaccounts-providers-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-providers-21.12.2.tar.xz"; + sha256 = "1srz43xf6kz7xfz8np94pdnhmvashk7y2f2a275rwpnlrl0yw1yd"; + name = "kaccounts-providers-21.12.2.tar.xz"; }; }; kaddressbook = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kaddressbook-21.12.1.tar.xz"; - sha256 = "1nv23wvka273a6d63gz0s0rxsp4ck3nx6fvvgg5ba1wzdcgjfd16"; - name = "kaddressbook-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kaddressbook-21.12.2.tar.xz"; + sha256 = "04ac5z9603lxylc6x55chnc0w59mx3z92nyvfnvjvp1ga77si36b"; + name = "kaddressbook-21.12.2.tar.xz"; }; }; kajongg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kajongg-21.12.1.tar.xz"; - sha256 = "0z5npbvl0hn1gld60nfy1n8qk60gfxjh1a74s5y6vc4zvqmscl5q"; - name = "kajongg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kajongg-21.12.2.tar.xz"; + sha256 = "04s3f8nj0rh1zy7sfa5kq0smbfsyylz9w3lxm2z69g7x5sb08k53"; + name = "kajongg-21.12.2.tar.xz"; }; }; kalarm = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalarm-21.12.1.tar.xz"; - sha256 = "167xv38rj8pidbqqbfygkxcsr4wyd6j1437i93fb6v2b87h6ixx1"; - name = "kalarm-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalarm-21.12.2.tar.xz"; + sha256 = "0f3hcsql20lim9nqb0ha5lpsrbh131rwcla9i6aax5sgw4m6nyfh"; + name = "kalarm-21.12.2.tar.xz"; }; }; kalarmcal = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalarmcal-21.12.1.tar.xz"; - sha256 = "1r7pxy4fc5w3j0bwi79370rvmsl919swny48176fg7kwvmjdv3z5"; - name = "kalarmcal-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalarmcal-21.12.2.tar.xz"; + sha256 = "15l893iv4smlppk7k682m9hwrph84p5chx5mgxixjxl28c1blcc8"; + name = "kalarmcal-21.12.2.tar.xz"; }; }; kalgebra = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalgebra-21.12.1.tar.xz"; - sha256 = "1scqqrlznjl8j59fy24wfk84ysk3gvxw87cpl4wa4qhgb0q64m4b"; - name = "kalgebra-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalgebra-21.12.2.tar.xz"; + sha256 = "0w1h3as6dip4hrp2ay61sz9gixf4s887jp42v7zjajwwhjs6xs1m"; + name = "kalgebra-21.12.2.tar.xz"; }; }; kalzium = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalzium-21.12.1.tar.xz"; - sha256 = "0sx10g2qmmvfm1ilmxr2xyf04mhcyr0ysjn6nw5c3rfnv8l42zh0"; - name = "kalzium-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalzium-21.12.2.tar.xz"; + sha256 = "0kvrmvd2vgl6fklxq9sr46p6nnh0fk0l6licj9b5q9rz82xwbr50"; + name = "kalzium-21.12.2.tar.xz"; }; }; kamera = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kamera-21.12.1.tar.xz"; - sha256 = "0hzsip822dsddf42x5lk88nlz4kr4khlh240wbvxrxz0hasgjxbc"; - name = "kamera-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kamera-21.12.2.tar.xz"; + sha256 = "07n1xlmg7m6p5ca0i4hjjyv564cqrn4p6h5yqx4pw3pcq8nizqfz"; + name = "kamera-21.12.2.tar.xz"; }; }; kamoso = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kamoso-21.12.1.tar.xz"; - sha256 = "0a3lvqmm4kjj9v56mvzf2rfdmijahd32n7lc9agjca9hll59y31q"; - name = "kamoso-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kamoso-21.12.2.tar.xz"; + sha256 = "09qn1px0mmcjhw9ikaz8xcjbdabh657ij3sa4ps37jbfzyyv45fb"; + name = "kamoso-21.12.2.tar.xz"; }; }; kanagram = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kanagram-21.12.1.tar.xz"; - sha256 = "00nyb23fyjxqxqin962j8av88xb2kcnhga9nd3l36i5mndh3axrm"; - name = "kanagram-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kanagram-21.12.2.tar.xz"; + sha256 = "1l4j2fy8mwdywp0prswng1f06rpwkfi54dc8z5z02b13p47hz5cy"; + name = "kanagram-21.12.2.tar.xz"; }; }; kapman = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kapman-21.12.1.tar.xz"; - sha256 = "064qiza0zjjm9skclfzksnfhmk21d6zn221jbx3zc9s11c0ba81l"; - name = "kapman-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kapman-21.12.2.tar.xz"; + sha256 = "0n1iz9jfgzpcpavb4ijfqp3hym7z53wzp5a5hiad8i6nws408grn"; + name = "kapman-21.12.2.tar.xz"; }; }; kapptemplate = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kapptemplate-21.12.1.tar.xz"; - sha256 = "16d0iwymxssxhj90dyrxp4yl3w15xzs4hrs9ryxqxf1n733b5zjq"; - name = "kapptemplate-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kapptemplate-21.12.2.tar.xz"; + sha256 = "1sjyji533x9ph9l63zf0llsb0m5fzb1lka03h5blm7fdyw570bad"; + name = "kapptemplate-21.12.2.tar.xz"; }; }; kate = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kate-21.12.1.tar.xz"; - sha256 = "04d00nihzg05yfp1aahfys5cimhnvdiz5mmmcqjjahcanpywqj3y"; - name = "kate-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kate-21.12.2.tar.xz"; + sha256 = "0r59rfyrbs50w9brl4rrq1wdfmrr3sz7plw2pqlc5xpzngrdlhs1"; + name = "kate-21.12.2.tar.xz"; }; }; katomic = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/katomic-21.12.1.tar.xz"; - sha256 = "0yblg7j3y67wkzjbsyr4q3h88h9jbv4ndkkwcg45g2f1vvkc9ny1"; - name = "katomic-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/katomic-21.12.2.tar.xz"; + sha256 = "123ls2p6az9bpy741xg85azs0p1qbssgcg4fh8cqazkz0kgzr0hf"; + name = "katomic-21.12.2.tar.xz"; }; }; kbackup = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbackup-21.12.1.tar.xz"; - sha256 = "1nxq1l8smrhgvay08xsr68nw2x6fkv2ms5pvqp6wws0zb7gy7df9"; - name = "kbackup-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbackup-21.12.2.tar.xz"; + sha256 = "1yadxlqfz2a4lirxf2xmivggvdpbjiaw5zn7aw72jb3yjs7x6j03"; + name = "kbackup-21.12.2.tar.xz"; }; }; kblackbox = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kblackbox-21.12.1.tar.xz"; - sha256 = "159y83ljw5m231n9xnjq41c0q1jk6h27xpb0h9rngdz98rkrh1xi"; - name = "kblackbox-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kblackbox-21.12.2.tar.xz"; + sha256 = "1y5l5l5p3s2gf69rih3mjdv42h9ydfk66v10ad5na3b4sqbi2qi7"; + name = "kblackbox-21.12.2.tar.xz"; }; }; kblocks = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kblocks-21.12.1.tar.xz"; - sha256 = "0ac9yykql8rhq07has2dz7b93z9vj69qdk42r28nnpc117ncki5d"; - name = "kblocks-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kblocks-21.12.2.tar.xz"; + sha256 = "13anvyy3br7ybl74jcrnjmw5qjfyk4z6s7ncziw8l37ggg4k7n91"; + name = "kblocks-21.12.2.tar.xz"; }; }; kbounce = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbounce-21.12.1.tar.xz"; - sha256 = "1x2d8l8gxb2fj6sdwb9whl9360qmn895yzg3bc6q9zjbpn8rwq8m"; - name = "kbounce-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbounce-21.12.2.tar.xz"; + sha256 = "07k5vmfkh9l4b4sb4an5qlnq0b9hmhh6dax0bjgia0ng9vxd011q"; + name = "kbounce-21.12.2.tar.xz"; }; }; kbreakout = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbreakout-21.12.1.tar.xz"; - sha256 = "0kcr39ylq3axzjh9r5zy7dhv0q3a8m7pimg1l5vjlpgffnhhlvk5"; - name = "kbreakout-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbreakout-21.12.2.tar.xz"; + sha256 = "08rykfi82hgzg5l2bhs8nvh8si06nisy60653n6r7m8g327yyn1m"; + name = "kbreakout-21.12.2.tar.xz"; }; }; kbruch = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbruch-21.12.1.tar.xz"; - sha256 = "0b84a4k4ahi3xwc9h3qivbfi2is7vd0ng7rd1nk25135yfqwz5j0"; - name = "kbruch-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbruch-21.12.2.tar.xz"; + sha256 = "0vvl2rk636zpg27hj2jly1awg4z3fm6mk75qrda3hl6gm8rddw1v"; + name = "kbruch-21.12.2.tar.xz"; }; }; kcachegrind = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcachegrind-21.12.1.tar.xz"; - sha256 = "0ix589lsrv71akmnln71brl2878kgiybgsbjgch1kn1k1pz6jmij"; - name = "kcachegrind-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcachegrind-21.12.2.tar.xz"; + sha256 = "1fg7fn8a3bjbjr6bi298gqr4mr838v96bz9773pd7rnhffvvip8z"; + name = "kcachegrind-21.12.2.tar.xz"; }; }; kcalc = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcalc-21.12.1.tar.xz"; - sha256 = "0p7lxja6hhsnjihc94s9j7f210ag7i50gslifjh9cfk2ry1nqpnn"; - name = "kcalc-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcalc-21.12.2.tar.xz"; + sha256 = "037xk57gjfbjpw1q4gm9k1xkc3x5xxjr4d8xmnrnc6ni090648q4"; + name = "kcalc-21.12.2.tar.xz"; }; }; kcalutils = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcalutils-21.12.1.tar.xz"; - sha256 = "1ikwkgr2nki8vxvmv0vggm9x3900piq1wx6zps2zi6wqrs4d1hrm"; - name = "kcalutils-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcalutils-21.12.2.tar.xz"; + sha256 = "0i474by8pyv64b7i807kym2q4wkhnyyn21vn56dbgp1awpi198i8"; + name = "kcalutils-21.12.2.tar.xz"; }; }; kcharselect = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcharselect-21.12.1.tar.xz"; - sha256 = "10vrkaisim24mdqa9vz0i7gkm0qgshjcnbdqkgprnkx5xnsp30dm"; - name = "kcharselect-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcharselect-21.12.2.tar.xz"; + sha256 = "1czkni7wrl2l5v0zpvxfwdaqd5i0x6knzbjhzh8shdg3h19sgqrm"; + name = "kcharselect-21.12.2.tar.xz"; }; }; kcolorchooser = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcolorchooser-21.12.1.tar.xz"; - sha256 = "1cmyr94kxl6kmzx10w6ixi3q3czpc1wsspwsz5j5chwrwqzlrcx3"; - name = "kcolorchooser-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcolorchooser-21.12.2.tar.xz"; + sha256 = "12s2vfa3i7b5dh8c10xbqsy1xi9pq13vdj2xcpm5chkgw22595hv"; + name = "kcolorchooser-21.12.2.tar.xz"; }; }; kcron = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcron-21.12.1.tar.xz"; - sha256 = "095wwvm4b24d7nbx4mqlysiwpdjqs3f3qvv54adaj507z5b3wac7"; - name = "kcron-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcron-21.12.2.tar.xz"; + sha256 = "0ddgl61vw4mj8sa6zg1m4s6qagwygdkvw9pjmfs8fsa1anhlillk"; + name = "kcron-21.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kde-dev-scripts-21.12.1.tar.xz"; - sha256 = "00gsvra8gvfv6mwrvvna9rskh264svclr8h7zjspwvch0qgq0pqa"; - name = "kde-dev-scripts-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-scripts-21.12.2.tar.xz"; + sha256 = "1vdssqwyi25j3saz5cw8n40y2i6bhq5l0rxbarh8m3iwcvx4ki3c"; + name = "kde-dev-scripts-21.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kde-dev-utils-21.12.1.tar.xz"; - sha256 = "1pcxbyaz700jicahccpsy7kjrp30nmjf5cqqk7nyqaf07spbrd9i"; - name = "kde-dev-utils-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-utils-21.12.2.tar.xz"; + sha256 = "0flzc0kl252imng2mpg9mp71k8jrxc3yy7dzqlfdnpjz36dwpaqf"; + name = "kde-dev-utils-21.12.2.tar.xz"; }; }; kdebugsettings = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdebugsettings-21.12.1.tar.xz"; - sha256 = "12axjffxg5ap7yh9s573vyz4q7xi9nr4ggibvk8mxawwczmg9xyj"; - name = "kdebugsettings-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdebugsettings-21.12.2.tar.xz"; + sha256 = "0cimipq45c36nwk3alg738jl93zxja3xi77zjqk0k28ffn6qn7c2"; + name = "kdebugsettings-21.12.2.tar.xz"; }; }; kdeconnect-kde = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdeconnect-kde-21.12.1.tar.xz"; - sha256 = "1mw1nihy9b47msw23cr1chyrgwcm3cbf5sv90nmd9cc1ypnblw2c"; - name = "kdeconnect-kde-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdeconnect-kde-21.12.2.tar.xz"; + sha256 = "0crw0navhdsix0rpsya4vhffj35vlascpcflrs04vyws3v8xr026"; + name = "kdeconnect-kde-21.12.2.tar.xz"; }; }; kdeedu-data = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdeedu-data-21.12.1.tar.xz"; - sha256 = "1kbxhrlc64aqr0shik9p22fm6ldvy5jpk50x2nh5zkw4jylc8zh3"; - name = "kdeedu-data-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdeedu-data-21.12.2.tar.xz"; + sha256 = "1cpbi5gkbq7xrv276vm0jlcjc5y9x1kw8l8x0z7syy06s4s3pvg9"; + name = "kdeedu-data-21.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdegraphics-mobipocket-21.12.1.tar.xz"; - sha256 = "0m8clh313186nc3pmlii0020gv7612236nwww8sgqc3fsd4va91x"; - name = "kdegraphics-mobipocket-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-mobipocket-21.12.2.tar.xz"; + sha256 = "0zbiz47mqa176gcina8v03fw2qqrc5v1l8mg2fcpnl5dxc9d56c4"; + name = "kdegraphics-mobipocket-21.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdegraphics-thumbnailers-21.12.1.tar.xz"; - sha256 = "0y2619lcins553pmvigmgajfkrrvy2kqc2sbvacpl4r74qsdhax6"; - name = "kdegraphics-thumbnailers-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-thumbnailers-21.12.2.tar.xz"; + sha256 = "09adinkdfbn5hfic92zbdhq9ldxpnbgf9pybsp4ibpw2097l2k5f"; + name = "kdegraphics-thumbnailers-21.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdenetwork-filesharing-21.12.1.tar.xz"; - sha256 = "04z720q8nmylrh2rx1q8scaklcf7xaxiqvghkn0pfr0dd3vci3cy"; - name = "kdenetwork-filesharing-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdenetwork-filesharing-21.12.2.tar.xz"; + sha256 = "0q7gndwvki3r9vhkxmwr8xzc54cjpk9nzhk2665wsk1msfp3xqw6"; + name = "kdenetwork-filesharing-21.12.2.tar.xz"; }; }; kdenlive = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdenlive-21.12.1.tar.xz"; - sha256 = "1r3gxyx45531v79644q17lbl2ribiij4m5v39jfpys6vn8c6gmfw"; - name = "kdenlive-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdenlive-21.12.2.tar.xz"; + sha256 = "1h668q91pcq3km7pq75krgq06x8gglmp8al52b0imyc9g9wy28z6"; + name = "kdenlive-21.12.2.tar.xz"; }; }; kdepim-addons = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdepim-addons-21.12.1.tar.xz"; - sha256 = "1ksf05wagka9hr6p35j9r6r9hdmfx83mkv1v5blxbk9zq9mx3lhq"; - name = "kdepim-addons-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdepim-addons-21.12.2.tar.xz"; + sha256 = "00j67rvkvm1sri6ij5ziqjh340cmpsyfwwmw8hr1dsi3vlva4gk1"; + name = "kdepim-addons-21.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdepim-runtime-21.12.1.tar.xz"; - sha256 = "1pv9z0l3aafpcxgs98lc2dr4il8sp9v3p8xpqdi0ags478gi3x1x"; - name = "kdepim-runtime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdepim-runtime-21.12.2.tar.xz"; + sha256 = "0y1hgab16h9ypqh9isabbb4km2907vzdydfkd1m5b63vfbambz0j"; + name = "kdepim-runtime-21.12.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdesdk-kioslaves-21.12.1.tar.xz"; - sha256 = "0xxz9f9m5pxfmxnwqz1ygjz4m7gsrmh6jj54ha0k70jj4r43vq8i"; - name = "kdesdk-kioslaves-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-kioslaves-21.12.2.tar.xz"; + sha256 = "0vz6dk5an0bhnyglyqdgf3lqxdlc61k4vsbh8a4fky1zpvpwya84"; + name = "kdesdk-kioslaves-21.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdesdk-thumbnailers-21.12.1.tar.xz"; - sha256 = "0snncw0fgh5z1y6dkaaj45sf1r404123vxp4p16i06c8imbg50w5"; - name = "kdesdk-thumbnailers-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-thumbnailers-21.12.2.tar.xz"; + sha256 = "1w90zjnwnqh1a47kgmijr8xp6z096f6ij250qfcl3bwvhxqmsrb0"; + name = "kdesdk-thumbnailers-21.12.2.tar.xz"; }; }; kdev-php = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdev-php-21.12.1.tar.xz"; - sha256 = "1p1aq10613jifspnzmc92sq7bsyxc3z21dffrmz2a18iqharmgzv"; - name = "kdev-php-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdev-php-21.12.2.tar.xz"; + sha256 = "0ghxfllh8pkyrvsaz4iwc9bm98mkq6z3wr558w4wjykgjp69r08j"; + name = "kdev-php-21.12.2.tar.xz"; }; }; kdev-python = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdev-python-21.12.1.tar.xz"; - sha256 = "1d97bz06vncs15dclhclwqwc6da63c38qkla2z7yhf0iv3byb8kq"; - name = "kdev-python-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdev-python-21.12.2.tar.xz"; + sha256 = "05jj7q7agkgpbrxzwh0n2ipc854cgm8skjyjkqmxp2kdf3fdm8lj"; + name = "kdev-python-21.12.2.tar.xz"; }; }; kdevelop = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdevelop-21.12.1.tar.xz"; - sha256 = "1a2j79hw16ia1j6s6gs23d7jzkpx14hjgygsggxnjb0pxamyvxw7"; - name = "kdevelop-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdevelop-21.12.2.tar.xz"; + sha256 = "13kgkxvbjcb60ckapqrcr4m0y5kyag948xx6gwrvzhrhn46ynfgz"; + name = "kdevelop-21.12.2.tar.xz"; }; }; kdf = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdf-21.12.1.tar.xz"; - sha256 = "191gpfpd4x86vcx8g6yhz90xshfgsiw1374f06fn02mbd6fpswni"; - name = "kdf-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdf-21.12.2.tar.xz"; + sha256 = "1fs8bab6q7imfpqqgasvr98k57nm68ignfch2i76rdcywhx3q268"; + name = "kdf-21.12.2.tar.xz"; }; }; kdialog = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdialog-21.12.1.tar.xz"; - sha256 = "171aghc4fqkc5ac851wcpb6c49k53n9ba0g0ka6pr3k00jh4vsws"; - name = "kdialog-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdialog-21.12.2.tar.xz"; + sha256 = "1k6zlh1gbpj0y40h1i8pan28d8chqjsnhd6pvsvr95b91d0pj2xn"; + name = "kdialog-21.12.2.tar.xz"; }; }; kdiamond = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdiamond-21.12.1.tar.xz"; - sha256 = "1hx9c7a5kqaqpk89dfb2m8bqzvpar1ra7pfavxsqbxqyy9rvhiv1"; - name = "kdiamond-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdiamond-21.12.2.tar.xz"; + sha256 = "08b2a13bmxw3h6rhip619jvzgjrjgpz2v83i2azbqccfynisjnyh"; + name = "kdiamond-21.12.2.tar.xz"; }; }; keditbookmarks = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/keditbookmarks-21.12.1.tar.xz"; - sha256 = "1xbl9bp1blvhjhdsdc2w4smxz6pysh09ad9rjprm7mfx9sfwzlm1"; - name = "keditbookmarks-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/keditbookmarks-21.12.2.tar.xz"; + sha256 = "1fxm0mm3sqp2frk2fcs2jw86wjxb2j5z9vyb34x7g80k5j17j57m"; + name = "keditbookmarks-21.12.2.tar.xz"; }; }; kfind = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kfind-21.12.1.tar.xz"; - sha256 = "1366l63q476ch1f3mvfk20m3j90ili4l3r7dzxmsnivl0im1s1qh"; - name = "kfind-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kfind-21.12.2.tar.xz"; + sha256 = "0kx6p4hyyalx5i8g4aq81aj30c9ac0380xvia9130g95pgkzd96c"; + name = "kfind-21.12.2.tar.xz"; }; }; kfloppy = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kfloppy-21.12.1.tar.xz"; - sha256 = "0vxzhzk9jmrlxqn6pnnb5mvml6jr9q5dyh5dr8568i1bc08dcfwp"; - name = "kfloppy-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kfloppy-21.12.2.tar.xz"; + sha256 = "10245c87379576n11xcjkll3rkvzv815qsavr4alsj1jr8w6zyg8"; + name = "kfloppy-21.12.2.tar.xz"; }; }; kfourinline = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kfourinline-21.12.1.tar.xz"; - sha256 = "17lq16z97kzq4fnwarfz5d5m5n1jb2vzn7aizmw3p4ddqmg214sb"; - name = "kfourinline-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kfourinline-21.12.2.tar.xz"; + sha256 = "1kz7ff31h8lvz7snqmjs6cma9i3py7dyd91i6ik2pwiar80sin1x"; + name = "kfourinline-21.12.2.tar.xz"; }; }; kgeography = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kgeography-21.12.1.tar.xz"; - sha256 = "1frx4d3zga8pk56hpb7r13kd466iy7ihdda4gk98j59n4blvrqmx"; - name = "kgeography-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kgeography-21.12.2.tar.xz"; + sha256 = "09h5zp8pxzr47s7j50l6xfssvk9zk56cqgnsjx75yh1n077z1d0j"; + name = "kgeography-21.12.2.tar.xz"; }; }; kget = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kget-21.12.1.tar.xz"; - sha256 = "1jbnyx0bnvvgbglwnhv0y3lh12id7d80aixrxp6w13pcm3k21s3v"; - name = "kget-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kget-21.12.2.tar.xz"; + sha256 = "0jmy2yxzrgq592dq075k7gp7ynk42i899jsbw0gbn79x69cxlkmv"; + name = "kget-21.12.2.tar.xz"; }; }; kgoldrunner = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kgoldrunner-21.12.1.tar.xz"; - sha256 = "01may4xghilyk6vkv8g2n9bfvb2binyfv7qpm0fv0b4aqbv90ql8"; - name = "kgoldrunner-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kgoldrunner-21.12.2.tar.xz"; + sha256 = "0by6cq31jsls3qaqn4agrdhvd9jqg84plm6nbgh3rc85pnj5h22p"; + name = "kgoldrunner-21.12.2.tar.xz"; }; }; kgpg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kgpg-21.12.1.tar.xz"; - sha256 = "0qxd1pfm4fx37xc6v06j0k5ykqxs2p2x4r4ip4l95yhvgxixhy0i"; - name = "kgpg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kgpg-21.12.2.tar.xz"; + sha256 = "1f193fyn1azwhm7b8gd5ffyb11acg1269mh1d2ly60ax83qjs48c"; + name = "kgpg-21.12.2.tar.xz"; }; }; khangman = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/khangman-21.12.1.tar.xz"; - sha256 = "11acf9i65jqi1cmqbc13wfpdnnwws7srzzdq35np9hpghiw2rj1l"; - name = "khangman-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/khangman-21.12.2.tar.xz"; + sha256 = "0xih54w33vigvm3x2xp5lf29k4aga4yil0qv263965nxn9djnlaw"; + name = "khangman-21.12.2.tar.xz"; }; }; khelpcenter = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/khelpcenter-21.12.1.tar.xz"; - sha256 = "0nc555ap4nk7xijxz46cx7v0li3g8k5hxymlyqlw7lcapsk7l98l"; - name = "khelpcenter-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/khelpcenter-21.12.2.tar.xz"; + sha256 = "09ddkc7kiayx852mpgdmv04l19vrrc0yrf30hnyzkci58kbavvcq"; + name = "khelpcenter-21.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kidentitymanagement-21.12.1.tar.xz"; - sha256 = "1r3aac6k1dd85gc1qbzr1k1l7bj9kgmf0mmns2ba1g6zshnicdww"; - name = "kidentitymanagement-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kidentitymanagement-21.12.2.tar.xz"; + sha256 = "00fwjax3kfvr8jsy04hp1jyihvskvprbg83z2avhcy6lvr7g25kk"; + name = "kidentitymanagement-21.12.2.tar.xz"; }; }; kig = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kig-21.12.1.tar.xz"; - sha256 = "0245xlplgfc0nbxn5ppjg16gbcbdlkzyc600bngwjjhcw0psqqls"; - name = "kig-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kig-21.12.2.tar.xz"; + sha256 = "100ds4728lfnb6r6c52rdzk2n4rcpc5jiv35q5qd7d6cszmxvhvx"; + name = "kig-21.12.2.tar.xz"; }; }; kigo = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kigo-21.12.1.tar.xz"; - sha256 = "0a9fwbnr1z56lcmv2cgkv1l1spfr5kc4flf9xi1223xjzi31mkmx"; - name = "kigo-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kigo-21.12.2.tar.xz"; + sha256 = "0g1sl7bw9aln7fm2786sgh0m44da6vfxc9g0rizw31ff8papnyb8"; + name = "kigo-21.12.2.tar.xz"; }; }; killbots = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/killbots-21.12.1.tar.xz"; - sha256 = "0szy101shr2zir1alc21ylv746w2pgczh2cl9hg9g9gg9fkj4f06"; - name = "killbots-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/killbots-21.12.2.tar.xz"; + sha256 = "1qryy2g2i6iqc6rsw8jz4c14x67glpm3zvcx2dghyll6q9hns43z"; + name = "killbots-21.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kimagemapeditor-21.12.1.tar.xz"; - sha256 = "1rgd3qsfsf1kdlidhp43kvkqjlfnjr7vdzl8wdgsl4z01xb3yy59"; - name = "kimagemapeditor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kimagemapeditor-21.12.2.tar.xz"; + sha256 = "11j55jvfxdpam3gkfv7355av9d6mz8z6djhplhmfd56llkmvw4n2"; + name = "kimagemapeditor-21.12.2.tar.xz"; }; }; kimap = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kimap-21.12.1.tar.xz"; - sha256 = "1wkygpxdz6407pdllcdw36p83p6jk0j8jf3jzqak9ksql5qdg04p"; - name = "kimap-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kimap-21.12.2.tar.xz"; + sha256 = "0sdas8knk6wa8hhgc3w62famdpq6pcxfhl4vmpw0r3aqskaci4q3"; + name = "kimap-21.12.2.tar.xz"; }; }; kio-extras = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kio-extras-21.12.1.tar.xz"; - sha256 = "0pshm9pjssj5drzg2q5351442h9izbmp41d3fxjx431cc1jm8zfc"; - name = "kio-extras-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kio-extras-21.12.2.tar.xz"; + sha256 = "0133cww4k2svn7cvw0fbdcwwv0zg09d27gz59gkpfswjmpsxdqj4"; + name = "kio-extras-21.12.2.tar.xz"; }; }; kio-gdrive = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kio-gdrive-21.12.1.tar.xz"; - sha256 = "018lr2mp1km5ki650bmmkjm94a6i0h5a898vhwxgl9a7yfpr52j6"; - name = "kio-gdrive-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kio-gdrive-21.12.2.tar.xz"; + sha256 = "1n3khrx5fczffwzg4bzxjhzy2kxf72dmb7fqs9hqfn1qkaahfv49"; + name = "kio-gdrive-21.12.2.tar.xz"; }; }; kipi-plugins = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kipi-plugins-21.12.1.tar.xz"; - sha256 = "1dadrg8dd1plawsq3h3vn4g7a640qh6pb1wp3l8vcsmiqkabrfkh"; - name = "kipi-plugins-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kipi-plugins-21.12.2.tar.xz"; + sha256 = "11f3qmgqxdlzvv2zldjawn7a3kdigj5pb535rc9v9a8fp8mjvk88"; + name = "kipi-plugins-21.12.2.tar.xz"; }; }; kirigami-gallery = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kirigami-gallery-21.12.1.tar.xz"; - sha256 = "0s5pj18sc2hm2nggwbqp4x6f56ca1dqx1nbcspwfq287i0csl82k"; - name = "kirigami-gallery-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kirigami-gallery-21.12.2.tar.xz"; + sha256 = "0rg9lg4iqxycfbhs62qs4ms4qadz1ii1dcv3ykkgn3w2brx77wad"; + name = "kirigami-gallery-21.12.2.tar.xz"; }; }; kiriki = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kiriki-21.12.1.tar.xz"; - sha256 = "09r40sq0sa6w4pwc6fl13dfxlc0nns7j5d4fdnv8i2wiqx6jc1cg"; - name = "kiriki-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kiriki-21.12.2.tar.xz"; + sha256 = "1blj3vl87jdrr8qv2cyng20nr4d54gbk7w72z9rl02l62c9gkw5j"; + name = "kiriki-21.12.2.tar.xz"; }; }; kiten = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kiten-21.12.1.tar.xz"; - sha256 = "091l4r97ps9xmca499y9c95qihdcf2jcrfgahgzp4mkcps09w5ac"; - name = "kiten-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kiten-21.12.2.tar.xz"; + sha256 = "18kxqrhfgch32583ra4422h7csd5ajijf9989bxz9hwi9mn3r2vl"; + name = "kiten-21.12.2.tar.xz"; }; }; kitinerary = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kitinerary-21.12.1.tar.xz"; - sha256 = "0dirkp2qd2ihyjj0nwqpakwvh3par0m3z5q2z7qjz1527k0k00ww"; - name = "kitinerary-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kitinerary-21.12.2.tar.xz"; + sha256 = "0g7z6408nhrv54h6xxd2rd9wj2hmwzc3lg5risyqbg2zii9j0sp2"; + name = "kitinerary-21.12.2.tar.xz"; }; }; kjumpingcube = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kjumpingcube-21.12.1.tar.xz"; - sha256 = "0bnvvhnqcx767j6kmi19mgvab8srrzbw8y6w1qbqj85lq91wq1dr"; - name = "kjumpingcube-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kjumpingcube-21.12.2.tar.xz"; + sha256 = "1abv3yi716n88b19rmimhw0vnnwyw28ab6fbcy9g1lgpbi69g5ax"; + name = "kjumpingcube-21.12.2.tar.xz"; }; }; kldap = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kldap-21.12.1.tar.xz"; - sha256 = "12hcls5g80s0y0nlnp0jcd7q0bxx9wq39v44x5a011rivkab8qbx"; - name = "kldap-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kldap-21.12.2.tar.xz"; + sha256 = "1xda42f1q5ih3hdhmcbdz0fx2nchirlwips3gq0jb6lfzi5dbqpl"; + name = "kldap-21.12.2.tar.xz"; }; }; kleopatra = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kleopatra-21.12.1.tar.xz"; - sha256 = "0hk7af4gsy63vjbn16lp7b6qr15cnygxjic6p98bd5zajnx77899"; - name = "kleopatra-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kleopatra-21.12.2.tar.xz"; + sha256 = "1b2nq823gq1v20dnh3hm298fva7cmbn9hh0kmbq22kh98kv8chhh"; + name = "kleopatra-21.12.2.tar.xz"; }; }; klettres = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/klettres-21.12.1.tar.xz"; - sha256 = "04mwl6n0361vgyb6p9xp5m3223h7f09w6sr90998smws98bmgpd4"; - name = "klettres-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/klettres-21.12.2.tar.xz"; + sha256 = "1wi1byr36x7z9scsy1gffna36m8x9vyfcqzndvx6042i2y0smhwz"; + name = "klettres-21.12.2.tar.xz"; }; }; klickety = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/klickety-21.12.1.tar.xz"; - sha256 = "1mzvgjdxm2y34w37s548cg7ri2yjqn49rmqyaafw7bnv9qfyky3v"; - name = "klickety-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/klickety-21.12.2.tar.xz"; + sha256 = "19rn9p7cbxhn471b65nhwhpnfnhykjwj6n5lrsd431391dyhvshc"; + name = "klickety-21.12.2.tar.xz"; }; }; klines = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/klines-21.12.1.tar.xz"; - sha256 = "18lbnfsx05vnmzjw9iqdi5kck9zrkrdknk6bysa5pc16cgmai9z8"; - name = "klines-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/klines-21.12.2.tar.xz"; + sha256 = "1r004rsy98lxh5vd3r4bc0l4d7ymija13barg9xglj53xzbyij3k"; + name = "klines-21.12.2.tar.xz"; }; }; kmag = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmag-21.12.1.tar.xz"; - sha256 = "1v5zmy3q3ipi9nd8yrrv84x1mk4mpb770r833pwwn6bwdfr8xq8h"; - name = "kmag-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmag-21.12.2.tar.xz"; + sha256 = "03kzahsr80wnbx6ky112ka3zm01pnc5h85l28a4186617swx344l"; + name = "kmag-21.12.2.tar.xz"; }; }; kmahjongg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmahjongg-21.12.1.tar.xz"; - sha256 = "02nfgqlhzph1svf54ph3avhx7wvplqgzqhazvrrsz7ikj5qcq9pl"; - name = "kmahjongg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmahjongg-21.12.2.tar.xz"; + sha256 = "1w8v6fchrkvsbyvnx8vvs801cvg52pr78ihvdjv6c0vpd0q7z9rz"; + name = "kmahjongg-21.12.2.tar.xz"; }; }; kmail = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmail-21.12.1.tar.xz"; - sha256 = "17wyrdl6lxcds4whh2nlacq0m6mmw13z6a79j8047svmnpz97nrx"; - name = "kmail-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmail-21.12.2.tar.xz"; + sha256 = "003bnp00figa09qcp2hl45sivdk3d0j3amxdidyrn47q9vy40554"; + name = "kmail-21.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmail-account-wizard-21.12.1.tar.xz"; - sha256 = "1i2jd50c5scd6vxfxc975lvyqxifmjz4a1cz0hk67smcdh8nbqkn"; - name = "kmail-account-wizard-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmail-account-wizard-21.12.2.tar.xz"; + sha256 = "1nmg8qns3iglcc4l4g5nffnji1vgg43a9fa9rz1hacvlkarm98m4"; + name = "kmail-account-wizard-21.12.2.tar.xz"; }; }; kmailtransport = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmailtransport-21.12.1.tar.xz"; - sha256 = "0mng5q0xvlbj9cx5myf65i0056s2l5mhsqycp13x6b2kyvna5bd2"; - name = "kmailtransport-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmailtransport-21.12.2.tar.xz"; + sha256 = "0rs6qihzy8q2n204zkhakgnjxwqy9pz9i0kv1j3amw2xv3f51rvw"; + name = "kmailtransport-21.12.2.tar.xz"; }; }; kmbox = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmbox-21.12.1.tar.xz"; - sha256 = "1d5wwb1m0zic8lhnn6aiyhwihzh527xpjswdriq4ngkil95y994a"; - name = "kmbox-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmbox-21.12.2.tar.xz"; + sha256 = "1mfwaw4d480kbb60wb0kvl5z35ly2hn6h73kx9wdb5y7mz05rvn1"; + name = "kmbox-21.12.2.tar.xz"; }; }; kmime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmime-21.12.1.tar.xz"; - sha256 = "0821zvgsfmv5ijjz1ih9irik46j1yaqwzccmfggdvd7nc5nc1x61"; - name = "kmime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmime-21.12.2.tar.xz"; + sha256 = "0qxb0gf4pqfa0540fsbnf24nh9qwiamwl65q7vaanb80b211qp2g"; + name = "kmime-21.12.2.tar.xz"; }; }; kmines = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmines-21.12.1.tar.xz"; - sha256 = "1pp1ynj7i4859r4rab5xph4glrlihn9ig465jlqh5jz0cg8w58zc"; - name = "kmines-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmines-21.12.2.tar.xz"; + sha256 = "0dsqlqmbaggab38zzjyhnx318sn2mw6y51k52c7blm2l53a8zp3j"; + name = "kmines-21.12.2.tar.xz"; }; }; kmix = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmix-21.12.1.tar.xz"; - sha256 = "1c9ing19g27d7qqm5m171lff0a35vcn3yn4spwx1bm7y9md44964"; - name = "kmix-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmix-21.12.2.tar.xz"; + sha256 = "0fyjzzv6x9xf0g222jjsvrywnm3blhbzm2zwhxagrfkjvjpb2cvk"; + name = "kmix-21.12.2.tar.xz"; }; }; kmousetool = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmousetool-21.12.1.tar.xz"; - sha256 = "0ivk9rdwy7hgi4j4bxm5padlw6w0ldij29yjcpc0501ld9jjkyzx"; - name = "kmousetool-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmousetool-21.12.2.tar.xz"; + sha256 = "1hh7sql04hpwvb8hbi7snvh2d6922a2yraah9hd1jiwniv3cv175"; + name = "kmousetool-21.12.2.tar.xz"; }; }; kmouth = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmouth-21.12.1.tar.xz"; - sha256 = "1mkdgidyvfci9hilfnilvc3ymzyzknib5bbqf4bn87xjnhkv68sy"; - name = "kmouth-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmouth-21.12.2.tar.xz"; + sha256 = "0vxssxchh23bl237qw9pznbrkwyqx1bhbnp2fq9baw1bn88d18i5"; + name = "kmouth-21.12.2.tar.xz"; }; }; kmplot = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmplot-21.12.1.tar.xz"; - sha256 = "1dn3sxqi8k3p28q4076bjsxb0qlmrvw8jk045axi2q7yc1f343r5"; - name = "kmplot-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmplot-21.12.2.tar.xz"; + sha256 = "025n51s7i5nr63knsd78pg48wfs4cldhplr68jmwv2k8pb5w9kxs"; + name = "kmplot-21.12.2.tar.xz"; }; }; knavalbattle = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knavalbattle-21.12.1.tar.xz"; - sha256 = "1a5gpy601842kd9ybwbsxajmj09pmmna6k6wq6crbhzca0i4hgby"; - name = "knavalbattle-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knavalbattle-21.12.2.tar.xz"; + sha256 = "1z1qqr5jjinm49p7rhr0pzf8ir2nvdq157zqxnnr6i11xqk2mnkj"; + name = "knavalbattle-21.12.2.tar.xz"; }; }; knetwalk = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knetwalk-21.12.1.tar.xz"; - sha256 = "1ifgc89sfjd98g34vg2aqwhmpb63w75kh9yi7dkb9vlv8c90v46h"; - name = "knetwalk-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knetwalk-21.12.2.tar.xz"; + sha256 = "1gnir7h1iam51frdajp4h6xw4biz545nljdfcck17jiw6ad9py4j"; + name = "knetwalk-21.12.2.tar.xz"; }; }; knights = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knights-21.12.1.tar.xz"; - sha256 = "1nfb096859r47c1n7bifsc23qfqx7xvl9wdhp8lgyc7hv85mz10j"; - name = "knights-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knights-21.12.2.tar.xz"; + sha256 = "0k9hqgz3zw7vhrgbwnmy0v3j9kflz6wx8wavckg1i2l4qadprc1y"; + name = "knights-21.12.2.tar.xz"; }; }; knotes = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knotes-21.12.1.tar.xz"; - sha256 = "15yvddywsfybdyqhv90hs2c51vn9vcvdp79wfcz197hn98pswidw"; - name = "knotes-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knotes-21.12.2.tar.xz"; + sha256 = "0f8ra6nkgndgkfnw194y5976kkrm7qdj1w7l27znwalzaydnxvjg"; + name = "knotes-21.12.2.tar.xz"; }; }; kolf = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kolf-21.12.1.tar.xz"; - sha256 = "073kzsr561fs2kf98chbkhzp84c9fpgr9wja5bq3d9xm937bad69"; - name = "kolf-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kolf-21.12.2.tar.xz"; + sha256 = "0as18rc45daak3xsmwn6k789yni46nsdkv83bfmbj3jcjhzv9x5k"; + name = "kolf-21.12.2.tar.xz"; }; }; kollision = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kollision-21.12.1.tar.xz"; - sha256 = "11z65wcxqz7mczy4h6yyfafd1d8cl4cvh2hv3i3vwnvks21853cy"; - name = "kollision-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kollision-21.12.2.tar.xz"; + sha256 = "1ycim9gjn9p6w6yyzsipqn7zpvi946s287mp4br35zavsf25gzn0"; + name = "kollision-21.12.2.tar.xz"; }; }; kolourpaint = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kolourpaint-21.12.1.tar.xz"; - sha256 = "0k3whydhkgwjk3rs9jjcxphdb6p1yc1crjb5sn3izhr2xmnvinsr"; - name = "kolourpaint-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kolourpaint-21.12.2.tar.xz"; + sha256 = "0z53hp31sq4ksarvpzqmx9f3gac8ygrcj0ncppgbwwjkq63wr6v1"; + name = "kolourpaint-21.12.2.tar.xz"; }; }; kompare = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kompare-21.12.1.tar.xz"; - sha256 = "0zd7hnsvx4mnnva6lvffmlgawnvjqzyz06hy466wlwckn08hrap1"; - name = "kompare-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kompare-21.12.2.tar.xz"; + sha256 = "0ps6ng77kzcqf6b2sh8xmqh5d4jwkmj3qnbyxh4v4xxjbwy0mrwm"; + name = "kompare-21.12.2.tar.xz"; }; }; konqueror = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konqueror-21.12.1.tar.xz"; - sha256 = "1v0f1snxc3i7pabn53dyzw7zpc2hjqj64xdqyfz0fy79myfrpx39"; - name = "konqueror-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konqueror-21.12.2.tar.xz"; + sha256 = "0ia8qqas9x261ixa6jzih273ypqhdv5hijk042bcdmqd1z1s4n55"; + name = "konqueror-21.12.2.tar.xz"; }; }; konquest = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konquest-21.12.1.tar.xz"; - sha256 = "0515wkdpw4cxxsddw4a7n5hl7n2qw487qalpzjrsmm5vfn0sjzay"; - name = "konquest-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konquest-21.12.2.tar.xz"; + sha256 = "1arxp4x8pcmv8yqg1xy5b23avh5a7x660vvh6kaviimysad5wmc5"; + name = "konquest-21.12.2.tar.xz"; }; }; konsole = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konsole-21.12.1.tar.xz"; - sha256 = "0pasxvvjhgg2cl3nfsd6wrpd40jw3rjfcgzgzsr5npflkpqnhszl"; - name = "konsole-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konsole-21.12.2.tar.xz"; + sha256 = "00gyzhcacd3467sv5ijihqva7pnvcy1chywfpy8qh2hcdkkvyfxa"; + name = "konsole-21.12.2.tar.xz"; }; }; kontact = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kontact-21.12.1.tar.xz"; - sha256 = "0dhnrw87z80xf801mq1cm2slbqrhsfnkd0xfbfaan3vc1h5gsw0x"; - name = "kontact-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kontact-21.12.2.tar.xz"; + sha256 = "16ld08sx5lvrm9r0ync7r8bpd540gxsssvhxj5p43chq6b9hr5lm"; + name = "kontact-21.12.2.tar.xz"; }; }; kontactinterface = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kontactinterface-21.12.1.tar.xz"; - sha256 = "04zp5kz8l3dbxzdxaw3s11hqn3lg01n6saijp1l2sivkgf80wpna"; - name = "kontactinterface-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kontactinterface-21.12.2.tar.xz"; + sha256 = "1qvjm27v797hcdqbr6jwdkwn3vpsy3f1i92slrwks03zj498ydlj"; + name = "kontactinterface-21.12.2.tar.xz"; }; }; kontrast = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kontrast-21.12.1.tar.xz"; - sha256 = "16gry5mq7qkwdhwqrhd1hwf6q8v4j76di37kyphxzhsf6csx5zsz"; - name = "kontrast-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kontrast-21.12.2.tar.xz"; + sha256 = "0mk2i2x1yz0ykbnqvdbdpi9kplyzjxlwhhsvl4rbq0726g3q6pas"; + name = "kontrast-21.12.2.tar.xz"; }; }; konversation = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konversation-21.12.1.tar.xz"; - sha256 = "0scc7xy4clicd6y037fv5cvifankam415cdbn3z56l10bg4h1f1f"; - name = "konversation-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konversation-21.12.2.tar.xz"; + sha256 = "0lpkah6z12c4f77z6r5z31q5np3xwyb3y6xnsv1iq1rdzj0daxch"; + name = "konversation-21.12.2.tar.xz"; }; }; kopeninghours = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kopeninghours-21.12.1.tar.xz"; - sha256 = "1i1s6xafnna87qn9asnkvaqq22b33jwcdh3s8d8ymvzcd9nch9ck"; - name = "kopeninghours-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kopeninghours-21.12.2.tar.xz"; + sha256 = "1s4wcnk7p0vjqdhyf8131l3s6bn86gfkwl45zwpi7lpyacwgdf6k"; + name = "kopeninghours-21.12.2.tar.xz"; }; }; kopete = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kopete-21.12.1.tar.xz"; - sha256 = "13bc63xaq65bpa3dxjxhg96dvd6kvzj3dis8270saj8cw9kjxhv7"; - name = "kopete-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kopete-21.12.2.tar.xz"; + sha256 = "1py45nk6bv5x2hnfzh5srq17lprkqrmpqr2h0fpmkmffx66njz5q"; + name = "kopete-21.12.2.tar.xz"; }; }; korganizer = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/korganizer-21.12.1.tar.xz"; - sha256 = "0r61v3vis7accnd6irap9ifcld0cd49qfk5h7ajc7vywq1vwjg6d"; - name = "korganizer-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/korganizer-21.12.2.tar.xz"; + sha256 = "1kablp0x65jmdz5n3y19rgplcvvmq8vxz0ljw7lkrwr3pvvhyv3q"; + name = "korganizer-21.12.2.tar.xz"; }; }; kosmindoormap = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kosmindoormap-21.12.1.tar.xz"; - sha256 = "0zrj0cigyy4hgq8lz1kbs7xyjz9b63c37h3r4avq0fpvfqgqzx8k"; - name = "kosmindoormap-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kosmindoormap-21.12.2.tar.xz"; + sha256 = "0max3mfwd5x8m3kqybnkrb4v93rdk1r007xw31l52j2rq2gh8pj2"; + name = "kosmindoormap-21.12.2.tar.xz"; }; }; kpat = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpat-21.12.1.tar.xz"; - sha256 = "14jx595y3r19g4szks5jkxgl307qicdvwqc594k3xwghn1xcajy2"; - name = "kpat-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpat-21.12.2.tar.xz"; + sha256 = "0vra8n9xsba67as0ybmbjy235v3s7dmrwlf18avnb3ygxy0h8swf"; + name = "kpat-21.12.2.tar.xz"; }; }; kpimtextedit = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpimtextedit-21.12.1.tar.xz"; - sha256 = "1ljs4cs8ld9bv7xkw6jlbrhrl3f908pcj4z8g1i0rd1q9ygcwanr"; - name = "kpimtextedit-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpimtextedit-21.12.2.tar.xz"; + sha256 = "06d42k433dvkfrnzfdx0b1qarrnmhnb4gyq7vgy6251ah8smild8"; + name = "kpimtextedit-21.12.2.tar.xz"; }; }; kpkpass = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpkpass-21.12.1.tar.xz"; - sha256 = "0ah5gc8d9j3x7y7l93ga63yqp9v77xwmnrx9xs45jlq07vzwcnbw"; - name = "kpkpass-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpkpass-21.12.2.tar.xz"; + sha256 = "0p2l1z4blfq1iz3x9cnwwx2p9cs6bb4vw1csj29s09i6237ippzx"; + name = "kpkpass-21.12.2.tar.xz"; }; }; kpmcore = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpmcore-21.12.1.tar.xz"; - sha256 = "16kk135bdlbi897ly5spjmqvkx9ikps002lcij98n89k95c8qzkp"; - name = "kpmcore-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpmcore-21.12.2.tar.xz"; + sha256 = "1iyirvf04br0r8vclcpx0qrlm8wgqm9ww6xds3h9qjyqj1w8ng41"; + name = "kpmcore-21.12.2.tar.xz"; }; }; kpublictransport = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpublictransport-21.12.1.tar.xz"; - sha256 = "1vjgzrli8h5h9kykj2lz4la3k4cm45bvvar3qky8p1x21d4snmzf"; - name = "kpublictransport-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpublictransport-21.12.2.tar.xz"; + sha256 = "02ffpgki4mdyczxa5bqb9wmg2c6anwxnsmlfdn1k47ry7ny2k9sl"; + name = "kpublictransport-21.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kqtquickcharts-21.12.1.tar.xz"; - sha256 = "0dh14ajprxxk7w2bi8hiqs5a7mdf6fvhdzipz608ic9bjg845avs"; - name = "kqtquickcharts-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kqtquickcharts-21.12.2.tar.xz"; + sha256 = "1sjm1vaksvp73866w09xadd1d0lakh00fwiic498siws4dvhhpif"; + name = "kqtquickcharts-21.12.2.tar.xz"; }; }; krdc = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/krdc-21.12.1.tar.xz"; - sha256 = "0azm1jwqlf2dz8kd8zi0iasy84kdy87p6r7896nsxlhqc4igcz2l"; - name = "krdc-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/krdc-21.12.2.tar.xz"; + sha256 = "005i3a7l9aq63nxsivj28kzjy2zdl759snwm56cgwq9rgc6sc003"; + name = "krdc-21.12.2.tar.xz"; }; }; kreversi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kreversi-21.12.1.tar.xz"; - sha256 = "1wdzf8zdhxy7azbainvq69wjc847ixd2lmqvnhfdrvgz66flrzsg"; - name = "kreversi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kreversi-21.12.2.tar.xz"; + sha256 = "03b4c28297dzdzplmg818r27r9gpqj48rha9884h22fz9davgmhw"; + name = "kreversi-21.12.2.tar.xz"; }; }; krfb = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/krfb-21.12.1.tar.xz"; - sha256 = "0l7g43scycr95b9rfm5rqidqz8f15mhadp1avgr6nr0r86h2pgvy"; - name = "krfb-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/krfb-21.12.2.tar.xz"; + sha256 = "1989q0mig516hz0lbq2m8p85x8ikpyrhj36cvq4c32sd2nasxkvc"; + name = "krfb-21.12.2.tar.xz"; }; }; kross-interpreters = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kross-interpreters-21.12.1.tar.xz"; - sha256 = "08gdfrf2g9z74zlp3mnqsl0x47a173ibzfxy80kar1hzf0r87gkm"; - name = "kross-interpreters-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kross-interpreters-21.12.2.tar.xz"; + sha256 = "14j7z6lwl0j7zdz29c1kjyhw0my6qfgnyxibwn9z87paxl8nv6z0"; + name = "kross-interpreters-21.12.2.tar.xz"; }; }; kruler = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kruler-21.12.1.tar.xz"; - sha256 = "09cypq0yrrm5075p1y9js26qcy582w9gx2xzif2sr8fi77fsxfd2"; - name = "kruler-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kruler-21.12.2.tar.xz"; + sha256 = "1w5dw3qda69d4ycbiaj18gfn6w28dj2lc37x2d86kx5skv8adxbw"; + name = "kruler-21.12.2.tar.xz"; }; }; kshisen = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kshisen-21.12.1.tar.xz"; - sha256 = "0nh25l9prhq1lzh2dafj84pry726441m6iqhbcyswr5g0cbl16qf"; - name = "kshisen-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kshisen-21.12.2.tar.xz"; + sha256 = "0wjr9fnkmbylfq13zy3hifr4byj4y46f8cwh0w61ypgc0wjxnhhg"; + name = "kshisen-21.12.2.tar.xz"; }; }; ksirk = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksirk-21.12.1.tar.xz"; - sha256 = "1qx0s2svvb3db9724pvm9cpqby5mqhyfl138q67qr9sr4bg10znm"; - name = "ksirk-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksirk-21.12.2.tar.xz"; + sha256 = "1lif8n8n2pj4vaf7zifqj7mjv5dbhki75wbwjd4q061wpr434vfj"; + name = "ksirk-21.12.2.tar.xz"; }; }; ksmtp = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksmtp-21.12.1.tar.xz"; - sha256 = "128c6bfqpmaqaz95vlrhszavyp0dyk0bvakj2v5aliwgzzpp64lq"; - name = "ksmtp-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksmtp-21.12.2.tar.xz"; + sha256 = "0hg5g401map67kjcgrd1a07iwyss5jnryhpsajffwz19sra855jp"; + name = "ksmtp-21.12.2.tar.xz"; }; }; ksnakeduel = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksnakeduel-21.12.1.tar.xz"; - sha256 = "08wb50ryrygggc0hhk8nsb8bqh8i4r0p90g8mq4698pnjzkwxmdl"; - name = "ksnakeduel-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksnakeduel-21.12.2.tar.xz"; + sha256 = "0rdbsyfd3bink5cb0k5l713jw4syhz82kchn95cbg5zgc2iclfw4"; + name = "ksnakeduel-21.12.2.tar.xz"; }; }; kspaceduel = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kspaceduel-21.12.1.tar.xz"; - sha256 = "1qnqs0vn469syhxjw811s1r9nk803ilprfmhz64d9hzr2vjj75jc"; - name = "kspaceduel-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kspaceduel-21.12.2.tar.xz"; + sha256 = "1kmwn55a4555g5m21jcr88k3f9aj87yifgrab6sx6gcw5q51d7vz"; + name = "kspaceduel-21.12.2.tar.xz"; }; }; ksquares = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksquares-21.12.1.tar.xz"; - sha256 = "011xgs4fjf05sa268jx1026xxfkhn5gv3nzzcdp5b7gjz3ml8imv"; - name = "ksquares-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksquares-21.12.2.tar.xz"; + sha256 = "12k09lasxyaxq4bp4fhczj8bpi8l6h1gn4nj6ka3zbc4mxxz34yc"; + name = "ksquares-21.12.2.tar.xz"; }; }; ksudoku = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksudoku-21.12.1.tar.xz"; - sha256 = "05annym6898p2db209zdvs8y1an5mdj4750166wbki2kwblbmy2s"; - name = "ksudoku-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksudoku-21.12.2.tar.xz"; + sha256 = "1din2i3d9lhca5kw06ivixgk2prh1kfy8ikm0byl8qaqj4v89lji"; + name = "ksudoku-21.12.2.tar.xz"; }; }; ksystemlog = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksystemlog-21.12.1.tar.xz"; - sha256 = "1rq99fy5c3asvrldwvbg2qblicij3jswbj3vddbqs1zfdcxfy55l"; - name = "ksystemlog-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksystemlog-21.12.2.tar.xz"; + sha256 = "0cvx13859bm4kfz75iia3chzi5pbbv70lkmspvjpa6cpsn05zy53"; + name = "ksystemlog-21.12.2.tar.xz"; }; }; kteatime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kteatime-21.12.1.tar.xz"; - sha256 = "13apl34vz40gh8h3p7l8a3hmlc19gil5kkfayg5lnzbikmzvc82y"; - name = "kteatime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kteatime-21.12.2.tar.xz"; + sha256 = "1m7ni3w82lqykgs5qfi0a43p9973244k8lr6rk30x7w551rc7yyw"; + name = "kteatime-21.12.2.tar.xz"; }; }; ktimer = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktimer-21.12.1.tar.xz"; - sha256 = "0rmji8z5skj73rnibicy4awa12iylhy1j63c9rf31l3sqvc6dbdm"; - name = "ktimer-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktimer-21.12.2.tar.xz"; + sha256 = "0jprayxn54pw7brrcb1b70y5sal9j6pfpwrphd2nyw5rkb2a484l"; + name = "ktimer-21.12.2.tar.xz"; }; }; ktnef = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktnef-21.12.1.tar.xz"; - sha256 = "0iql7nxh1hlpv8f5qa0w566jibvbfhzmc7qzcady06i6wzvbvivs"; - name = "ktnef-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktnef-21.12.2.tar.xz"; + sha256 = "0cl589z0v6h1z3aszk4160y99gpihpk203rn73dmb7c6qsk11cbl"; + name = "ktnef-21.12.2.tar.xz"; }; }; ktorrent = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktorrent-21.12.1.tar.xz"; - sha256 = "0bldsl3ikdypis2vjzzk137spy9hsqj74vkq376klzyn3pjnnxj7"; - name = "ktorrent-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktorrent-21.12.2.tar.xz"; + sha256 = "1zwakqp5j2795j4pln4sq595bc2zlw8cy8qdzwj365clfbpcbyc3"; + name = "ktorrent-21.12.2.tar.xz"; }; }; ktouch = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktouch-21.12.1.tar.xz"; - sha256 = "0875iiaa7c3ij1cgdd5lyj69rzpgwhvwm19iycjbq7pn4254qz3l"; - name = "ktouch-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktouch-21.12.2.tar.xz"; + sha256 = "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl"; + name = "ktouch-21.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-accounts-kcm-21.12.1.tar.xz"; - sha256 = "06zakwv6vxs5my79n4gxq0m2ha5358kpp8s57zyh59cfsz42gi0b"; - name = "ktp-accounts-kcm-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-accounts-kcm-21.12.2.tar.xz"; + sha256 = "14niidb9kza6sms9rhhnvrba6rdwhc890b5inmlhdllnqbdrrcbl"; + name = "ktp-accounts-kcm-21.12.2.tar.xz"; }; }; ktp-approver = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-approver-21.12.1.tar.xz"; - sha256 = "0dkqd3apzmip5kilws9zx922skz31g1rz158ayxnf64mw1wqbb9g"; - name = "ktp-approver-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-approver-21.12.2.tar.xz"; + sha256 = "11scv978silxrprkyd66b4xkdww05xpgk8kvrknlwp33rmhm05sn"; + name = "ktp-approver-21.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-auth-handler-21.12.1.tar.xz"; - sha256 = "1i83rzv7f581ly4baqqfgn6hnvyq7a8pp5wpwz6fqk8nhqsk1fi0"; - name = "ktp-auth-handler-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-auth-handler-21.12.2.tar.xz"; + sha256 = "006an8bva8zawnirv3ai3kjb59ffgany124ip546r5wg06zkk069"; + name = "ktp-auth-handler-21.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-call-ui-21.12.1.tar.xz"; - sha256 = "0wlyrdn55zwpfxm9mdf8w01z2v2j35va9k35bg8ih4rq4dq4dgrz"; - name = "ktp-call-ui-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-call-ui-21.12.2.tar.xz"; + sha256 = "0n8yirlsig37839rl73azg8vf8ppdxlf1dqgkf5bz8g3jcs92gcm"; + name = "ktp-call-ui-21.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-common-internals-21.12.1.tar.xz"; - sha256 = "0lsa2fsd84pq14xlij5951j9szwq7afffx2zkmx4ssfaiqhm048b"; - name = "ktp-common-internals-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-common-internals-21.12.2.tar.xz"; + sha256 = "0c7kfrgf8bqm7q9hp9fd8q49vakiihzl0dgdklpvgly48zfa2yan"; + name = "ktp-common-internals-21.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-contact-list-21.12.1.tar.xz"; - sha256 = "1w42pm6k5sil1ylmzsl615q7kkw7kjl3bjj5xcz8ysf2m9w6c3xc"; - name = "ktp-contact-list-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-list-21.12.2.tar.xz"; + sha256 = "0pw5kl0lh0ph3y9hyws7h7phh475lw07gydxxjsfxsd4nb70hkz8"; + name = "ktp-contact-list-21.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-contact-runner-21.12.1.tar.xz"; - sha256 = "0rlvavvdpa8bqv494b7dsrdib1f2xvic4l67v4z07bj9c53dj4x2"; - name = "ktp-contact-runner-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-runner-21.12.2.tar.xz"; + sha256 = "0as41gba7ra65i6ml8j8fqh70x165cnmp9ry13ijrdf9vx21a45k"; + name = "ktp-contact-runner-21.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-desktop-applets-21.12.1.tar.xz"; - sha256 = "1aig58wv6lrz9x2rmjd2qk9hff91bkjqw6ixn9f12yh7vgckp1ba"; - name = "ktp-desktop-applets-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-desktop-applets-21.12.2.tar.xz"; + sha256 = "0675hlcjq6xyzl1sz3a45inc3g69z5ilxyhhicxns8by3ydmb82x"; + name = "ktp-desktop-applets-21.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-filetransfer-handler-21.12.1.tar.xz"; - sha256 = "16h0ysg7y71sxdg0n535dhh9gsb32bbgjdizmpqn3cwcr75z9h9c"; - name = "ktp-filetransfer-handler-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-filetransfer-handler-21.12.2.tar.xz"; + sha256 = "1cw2y06zcdfm9vixw99gbipgkl63vpkf73giq5ibal2g2yq9c2r5"; + name = "ktp-filetransfer-handler-21.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-kded-module-21.12.1.tar.xz"; - sha256 = "0a0khk48whf2cmxsjfc5lajnbrz3m9gpcvdgqlyyi21v2z4rshj5"; - name = "ktp-kded-module-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-kded-module-21.12.2.tar.xz"; + sha256 = "1mwmdnr2c6ilhhjlq8bwd7gwvjmiq1k3lph5vlb5hy8nrp9x2p1r"; + name = "ktp-kded-module-21.12.2.tar.xz"; }; }; ktp-send-file = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-send-file-21.12.1.tar.xz"; - sha256 = "03k9mylyhanxbkzzcsv8z2mjx98qzghvbcwy8193259xrxshmlix"; - name = "ktp-send-file-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-send-file-21.12.2.tar.xz"; + sha256 = "0083z5al3jgl1szmzddzkjln9ci37906mmnrcy9f0yxfq5v2gr44"; + name = "ktp-send-file-21.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-text-ui-21.12.1.tar.xz"; - sha256 = "1n075fhqwk2522a7xc8z30j12d2sqkyybflidbs4kmbr915xh1zi"; - name = "ktp-text-ui-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-text-ui-21.12.2.tar.xz"; + sha256 = "0lhbsmhp23sil3rckk51156qhz15hjyp943mgh4s3w49lwxgjpc8"; + name = "ktp-text-ui-21.12.2.tar.xz"; }; }; ktuberling = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktuberling-21.12.1.tar.xz"; - sha256 = "0q6jm8m97zfj10q90s44a19x1aijbnysmnm0am26hzh84r3d1mq6"; - name = "ktuberling-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktuberling-21.12.2.tar.xz"; + sha256 = "0w9gx0i895vd0gi8wgd6hqikqjz5ir4li14i15k4akc7i7niy46r"; + name = "ktuberling-21.12.2.tar.xz"; }; }; kturtle = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kturtle-21.12.1.tar.xz"; - sha256 = "053bf9w5isqmi95spyy1a88iaw2f3zfr6xh5axwdycni4fnax9hx"; - name = "kturtle-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kturtle-21.12.2.tar.xz"; + sha256 = "0xkl12albs66vnsbilkwpnw5qaqx2ss8wldsnigmf0x5d5hd554k"; + name = "kturtle-21.12.2.tar.xz"; }; }; kubrick = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kubrick-21.12.1.tar.xz"; - sha256 = "1gwa8r7jy132zxzdr24shkpq7c7rawirrs7np7khhavm0g0nmk21"; - name = "kubrick-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kubrick-21.12.2.tar.xz"; + sha256 = "1sd8biyndnc7y4d3zsy4bmi409js9viyd4q5ql6fd2wcz656y1im"; + name = "kubrick-21.12.2.tar.xz"; }; }; kwalletmanager = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kwalletmanager-21.12.1.tar.xz"; - sha256 = "1qf8sizzdszvfskg8i0qmzb81292qm5jpcryl43b1bzh3yc6wx8c"; - name = "kwalletmanager-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kwalletmanager-21.12.2.tar.xz"; + sha256 = "0d2ma7dzn0nc25fj7lwaysfjfgqfl5nsisc01lp42n9k1bg0s0i5"; + name = "kwalletmanager-21.12.2.tar.xz"; }; }; kwave = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kwave-21.12.1.tar.xz"; - sha256 = "0qc8l72nly01pyn7sk3c3hm1a1iia733gam4jzf04dcs0x3l3iw5"; - name = "kwave-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kwave-21.12.2.tar.xz"; + sha256 = "01bjsm3aj7m1mq3nr6iwmcxswq8sxdxhhdyc5zlgffifpym53dc5"; + name = "kwave-21.12.2.tar.xz"; }; }; kwordquiz = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kwordquiz-21.12.1.tar.xz"; - sha256 = "083r0n1x75bh82aysi5n7lk3x7r3in93fcavjpklxr4dvzl28qs5"; - name = "kwordquiz-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kwordquiz-21.12.2.tar.xz"; + sha256 = "1na113adrd9djxk016riz3ajwrn9rbpc0ib34adfvp6nw48d9snp"; + name = "kwordquiz-21.12.2.tar.xz"; }; }; libgravatar = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libgravatar-21.12.1.tar.xz"; - sha256 = "0lhlxxg2il435sz3j0sa8x4ydr0fz7idvzp27qqjgrjsxfqn1gbf"; - name = "libgravatar-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libgravatar-21.12.2.tar.xz"; + sha256 = "0xj3v0cknkvr8ac5iipxpz1azr0hk42zgaaip5ivn7qjfhp0zvv0"; + name = "libgravatar-21.12.2.tar.xz"; }; }; libkcddb = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkcddb-21.12.1.tar.xz"; - sha256 = "02j6j44dgsyxdj83qhf2lr4l297184v63s8qwn0pxqjxjidcsajb"; - name = "libkcddb-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkcddb-21.12.2.tar.xz"; + sha256 = "07bcbmf3z5l0v5b6ra1h36yvbjpim1kzz1npd2h30iq09ibx6dr8"; + name = "libkcddb-21.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkcompactdisc-21.12.1.tar.xz"; - sha256 = "1am11g39jafy77av7ddc5yimfd07yvh7czaipamydw7lshcscjrq"; - name = "libkcompactdisc-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkcompactdisc-21.12.2.tar.xz"; + sha256 = "08abnybd0fa0vvpaixi18ljfz0s8a5pmbblzpcc8rvwzdjc7az6q"; + name = "libkcompactdisc-21.12.2.tar.xz"; }; }; libkdcraw = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkdcraw-21.12.1.tar.xz"; - sha256 = "1g2fgw1dx4wvb7x1d5z5qqys348jnrjyvs2iad4ls54l1ci20sws"; - name = "libkdcraw-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkdcraw-21.12.2.tar.xz"; + sha256 = "0mzq0nha7mq5v3lb03xbspc0y2a7mg1mzlwbp3706ph6jp4m7mwa"; + name = "libkdcraw-21.12.2.tar.xz"; }; }; libkdegames = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkdegames-21.12.1.tar.xz"; - sha256 = "0h5d7yf56x52ibm4yq14rbq8ha65x0isgpnw0jxgw5mrfz9m4wcy"; - name = "libkdegames-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkdegames-21.12.2.tar.xz"; + sha256 = "1m1qz59fb82bsj9ri3b8a1ph2ihgs97wlqq91pbgqw0kgvyvka1j"; + name = "libkdegames-21.12.2.tar.xz"; }; }; libkdepim = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkdepim-21.12.1.tar.xz"; - sha256 = "0g5vb2iwqclbrbl19vlzx1ppra6mj454574nakw900qkzrp6rbfn"; - name = "libkdepim-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkdepim-21.12.2.tar.xz"; + sha256 = "0qqz9b17fz3kgh3gcyq30ds8fq7zkm14k85g4mywsn3lnn8bj6z9"; + name = "libkdepim-21.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkeduvocdocument-21.12.1.tar.xz"; - sha256 = "1wa81hh607hk0h930rr95zff8pzpsvjz1vaygfcfpf8h3gcwc418"; - name = "libkeduvocdocument-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkeduvocdocument-21.12.2.tar.xz"; + sha256 = "16vh1bycq92bh47phv7nk62r5vjaiv1p8fvq5p5idsz9ipzb1wzp"; + name = "libkeduvocdocument-21.12.2.tar.xz"; }; }; libkexiv2 = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkexiv2-21.12.1.tar.xz"; - sha256 = "1yxa28hawyqm9s94p5qrcb2g9ly68i4cfj99xbzg3yl9simbhc5b"; - name = "libkexiv2-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkexiv2-21.12.2.tar.xz"; + sha256 = "1j1p1pw2l32q7lk8kp6r0nz9mzjdw6mxr2gi0p770k3k0arrsg87"; + name = "libkexiv2-21.12.2.tar.xz"; }; }; libkgapi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkgapi-21.12.1.tar.xz"; - sha256 = "0rwr37fy21d3jx35yv06kl29wd64sp21yg3rdhhv1bnbpsipk51k"; - name = "libkgapi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkgapi-21.12.2.tar.xz"; + sha256 = "0n6x0vdirv5qbi9qmd8956i307dz0lp80bw5cqxgk4gr4f8hzi8w"; + name = "libkgapi-21.12.2.tar.xz"; }; }; libkipi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkipi-21.12.1.tar.xz"; - sha256 = "06p53h72d7mbqdv5zsrbwc7k4xjxmbirqvfyxgc5h7y46lcr5dby"; - name = "libkipi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkipi-21.12.2.tar.xz"; + sha256 = "0zlga9gy45cs3icx56gvq2nab7i3z5ydrmisa46vpca63w8swmys"; + name = "libkipi-21.12.2.tar.xz"; }; }; libkleo = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkleo-21.12.1.tar.xz"; - sha256 = "0f5nwc7w3m204j8a2cf0nclxak12l2vrssd1wnnv1r4a7pp33w4p"; - name = "libkleo-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkleo-21.12.2.tar.xz"; + sha256 = "0vqgycmj2v91car7ckksnjxbq3b5nzk31p4x3577dgck9jmi30zd"; + name = "libkleo-21.12.2.tar.xz"; }; }; libkmahjongg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkmahjongg-21.12.1.tar.xz"; - sha256 = "0255mfa15v2mawvhrhv2yr1lmv5vfnil3nqxwv85l67m8d227y84"; - name = "libkmahjongg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkmahjongg-21.12.2.tar.xz"; + sha256 = "10fgk8nhcr3rbdnh8az46jvl6w6xankdxzw4djj3qs4dpkl52vk4"; + name = "libkmahjongg-21.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkomparediff2-21.12.1.tar.xz"; - sha256 = "03wcfhnb4q72140rgkf1rpsa6chhz55jpjj1dfhjxzjfh2pd0r5w"; - name = "libkomparediff2-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkomparediff2-21.12.2.tar.xz"; + sha256 = "07yzzc6ns1yx92gpcvhnxw0xna6ly1j4l4lx1rbw3d94z796694z"; + name = "libkomparediff2-21.12.2.tar.xz"; }; }; libksane = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libksane-21.12.1.tar.xz"; - sha256 = "1jlc04jx66rkip723szwl38r61n2rwg07d20yx6ahx6bmsdgznwx"; - name = "libksane-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libksane-21.12.2.tar.xz"; + sha256 = "1iksfjwkibn1i8n541nngalrp8krc94qy9in801q10d291clwz9i"; + name = "libksane-21.12.2.tar.xz"; }; }; libksieve = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libksieve-21.12.1.tar.xz"; - sha256 = "1d1aibkcn1xagmr03sadffvwz3q8idpva6dbgngwyyanj9hjs74i"; - name = "libksieve-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libksieve-21.12.2.tar.xz"; + sha256 = "03aaqqb5g9iv49crrf7zbmsri8jjszn5wfvmcw559swalmmyzb4i"; + name = "libksieve-21.12.2.tar.xz"; }; }; libktorrent = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libktorrent-21.12.1.tar.xz"; - sha256 = "02bkwypfrfx114yh9hjxy6kwb2crbl9xvk61287yg4ww0zdprdgv"; - name = "libktorrent-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libktorrent-21.12.2.tar.xz"; + sha256 = "06ak3bsy5x6a0r3l9hbfih9m41y3l357rpd42x8qp08djbs11xbf"; + name = "libktorrent-21.12.2.tar.xz"; }; }; lokalize = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/lokalize-21.12.1.tar.xz"; - sha256 = "08ipsp09d14vqk25jrv690757h9iy6d0mysgcv9jss5jacng6c3z"; - name = "lokalize-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/lokalize-21.12.2.tar.xz"; + sha256 = "1x6sb1fw0fqvk3vg299xvih1v2xm9hviv5h1b624maasw071nfyy"; + name = "lokalize-21.12.2.tar.xz"; }; }; lskat = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/lskat-21.12.1.tar.xz"; - sha256 = "1hxpb4p39mnfs6z7s9a2yq7qjs9lr1kxxdw3a8as7xqahhw1b1jz"; - name = "lskat-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/lskat-21.12.2.tar.xz"; + sha256 = "0v16rg6d2l41xgkrkj8ibh5a0zjyb4jn7am6rbgl6k9g9mfqwdx7"; + name = "lskat-21.12.2.tar.xz"; }; }; mailcommon = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/mailcommon-21.12.1.tar.xz"; - sha256 = "04kyli2f684wbq7n1zjrajqlvdzz058klpa9wxad73l7xni9sa33"; - name = "mailcommon-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/mailcommon-21.12.2.tar.xz"; + sha256 = "01kirl4lk1xq7y474438jv0av3ccg18krlchllcigd9c0vcp67qj"; + name = "mailcommon-21.12.2.tar.xz"; }; }; mailimporter = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/mailimporter-21.12.1.tar.xz"; - sha256 = "14kb4wdgs2snmni87zdah4l8ga67bg06wiqx0y2gv2yhibgap7p3"; - name = "mailimporter-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/mailimporter-21.12.2.tar.xz"; + sha256 = "1ng8w4byq4iiwfzh4acl2glndlr7r9hr62qpj10kpn4fi0qblakb"; + name = "mailimporter-21.12.2.tar.xz"; }; }; marble = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/marble-21.12.1.tar.xz"; - sha256 = "0j8whcbiwaal7wrqg99wn5zdnrnayjm8v9sfraigd0wnnfd6v2sn"; - name = "marble-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/marble-21.12.2.tar.xz"; + sha256 = "093drig77dyxwfavx30h2nzdqkn52h6pjn54j7fnwygz4742qv7n"; + name = "marble-21.12.2.tar.xz"; }; }; markdownpart = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/markdownpart-21.12.1.tar.xz"; - sha256 = "02w137hqjsryb4dv5h1vmbd1c55imkwcy5r7ax5zvisclr4ylxfz"; - name = "markdownpart-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/markdownpart-21.12.2.tar.xz"; + sha256 = "0g7j15s15blqr0lfagmhvxxggdplvmnkf8g2b9ysjkrr49lgk7b6"; + name = "markdownpart-21.12.2.tar.xz"; }; }; mbox-importer = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/mbox-importer-21.12.1.tar.xz"; - sha256 = "0y10pd8sjn0j4cdl7z773y5cral8lbmw42czzp4ig8yrlpbfs71j"; - name = "mbox-importer-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/mbox-importer-21.12.2.tar.xz"; + sha256 = "0qakmg86978zjm2m98602zbaiyiryrmlx2vk93yyv5xg352gphjb"; + name = "mbox-importer-21.12.2.tar.xz"; }; }; messagelib = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/messagelib-21.12.1.tar.xz"; - sha256 = "1aywrhxw1ibx5dk68rv66h55fqipdcs0mdxw0jvfyrpfsvq4nbdc"; - name = "messagelib-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/messagelib-21.12.2.tar.xz"; + sha256 = "0ln473gdwsscjpsh50h2cbazxbc8qy1mmll9lsfngfw1qq49dwsp"; + name = "messagelib-21.12.2.tar.xz"; }; }; minuet = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/minuet-21.12.1.tar.xz"; - sha256 = "1pqik8mp3p628xz0q1pd82f8l1g3wrlz5lzsh1fnyj2mc8fwi4nw"; - name = "minuet-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/minuet-21.12.2.tar.xz"; + sha256 = "050pmw3srfb800h91x6pqn1vz7s6458w94r2innwc1j04pr8jaxv"; + name = "minuet-21.12.2.tar.xz"; }; }; okular = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/okular-21.12.1.tar.xz"; - sha256 = "189b47ysmvykpyjdh5jpzk7ahy3pvg2gf71qyvhcr55pqb763g84"; - name = "okular-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/okular-21.12.2.tar.xz"; + sha256 = "1k0bwyhk73gshc7f0j6mply2m9ykfd07mhkxwnzj874sby5rxhv9"; + name = "okular-21.12.2.tar.xz"; }; }; palapeli = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/palapeli-21.12.1.tar.xz"; - sha256 = "032702k31psyr7fy5i6f2r4a56f4m9zawjamyr0jwwq4faydj6y6"; - name = "palapeli-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/palapeli-21.12.2.tar.xz"; + sha256 = "0v5456hm56c7f9d49l5zjql6f4ap72wmkf8in8s95lqmpn42dl17"; + name = "palapeli-21.12.2.tar.xz"; }; }; parley = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/parley-21.12.1.tar.xz"; - sha256 = "1h9jasmi96i1rmxqg7gps8fy03al4042x89h9yca57sfj3966iy0"; - name = "parley-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/parley-21.12.2.tar.xz"; + sha256 = "1cwnlv57yqjm52i0jwl33pz4h9h448h0ljrg598ghby8p3b2i5w7"; + name = "parley-21.12.2.tar.xz"; }; }; partitionmanager = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/partitionmanager-21.12.1.tar.xz"; - sha256 = "1szidy2vwcqzygkw232k5bvk6zr0h0z8349is69q4zvrbamcwawf"; - name = "partitionmanager-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/partitionmanager-21.12.2.tar.xz"; + sha256 = "0rr7ic2ivm7lp3lj20b8rfbx1sr91s24fzxfzfwnw9znl9vj410q"; + name = "partitionmanager-21.12.2.tar.xz"; }; }; picmi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/picmi-21.12.1.tar.xz"; - sha256 = "0jdadh33f9byljwlxxs268j8crhagg2xx6wsyb2ssyms95qmfd50"; - name = "picmi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/picmi-21.12.2.tar.xz"; + sha256 = "0qp8b1di3qnv4xrnpcmyi6myrrwzdlijhvxmacx4ijv7b7wlg4r7"; + name = "picmi-21.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/pim-data-exporter-21.12.1.tar.xz"; - sha256 = "1l748ndf4jgn39ij4g2dm54599ygnz3492fpd8i02d2bgm5d3339"; - name = "pim-data-exporter-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/pim-data-exporter-21.12.2.tar.xz"; + sha256 = "0m4dq3x5kbncnvixjigb85j6siws6q600piw53qabiwd6w6rp1xy"; + name = "pim-data-exporter-21.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/pim-sieve-editor-21.12.1.tar.xz"; - sha256 = "0cnlbalmabycpiy3cmq7j6jz9h3fdfq0md25rr6ri2gvvx1gp0if"; - name = "pim-sieve-editor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/pim-sieve-editor-21.12.2.tar.xz"; + sha256 = "1cpazs6q6hv15ib6isif5syvpywxfdi7d3w8vc4pnfj94wkcq3gm"; + name = "pim-sieve-editor-21.12.2.tar.xz"; }; }; pimcommon = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/pimcommon-21.12.1.tar.xz"; - sha256 = "1rg4c8bvfrr7rzpxwvjw07phalmxvj592cjcxywnbb4i3hlr9c8g"; - name = "pimcommon-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/pimcommon-21.12.2.tar.xz"; + sha256 = "1pnhjhnjx98wdc3dg71qgjjj3dsncl56d86cagkk2spicv901p69"; + name = "pimcommon-21.12.2.tar.xz"; }; }; poxml = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/poxml-21.12.1.tar.xz"; - sha256 = "1pnqhv059q79g8gwkln9lrvwby96262vamyblrjq1qx2bb4y1038"; - name = "poxml-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/poxml-21.12.2.tar.xz"; + sha256 = "1zzw9jwwd5nx12ma2ihffj6nhr3zlpahnj8k0r8mxcyn99j51kyn"; + name = "poxml-21.12.2.tar.xz"; }; }; print-manager = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/print-manager-21.12.1.tar.xz"; - sha256 = "0yxivldalzharaq2ghrz2j8vlkylp91la36aaqwly396jxaij3w3"; - name = "print-manager-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/print-manager-21.12.2.tar.xz"; + sha256 = "0xqv7f9p27maa0p20nc92g6240qkcin9s3dldr5b5q944hkkxizq"; + name = "print-manager-21.12.2.tar.xz"; }; }; rocs = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/rocs-21.12.1.tar.xz"; - sha256 = "0m4l2sm3mgkici2jvsvzi8pv3cx3i7a7yvh5c0w1ajs34vx0y6ki"; - name = "rocs-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/rocs-21.12.2.tar.xz"; + sha256 = "1mjrgh0vfc1kvici5m1dx23s1c7qpvfx1br91yglgll1biajzqlq"; + name = "rocs-21.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/signon-kwallet-extension-21.12.1.tar.xz"; - sha256 = "09j2i1kwinskylww78nhnrkh31p5yizv6jp5lf2igvhd4dpfgxxk"; - name = "signon-kwallet-extension-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/signon-kwallet-extension-21.12.2.tar.xz"; + sha256 = "0qfim8ahklwkixpxcm9sj1w49cmb0wz5r8np6ga3r2rh4vlqdxbf"; + name = "signon-kwallet-extension-21.12.2.tar.xz"; }; }; skanlite = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/skanlite-21.12.1.tar.xz"; - sha256 = "0s53wcm80xp9p5cli9bkharwv4qvhlc10pdb0aysgg76jlqrj78x"; - name = "skanlite-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/skanlite-21.12.2.tar.xz"; + sha256 = "1fvdrzyvps0iqb9irnpdn81gmlmfhgfsfb5mg4i259sms6rq3h8m"; + name = "skanlite-21.12.2.tar.xz"; }; }; spectacle = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/spectacle-21.12.1.tar.xz"; - sha256 = "13qpsxy2v51xvdxml0c9zp62d9lasg76m0ff86kqavwklywc9h72"; - name = "spectacle-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/spectacle-21.12.2.tar.xz"; + sha256 = "1966ynfdkaya1iydi2hfmcr13adk7agjr9ndz2hjrwgjagd29pyr"; + name = "spectacle-21.12.2.tar.xz"; }; }; step = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/step-21.12.1.tar.xz"; - sha256 = "1vh2yw5zyy42jfn9i326x01v34xgnq5d5wyxy6k75v5p5hwsbr64"; - name = "step-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/step-21.12.2.tar.xz"; + sha256 = "1paq5wpya82s92zwacwbjf96nj52gy1sydk0gndyqi8jdplhlnps"; + name = "step-21.12.2.tar.xz"; }; }; svgpart = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/svgpart-21.12.1.tar.xz"; - sha256 = "03ivjg1n1g4bqwrdq38hw2pvh1gk1s00azmnlz3x40fd1xcg3mww"; - name = "svgpart-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/svgpart-21.12.2.tar.xz"; + sha256 = "15624gfcn85xkh6lypkw73iidnclprhqhpxrjggbng1x22jg2iwc"; + name = "svgpart-21.12.2.tar.xz"; }; }; sweeper = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/sweeper-21.12.1.tar.xz"; - sha256 = "0m8k17x90avbw4zay1zkbkpdw809axhvl3c0kjiymyan4a3mi86y"; - name = "sweeper-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/sweeper-21.12.2.tar.xz"; + sha256 = "07rqshzjjzqgmm5z0fn1hjd09prcwlnyilp3s61nl5fciby6m8fh"; + name = "sweeper-21.12.2.tar.xz"; }; }; umbrello = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/umbrello-21.12.1.tar.xz"; - sha256 = "0z4hnrd055f1i7hasrgrqv7chzyy7cscmi0lvjak12mngykckrs9"; - name = "umbrello-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/umbrello-21.12.2.tar.xz"; + sha256 = "07bp3rf31x5c1vag6pw0lal9b6zmvsqa8wg8a30kj7k9wabvjprb"; + name = "umbrello-21.12.2.tar.xz"; }; }; yakuake = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/yakuake-21.12.1.tar.xz"; - sha256 = "1nr28w01bcnhw33s17daps8g040hwnvwxjz4p1gv3xngapqrf6zl"; - name = "yakuake-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/yakuake-21.12.2.tar.xz"; + sha256 = "1xkdyn944ga1xvwbbblnffvlnwgypspr909yvdy6xf5j0qaldsdk"; + name = "yakuake-21.12.2.tar.xz"; }; }; zanshin = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/zanshin-21.12.1.tar.xz"; - sha256 = "0z54w5c5mdmfw4cv6099jlf4kz40b3gxl4wi5z92zxn3d71ck1l5"; - name = "zanshin-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/zanshin-21.12.2.tar.xz"; + sha256 = "1ilgswm4jbjk1mbvcrdi451f1w4vwx3ah6y32a3y5a9blbh9bh6c"; + name = "zanshin-21.12.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/zeroconf-ioslave-21.12.1.tar.xz"; - sha256 = "16by90pdmbn7kw7aq2jf9sl67r2ydhp8i9drpznvfxmq99qsk7b6"; - name = "zeroconf-ioslave-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/zeroconf-ioslave-21.12.2.tar.xz"; + sha256 = "0b59npqhmf3yvp9x0jm29bwzlyl0vm9l56jlsgwgiq7pwis5njwd"; + name = "zeroconf-ioslave-21.12.2.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index ac3922e17d..6de089ba58 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "1password"; - version = "8.3.0"; + version = "8.5.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw"; + sha256 = "tnZr+qjUcJ9Fhk6RP8iwu+/JsvYSE03NHhBfhedyCTQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 9dd439fe8e..360bfbf1b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { url = { "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; + "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { "i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg="; "x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4="; - "aarch64-linux" = "vWoA/0ZfdwVniHmxC4nH1QIc6bjdb00+SwlkIWc9BPs="; + "aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 697caed662..7587a6ee12 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; - version = "5.2.1.5"; + version = "5.2.2.4"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-fjRf+9m1VGRq2ylqp5CP+FCPepUPyHjknSmJaei2yyE="; + sha256 = "sha256-Q5gR+CbqoE9QwFjDpnKOzVZuRPUDBukJ0EpqhN5cAws="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index d3572515ec..2fb60e8fef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -161,7 +161,7 @@ (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.0"; sha256 = "14hi47zyp3nc21zjc4a7g6cg8zyq41y9gv35vb96yp1lab6kwa9r"; }) + (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; sha256 = "1kx50vliqcqw72aygkm2cs2q82pxdxz17gvz4chz6k858qj4gv0l"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.2.3"; sha256 = "189i1ziv3xkdxpxhkpfx3xfji3iw124s88sqn3ga2vh04fbdak8x"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.2.3"; sha256 = "1r4z1mmgihnmcqb8zd1q6jbz1g72y5ggl833qhmd1q0wnq8awbs8"; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index cc665490a1..54bcfc8f5b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix @@ -161,7 +161,7 @@ (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.0"; sha256 = "14hi47zyp3nc21zjc4a7g6cg8zyq41y9gv35vb96yp1lab6kwa9r"; }) + (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; sha256 = "1kx50vliqcqw72aygkm2cs2q82pxdxz17gvz4chz6k858qj4gv0l"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.2.3"; sha256 = "189i1ziv3xkdxpxhkpfx3xfji3iw124s88sqn3ga2vh04fbdak8x"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.2.3"; sha256 = "1r4z1mmgihnmcqb8zd1q6jbz1g72y5ggl833qhmd1q0wnq8awbs8"; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 5708bee769..98049237b7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "e292b5e3c37b0540d398fb4a04b10dd730976a5a"; - sha256 = "1sxv2xkps2fln7di0i406nnhdqg4wd2yzgvwm5nfhawsq941g19z"; + rev = "156992e88d5c695375e9f69c29f2c68bec24d2b1"; + sha256 = "0zqiaj0957rr4kzw8q8zkxvd88nqw5ssym81dsd3pa0ypr4vqb4w"; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index d6e5b8d1bd..b36151857a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -4,31 +4,31 @@ let sources = { - "@babel/code-frame-7.16.0" = { + "@babel/code-frame-7.16.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.16.4" = { + "@babel/compat-data-7.16.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.4"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz"; - sha512 = "1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"; + sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; }; }; - "@babel/core-7.16.5" = { + "@babel/core-7.16.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.16.5"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz"; - sha512 = "wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; + sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; }; }; "@babel/eslint-parser-7.16.5" = { @@ -40,58 +40,58 @@ let sha512 = "mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA=="; }; }; - "@babel/generator-7.16.5" = { + "@babel/generator-7.16.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz"; - sha512 = "kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"; + sha512 = "1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw=="; }; }; - "@babel/helper-annotate-as-pure-7.16.0" = { + "@babel/helper-annotate-as-pure-7.16.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; - sha512 = "ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; + sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz"; - sha512 = "3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; + sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.16.3" = { + "@babel/helper-compilation-targets-7.16.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.16.3"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz"; - sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz"; + sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.5" = { + "@babel/helper-create-class-features-plugin-7.16.10" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz"; - sha512 = "NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; + sha512 = "wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.16.0" = { + "@babel/helper-create-regexp-features-plugin-7.16.7" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; - sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; + sha512 = "fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g=="; }; }; "@babel/helper-define-polyfill-provider-0.3.0" = { @@ -103,130 +103,121 @@ let sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; }; }; - "@babel/helper-environment-visitor-7.16.5" = { + "@babel/helper-environment-visitor-7.16.7" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz"; - sha512 = "ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; + sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.0" = { + "@babel/helper-explode-assignable-expression-7.16.7" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; - sha512 = "Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; + sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; }; }; - "@babel/helper-function-name-7.16.0" = { + "@babel/helper-function-name-7.16.7" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; - sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; + sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; }; }; - "@babel/helper-get-function-arity-7.16.0" = { + "@babel/helper-get-function-arity-7.16.7" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; - sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; + sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; }; }; - "@babel/helper-hoist-variables-7.16.0" = { + "@babel/helper-hoist-variables-7.16.7" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; - sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; + sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; }; }; - "@babel/helper-member-expression-to-functions-7.16.5" = { + "@babel/helper-member-expression-to-functions-7.16.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz"; - sha512 = "7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz"; + sha512 = "VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q=="; }; }; - "@babel/helper-module-imports-7.16.0" = { + "@babel/helper-module-imports-7.16.7" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; - sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; + sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.5" = { + "@babel/helper-module-transforms-7.16.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz"; - sha512 = "CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; + sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; }; }; - "@babel/helper-optimise-call-expression-7.16.0" = { + "@babel/helper-optimise-call-expression-7.16.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; - sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; + sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; }; }; - "@babel/helper-plugin-utils-7.16.5" = { + "@babel/helper-plugin-utils-7.16.7" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz"; - sha512 = "59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; + sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; }; }; - "@babel/helper-plugin-utils-7.8.0" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.0.tgz"; - sha512 = "+hAlRGdf8fHQAyNnDBqTHQhwdLURLdrCROoWaEQYiQhk2sV9Rhs+GoFZZfMJExTq9HG8o2NX3uN2G90bFtmFdA=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.16.5" = { + "@babel/helper-remap-async-to-generator-7.16.8" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz"; - sha512 = "X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; + sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; }; }; - "@babel/helper-replace-supers-7.16.5" = { + "@babel/helper-replace-supers-7.16.7" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz"; - sha512 = "ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; + sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; - "@babel/helper-simple-access-7.16.0" = { + "@babel/helper-simple-access-7.16.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; - sha512 = "o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz"; + sha512 = "ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { @@ -238,220 +229,220 @@ let sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; }; }; - "@babel/helper-split-export-declaration-7.16.0" = { + "@babel/helper-split-export-declaration-7.16.7" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; - sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; + sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; }; }; - "@babel/helper-validator-identifier-7.15.7" = { + "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/helper-validator-option-7.14.5" = { + "@babel/helper-validator-option-7.16.7" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.14.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; + sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; }; }; - "@babel/helper-wrap-function-7.16.5" = { + "@babel/helper-wrap-function-7.16.8" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz"; - sha512 = "2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; + sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.16.5" = { + "@babel/helpers-7.16.7" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz"; - sha512 = "TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz"; + sha512 = "9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw=="; }; }; - "@babel/highlight-7.16.0" = { + "@babel/highlight-7.16.7" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; - sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz"; + sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; }; }; - "@babel/parser-7.16.5" = { + "@babel/parser-7.16.12" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.5"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.5.tgz"; - sha512 = "+Ce7T5iPNWzfu9C1aB5tN3Lyafs5xb3Ic7vBWyZL2KXT3QSdD1dD3CvgOzPmQKoNNRt6uauc0XwNJTQtXC2/Mw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"; + sha512 = "VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { 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.16.2"; + version = "7.16.7"; 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.16.2.tgz"; - sha512 = "h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg=="; + 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.16.7.tgz"; + sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.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.16.0"; + version = "7.16.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.16.0.tgz"; - sha512 = "4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA=="; + url = "https://registry.npmjs.org/@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=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.5" = { + "@babel/plugin-proposal-async-generator-functions-7.16.8" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz"; - sha512 = "C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; + sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.5" = { + "@babel/plugin-proposal-class-properties-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz"; - sha512 = "pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; + sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.5" = { + "@babel/plugin-proposal-class-static-block-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz"; - sha512 = "EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; + sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.5" = { + "@babel/plugin-proposal-dynamic-import-7.16.7" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz"; - sha512 = "P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; + sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.5" = { + "@babel/plugin-proposal-export-namespace-from-7.16.7" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz"; - sha512 = "i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; + sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.5" = { + "@babel/plugin-proposal-json-strings-7.16.7" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz"; - sha512 = "QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; + sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.5" = { + "@babel/plugin-proposal-logical-assignment-operators-7.16.7" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz"; - sha512 = "xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; + sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz"; - sha512 = "YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; + sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.5" = { + "@babel/plugin-proposal-numeric-separator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz"; - sha512 = "DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; + sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.16.5" = { + "@babel/plugin-proposal-object-rest-spread-7.16.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz"; - sha512 = "UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz"; + sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.5" = { + "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz"; - sha512 = "ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; + sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.5" = { + "@babel/plugin-proposal-optional-chaining-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz"; - sha512 = "kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; + sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.5" = { + "@babel/plugin-proposal-private-methods-7.16.11" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz"; - sha512 = "+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; + sha512 = "F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.16.5" = { + "@babel/plugin-proposal-private-property-in-object-7.16.7" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz"; - sha512 = "+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; + sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.5" = { + "@babel/plugin-proposal-unicode-property-regex-7.16.7" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz"; - sha512 = "s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; + sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -580,301 +571,301 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.5" = { + "@babel/plugin-transform-arrow-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz"; - sha512 = "8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; + sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.5" = { + "@babel/plugin-transform-async-to-generator-7.16.8" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz"; - sha512 = "TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; + sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.5" = { + "@babel/plugin-transform-block-scoped-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz"; - sha512 = "BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; + sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.5" = { + "@babel/plugin-transform-block-scoping-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz"; - sha512 = "JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; + sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; }; }; - "@babel/plugin-transform-classes-7.16.5" = { + "@babel/plugin-transform-classes-7.16.7" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz"; - sha512 = "DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; + sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.5" = { + "@babel/plugin-transform-computed-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz"; - sha512 = "n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; + sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; }; }; - "@babel/plugin-transform-destructuring-7.16.5" = { + "@babel/plugin-transform-destructuring-7.16.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz"; - sha512 = "GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; + sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.5" = { + "@babel/plugin-transform-dotall-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz"; - sha512 = "iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; + sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.5" = { + "@babel/plugin-transform-duplicate-keys-7.16.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz"; - sha512 = "81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; + sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.5" = { + "@babel/plugin-transform-exponentiation-operator-7.16.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz"; - sha512 = "12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; + sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; }; }; - "@babel/plugin-transform-for-of-7.16.5" = { + "@babel/plugin-transform-for-of-7.16.7" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz"; - sha512 = "+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; + sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; }; }; - "@babel/plugin-transform-function-name-7.16.5" = { + "@babel/plugin-transform-function-name-7.16.7" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz"; - sha512 = "Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; + sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; }; }; - "@babel/plugin-transform-literals-7.16.5" = { + "@babel/plugin-transform-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz"; - sha512 = "B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; + sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.5" = { + "@babel/plugin-transform-member-expression-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz"; - sha512 = "d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; + sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.5" = { + "@babel/plugin-transform-modules-amd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz"; - sha512 = "oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; + sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.16.5" = { + "@babel/plugin-transform-modules-commonjs-7.16.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz"; - sha512 = "ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz"; + sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.16.5" = { + "@babel/plugin-transform-modules-systemjs-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz"; - sha512 = "53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; + sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.5" = { + "@babel/plugin-transform-modules-umd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz"; - sha512 = "qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; + sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.16.8" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz"; - sha512 = "/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA=="; + url = "https://registry.npmjs.org/@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=="; }; }; - "@babel/plugin-transform-new-target-7.16.5" = { + "@babel/plugin-transform-new-target-7.16.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz"; - sha512 = "ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; + sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; }; }; - "@babel/plugin-transform-object-super-7.16.5" = { + "@babel/plugin-transform-object-super-7.16.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz"; - sha512 = "tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; + sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; }; }; - "@babel/plugin-transform-parameters-7.16.5" = { + "@babel/plugin-transform-parameters-7.16.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz"; - sha512 = "B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; + sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; }; }; - "@babel/plugin-transform-property-literals-7.16.5" = { + "@babel/plugin-transform-property-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz"; - sha512 = "+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; + sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.16.5" = { + "@babel/plugin-transform-regenerator-7.16.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz"; - sha512 = "2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; + sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.5" = { + "@babel/plugin-transform-reserved-words-7.16.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz"; - sha512 = "aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; + sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.5" = { + "@babel/plugin-transform-shorthand-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz"; - sha512 = "ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; + sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; }; }; - "@babel/plugin-transform-spread-7.16.5" = { + "@babel/plugin-transform-spread-7.16.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz"; - sha512 = "5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; + sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.5" = { + "@babel/plugin-transform-sticky-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz"; - sha512 = "usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; + sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; }; }; - "@babel/plugin-transform-template-literals-7.16.5" = { + "@babel/plugin-transform-template-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz"; - sha512 = "gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; + sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.5" = { + "@babel/plugin-transform-typeof-symbol-7.16.7" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz"; - sha512 = "ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; + sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.5" = { + "@babel/plugin-transform-unicode-escapes-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz"; - sha512 = "shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; + sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.5" = { + "@babel/plugin-transform-unicode-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz"; - sha512 = "GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; + sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; }; }; - "@babel/preset-env-7.16.5" = { + "@babel/preset-env-7.16.11" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.5.tgz"; - sha512 = "MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz"; + sha512 = "qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -895,31 +886,31 @@ let sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; }; }; - "@babel/template-7.16.0" = { + "@babel/template-7.16.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz"; - sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"; + sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.16.5" = { + "@babel/traverse-7.16.10" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz"; - sha512 = "FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"; + sha512 = "yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw=="; }; }; - "@babel/types-7.16.0" = { + "@babel/types-7.16.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.0"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"; - sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"; + sha512 = "smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -1048,13 +1039,13 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; - "@types/bonjour-3.5.9" = { + "@types/bonjour-3.5.10" = { name = "_at_types_slash_bonjour"; packageName = "@types/bonjour"; - version = "3.5.9"; + version = "3.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.9.tgz"; - sha512 = "VkZUiYevvtPyFu5XtpYw9a8moCSzxgjs5PAFF4yXjA7eYHvzBlXe+eJdqBBNWWVzI1r7Ki0KxMYvaQuhm+6f5A=="; + url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz"; + sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; }; }; "@types/connect-3.4.35" = { @@ -1075,22 +1066,22 @@ let sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; }; }; - "@types/eslint-8.2.1" = { + "@types/eslint-8.2.2" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.1.tgz"; - sha512 = "UP9rzNn/XyGwb5RQ2fok+DzcIRIYwc16qTXse5+Smsy8MOIccCChT15KAwnsgQx4PzJkaMq4myFyZ4CL5TjhIQ=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.2.tgz"; + sha512 = "nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A=="; }; }; - "@types/eslint-scope-3.7.1" = { + "@types/eslint-scope-3.7.3" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.1"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha512 = "SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz"; + sha512 = "PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g=="; }; }; "@types/estree-0.0.50" = { @@ -1111,13 +1102,13 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.26" = { + "@types/express-serve-static-core-4.17.27" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.26"; + version = "4.17.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz"; - sha512 = "zeu3tpouA043RHxW0gzRxwCHchMgftE8GArRsvYT0ByDMbn19olQHx5jLue0LxWY6iYtXb7rXmuVtSkhy9YZvQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.27.tgz"; + sha512 = "e/sVallzUTPdyOTiqi8O8pMdBBphscvI6E4JYaKlja4Lm+zh7UFSSdW5VMkRbhDtmrONqOUHOXRguPsDckzxNA=="; }; }; "@types/glob-7.1.4" = { @@ -1147,15 +1138,6 @@ let sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; }; }; - "@types/json-schema-7.0.8" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz"; - sha512 = "YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="; - }; - }; "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -1480,13 +1462,13 @@ let sha512 = "yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="; }; }; - "acorn-8.6.0" = { + "acorn-8.7.0" = { name = "acorn"; packageName = "acorn"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz"; - sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; }; }; "acorn-import-assertions-1.8.0" = { @@ -1561,6 +1543,15 @@ let sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; }; }; + "ajv-8.9.0" = { + name = "ajv"; + packageName = "ajv"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; + }; + }; "ajv-formats-2.1.1" = { name = "ajv-formats"; packageName = "ajv-formats"; @@ -1588,15 +1579,6 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "ansi-colors-4.1.1" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; - }; - }; "ansi-html-community-0.0.8" = { name = "ansi-html-community"; packageName = "ansi-html-community"; @@ -1741,13 +1723,13 @@ let sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; - "axios-0.24.0" = { + "axios-0.25.0" = { name = "axios"; packageName = "axios"; - version = "0.24.0"; + version = "0.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"; + sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; }; }; "babel-loader-8.2.3" = { @@ -1777,13 +1759,13 @@ let sha512 = "wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA=="; }; }; - "babel-plugin-polyfill-corejs3-0.4.0" = { + "babel-plugin-polyfill-corejs3-0.5.0" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz"; - sha512 = "YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.0.tgz"; + sha512 = "Hcrgnmkf+4JTj73GbK3bBhlVPiLL47owUAnoJIf69Hakl3q+KfodbDXiZWGMM7iqCZTxCG3Z2VRfPNYES4rXqQ=="; }; }; "babel-plugin-polyfill-regenerator-0.3.0" = { @@ -1894,22 +1876,13 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; - "browserslist-4.16.6" = { + "browserslist-4.19.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.6"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz"; - sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; - }; - }; - "browserslist-4.18.1" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz"; - sha512 = "8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz"; + sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; }; }; "buffer-from-1.1.1" = { @@ -1984,22 +1957,31 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; - "caniuse-lite-1.0.30001234" = { + "caniuse-lite-1.0.30001294" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001234"; + version = "1.0.30001294"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001234.tgz"; - sha512 = "a3gjUVKkmwLdNysa1xkUAwN2VfJUJyVW47rsi3aCbkRCtbHAfo+rOsCqVw29G6coQ8gzAPb5XBXwiGHwme3isA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz"; + sha512 = "LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g=="; }; }; - "caniuse-lite-1.0.30001286" = { + "caniuse-lite-1.0.30001298" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001286"; + version = "1.0.30001298"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz"; - sha512 = "zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz"; + sha512 = "AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ=="; + }; + }; + "caniuse-lite-1.0.30001299" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001299"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz"; + sha512 = "iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw=="; }; }; "chalk-2.4.2" = { @@ -2110,15 +2092,6 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "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=="; - }; - }; "colorette-2.0.16" = { name = "colorette"; packageName = "colorette"; @@ -2272,22 +2245,22 @@ let sha512 = "i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw=="; }; }; - "copy-webpack-plugin-10.2.0" = { + "copy-webpack-plugin-10.2.1" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.0.tgz"; - sha512 = "my6iXII95c78w14HzYCNya5TlJYa44lOppAge5GSTMM1SyDxNsVGCJvhP4/ld6snm8lzjn3XOonMZD6s1L86Og=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz"; + sha512 = "nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg=="; }; }; - "core-js-compat-3.19.3" = { + "core-js-compat-3.20.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.19.3"; + version = "3.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz"; - sha512 = "59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.2.tgz"; + sha512 = "qZEzVQ+5Qh6cROaTPFLNS4lkvQ6mBzE3R6A6EEpssj7Zr2egMHgsy4XapdifqJDGC9CBiNv7s+ejI96rLNQFdg=="; }; }; "core-util-is-1.0.3" = { @@ -2614,22 +2587,31 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.749" = { + "electron-to-chromium-1.4.30" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.749"; + version = "1.4.30"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.749.tgz"; - sha512 = "F+v2zxZgw/fMwPz/VUGIggG4ZndDsYy0vlpthi3tjmDZlcfbhN5mYW0evXUsBr2sUtuDANFtle410A9u/sd/4A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.30.tgz"; + sha512 = "609z9sIMxDHg+TcR/VB3MXwH+uwtrYyeAwWc/orhnr90ixs6WVGSrt85CDLGUdNnLqCA7liv426V20EecjvflQ=="; }; }; - "electron-to-chromium-1.4.17" = { + "electron-to-chromium-1.4.39" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.17"; + version = "1.4.39"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.17.tgz"; - sha512 = "zhk1MravPtq/KBhmGB7TLBILmXTgRG9TFSI3qS3DbgyfHzIl72iiTE37r/BHIbPCJJlWIo5rySyxiH4vWhu2ZA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.39.tgz"; + sha512 = "bFH3gdRq/l7WlzSleiO6dwpZH3RhiJ8vlMq0tOJMfT+5nb+x397eJn2RHF6Ho/9GCKv+BkimNlUMHl9+Yh+Qcg=="; + }; + }; + "electron-to-chromium-1.4.43" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.43"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.43.tgz"; + sha512 = "PO3kEfcxPrti/4STbXvCkNIF4fgWvCKl2508e6UI7KomCDffpIfeBZLXsh5DK/XGsjUw3kwq6WEsi0MJTlGAdg=="; }; }; "emojis-list-3.0.0" = { @@ -2659,15 +2641,6 @@ let sha512 = "EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA=="; }; }; - "enquirer-2.3.6" = { - name = "enquirer"; - packageName = "enquirer"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; - sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; - }; - }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -2749,13 +2722,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.5.0" = { + "eslint-8.7.0" = { name = "eslint"; packageName = "eslint"; - version = "8.5.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz"; - sha512 = "tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz"; + sha512 = "ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2776,22 +2749,22 @@ let sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; }; }; - "eslint-module-utils-2.7.1" = { + "eslint-module-utils-2.7.2" = { name = "eslint-module-utils"; packageName = "eslint-module-utils"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz"; - sha512 = "fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ=="; + url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz"; + sha512 = "zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg=="; }; }; - "eslint-plugin-import-2.25.3" = { + "eslint-plugin-import-2.25.4" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; - version = "2.25.3"; + version = "2.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz"; - sha512 = "RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg=="; + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz"; + sha512 = "/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA=="; }; }; "eslint-plugin-vue-7.20.0" = { @@ -2812,15 +2785,6 @@ let sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; - "eslint-scope-6.0.0" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-6.0.0.tgz"; - sha512 = "uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA=="; - }; - }; "eslint-scope-7.1.0" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -2866,15 +2830,6 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; - "eslint-visitor-keys-3.0.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz"; - sha512 = "mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q=="; - }; - }; "eslint-visitor-keys-3.1.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -2884,6 +2839,15 @@ let sha512 = "yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="; }; }; + "eslint-visitor-keys-3.2.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; + sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; + }; + }; "espree-6.2.1" = { name = "espree"; packageName = "espree"; @@ -2893,22 +2857,13 @@ let sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; }; }; - "espree-9.0.0" = { + "espree-9.3.0" = { name = "espree"; packageName = "espree"; - version = "9.0.0"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.0.0.tgz"; - sha512 = "r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ=="; - }; - }; - "espree-9.2.0" = { - name = "espree"; - packageName = "espree"; - version = "9.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz"; - sha512 = "oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg=="; + url = "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz"; + sha512 = "d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ=="; }; }; "esquery-1.4.0" = { @@ -3019,6 +2974,15 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; + "fast-glob-3.2.10" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.10.tgz"; + sha512 = "s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A=="; + }; + }; "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -3163,13 +3127,13 @@ let sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; }; }; - "follow-redirects-1.14.4" = { + "follow-redirects-1.14.7" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.4"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; - sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; }; "forwarded-0.2.0" = { @@ -3334,22 +3298,22 @@ let sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; }; }; - "globby-11.0.4" = { + "globby-11.1.0" = { name = "globby"; packageName = "globby"; - version = "11.0.4"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; - sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-12.0.2" = { + "globby-12.2.0" = { name = "globby"; packageName = "globby"; - version = "12.0.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz"; - sha512 = "lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ=="; + url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; + sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; }; }; "globby-6.1.0" = { @@ -3361,13 +3325,13 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "gzip-size-6.0.0" = { @@ -3622,13 +3586,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.1.8" = { + "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; - version = "5.1.8"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; - sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; "immutable-4.0.0" = { @@ -4045,13 +4009,13 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; - "jest-worker-27.4.2" = { + "jest-worker-27.4.6" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz"; - sha512 = "0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz"; + sha512 = "gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw=="; }; }; "js-tokens-4.0.0" = { @@ -4180,13 +4144,13 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "linkifyjs-3.0.4" = { + "linkifyjs-3.0.5" = { name = "linkifyjs"; packageName = "linkifyjs"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.4.tgz"; - sha512 = "JWw1HHMx54g8mEsG7JwI8I/xh7qeJbF6L9u1dQOYW91RdRqDYpnTn1UaNXYkmLD967Vk0xGuyHzuRnkSApby3w=="; + url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.5.tgz"; + sha512 = "1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg=="; }; }; "loader-runner-4.2.0" = { @@ -4315,13 +4279,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "memfs-3.4.0" = { + "memfs-3.4.1" = { name = "memfs"; packageName = "memfs"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.4.0.tgz"; - sha512 = "o/RfP0J1d03YwsAxyHxAYs2kyJp55AFkMazlFAZFR2I2IXkxiUTXRabJ6RmNNCQ83LAD2jy52Khj0m3OffpNdA=="; + url = "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz"; + sha512 = "1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw=="; }; }; "merge-descriptors-1.0.1" = { @@ -4567,22 +4531,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-forge-0.10.0" = { + "node-forge-1.2.0" = { name = "node-forge"; packageName = "node-forge"; - version = "0.10.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; - sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; - }; - }; - "node-releases-1.1.72" = { - name = "node-releases"; - packageName = "node-releases"; - version = "1.1.72"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz"; - sha512 = "LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="; + url = "https://registry.npmjs.org/node-forge/-/node-forge-1.2.0.tgz"; + sha512 = "M4AsdaP0bGNaSPtatd/+f76asocI0cFaURRdeQVZvrJBrYp2Qohv5hDbGHykuNqCb1BYjWHjdS6HlN50qbztwA=="; }; }; "node-releases-2.0.1" = { @@ -5017,15 +4972,6 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pkg-dir-2.0.0" = { - name = "pkg-dir"; - packageName = "pkg-dir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; - }; - }; "pkg-dir-4.2.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -5179,15 +5125,6 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "progress-2.0.3" = { - name = "progress"; - packageName = "progress"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; - }; - }; "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; @@ -5530,13 +5467,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.45.1" = { + "sass-1.49.0" = { name = "sass"; packageName = "sass"; - version = "1.45.1"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.45.1.tgz"; - sha512 = "pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz"; + sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; }; }; "sass-loader-12.4.0" = { @@ -5593,13 +5530,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.11" = { + "selfsigned-2.0.0" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.11"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz"; - sha512 = "aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz"; + sha512 = "cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ=="; }; }; "semver-6.3.0" = { @@ -5971,13 +5908,13 @@ let sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; }; }; - "terser-webpack-plugin-5.2.5" = { + "terser-webpack-plugin-5.3.0" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz"; - sha512 = "3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz"; + sha512 = "LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ=="; }; }; "text-table-0.2.0" = { @@ -6043,13 +5980,13 @@ let sha512 = "gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="; }; }; - "tsconfig-paths-3.11.0" = { + "tsconfig-paths-3.12.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; - sha512 = "7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz"; + sha512 = "e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg=="; }; }; "tslib-2.3.1" = { @@ -6259,13 +6196,13 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; - "vue-eslint-parser-8.0.1" = { + "vue-eslint-parser-8.1.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.0.1.tgz"; - sha512 = "lhWjDXJhe3UZw2uu3ztX51SJAPGPey1Tff2RK3TyZURwbuI4vximQLzz4nQfCv8CZq4xx7uIiogHMMoSJPr33A=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.1.0.tgz"; + sha512 = "R8Pl6MSvuU81JKyUguexcABQxfM51Q2ZJVBX0TrKiLltPB+haVLp4hfuR5msiu9oqpsQkaV+TF18r4CBw9c9qg=="; }; }; "vue-hot-reload-api-2.3.4" = { @@ -6385,13 +6322,13 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "webpack-5.65.0" = { + "webpack-5.67.0" = { name = "webpack"; packageName = "webpack"; - version = "5.65.0"; + version = "5.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz"; - sha512 = "Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz"; + sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw=="; }; }; "webpack-bundle-analyzer-4.5.0" = { @@ -6421,13 +6358,13 @@ let sha512 = "MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg=="; }; }; - "webpack-dev-server-4.7.1" = { + "webpack-dev-server-4.7.3" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.7.1"; + version = "4.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.1.tgz"; - sha512 = "bkoNgFyqlF/CT726Axtf/ELHHYsTZJWz3QJ6HqstWPbalhjAPunlPH9bwt/Lr5cLb+uoLmsta6svVplVzq8beA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz"; + sha512 = "mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q=="; }; }; "webpack-merge-5.8.0" = { @@ -6439,22 +6376,22 @@ let sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; }; }; - "webpack-sources-3.2.2" = { + "webpack-sources-3.2.3" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz"; - sha512 = "cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"; + sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; }; - "webpack-subresource-integrity-5.0.0" = { + "webpack-subresource-integrity-5.1.0" = { name = "webpack-subresource-integrity"; packageName = "webpack-subresource-integrity"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.0.0.tgz"; - sha512 = "x9514FpLRydO+UAQ8DY4aLtCjxmdLkuQVcDFN1kGzuusREYJ1B0rzk/iIlWiL6dnvrhEGFj2+UsdxDkP8Z4UKg=="; + url = "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz"; + sha512 = "sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q=="; }; }; "websocket-driver-0.7.4" = { @@ -6563,9 +6500,9 @@ let version = "0.0.0"; src = ./.; dependencies = [ - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."debug-4.3.3" sources."json5-2.2.0" @@ -6579,351 +6516,133 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.5" - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + sources."@babel/generator-7.16.8" + sources."@babel/helper-annotate-as-pure-7.16.7" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" + (sources."@babel/helper-compilation-targets-7.16.7" // { dependencies = [ - sources."browserslist-4.18.1" - sources."caniuse-lite-1.0.30001286" - sources."electron-to-chromium-1.4.17" + sources."browserslist-4.19.1" + sources."caniuse-lite-1.0.30001294" + sources."electron-to-chromium-1.4.30" sources."node-releases-2.0.1" sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" (sources."@babel/helper-define-polyfill-provider-0.3.0" // { dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" sources."debug-4.3.3" sources."ms-2.1.2" sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.8.0" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.5" - (sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-async-generator-functions-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-class-properties-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-class-static-block-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-dynamic-import-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-export-namespace-from-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-json-strings-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-numeric-separator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-object-rest-spread-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-optional-chaining-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-private-methods-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-private-property-in-object-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + sources."@babel/helper-split-export-declaration-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/helper-validator-option-7.16.7" + sources."@babel/helper-wrap-function-7.16.8" + sources."@babel/helpers-7.16.7" + sources."@babel/highlight-7.16.7" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" sources."@babel/plugin-syntax-async-generators-7.8.4" - (sources."@babel/plugin-syntax-class-properties-7.12.13" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-syntax-class-static-block-7.14.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + 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" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" - (sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.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" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + 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-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-syntax-top-level-await-7.14.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-arrow-functions-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-async-to-generator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-block-scoped-functions-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-block-scoping-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-classes-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-computed-properties-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-destructuring-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-dotall-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-duplicate-keys-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-exponentiation-operator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-for-of-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-function-name-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-member-expression-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-amd-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-commonjs-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-systemjs-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-umd-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - (sources."@babel/plugin-transform-new-target-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-object-super-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-parameters-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-property-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - sources."@babel/plugin-transform-regenerator-7.16.5" - (sources."@babel/plugin-transform-reserved-words-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-shorthand-properties-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-spread-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-sticky-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-template-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-typeof-symbol-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-unicode-escapes-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-unicode-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/preset-env-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" - sources."@babel/template-7.16.0" - (sources."@babel/traverse-7.16.5" // { + sources."@babel/template-7.16.7" + (sources."@babel/traverse-7.16.10" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.16.0" + sources."@babel/types-7.16.8" sources."@discoveryjs/json-ext-0.5.5" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ - sources."acorn-8.6.0" + sources."acorn-8.7.0" sources."debug-4.3.3" sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."espree-9.3.0" sources."globals-13.12.0" sources."ignore-4.0.6" sources."ms-2.1.2" @@ -6946,18 +6665,18 @@ let sources."@nodelib/fs.walk-1.2.6" sources."@polka/url-1.0.0-next.21" sources."@types/body-parser-1.19.2" - sources."@types/bonjour-3.5.9" + 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.2.1" - sources."@types/eslint-scope-3.7.1" + sources."@types/eslint-8.2.2" + sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.26" + sources."@types/express-serve-static-core-4.17.27" sources."@types/glob-7.1.4" sources."@types/html-minifier-terser-6.0.0" sources."@types/http-proxy-1.17.8" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" @@ -7008,7 +6727,6 @@ let ]; }) sources."ajv-keywords-3.5.2" - sources."ansi-colors-4.1.1" sources."ansi-html-community-0.0.8" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -7032,7 +6750,7 @@ let ]; }) sources."async-2.6.3" - sources."axios-0.24.0" + sources."axios-0.25.0" (sources."babel-loader-8.2.3" // { dependencies = [ sources."schema-utils-2.7.1" @@ -7044,7 +6762,7 @@ let sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" + sources."babel-plugin-polyfill-corejs3-0.5.0" sources."babel-plugin-polyfill-regenerator-0.3.0" sources."balanced-match-1.0.0" sources."batch-0.6.1" @@ -7061,18 +6779,14 @@ let sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - (sources."browserslist-4.16.6" // { - dependencies = [ - sources."colorette-1.2.2" - ]; - }) + sources."browserslist-4.19.1" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" sources."bytes-3.0.0" sources."call-bind-1.0.0" sources."callsites-3.1.0" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001234" + sources."caniuse-lite-1.0.30001299" sources."chalk-2.4.2" (sources."chokidar-3.5.2" // { dependencies = [ @@ -7113,24 +6827,23 @@ let sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-to-clipboard-3.3.1" - (sources."copy-webpack-plugin-10.2.0" // { + (sources."copy-webpack-plugin-10.2.1" // { dependencies = [ - sources."@types/json-schema-7.0.9" - sources."ajv-8.8.2" + sources."ajv-8.9.0" sources."ajv-keywords-5.1.0" sources."array-union-3.0.1" sources."glob-parent-6.0.2" - sources."globby-12.0.2" + sources."globby-12.2.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" sources."slash-4.0.0" ]; }) - (sources."core-js-compat-3.19.3" // { + (sources."core-js-compat-3.20.2" // { dependencies = [ - sources."browserslist-4.18.1" - sources."caniuse-lite-1.0.30001286" - sources."electron-to-chromium-1.4.17" + sources."browserslist-4.19.1" + sources."caniuse-lite-1.0.30001298" + sources."electron-to-chromium-1.4.39" sources."node-releases-2.0.1" sources."semver-7.0.0" ]; @@ -7183,11 +6896,10 @@ let sources."dot-case-3.0.4" sources."duplexer-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.749" + sources."electron-to-chromium-1.4.43" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.8.3" - sources."enquirer-2.3.6" sources."entities-2.2.0" sources."envinfo-7.8.1" (sources."es-abstract-1.19.1" // { @@ -7207,9 +6919,9 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.5.0" // { + (sources."eslint-8.7.0" // { dependencies = [ - sources."acorn-8.6.0" + sources."acorn-8.7.0" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" @@ -7222,13 +6934,12 @@ let sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."ms-2.1.2" sources."supports-color-7.2.0" ]; @@ -7245,13 +6956,13 @@ let sources."resolve-1.20.0" ]; }) - (sources."eslint-module-utils-2.7.1" // { + (sources."eslint-module-utils-2.7.2" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) - (sources."eslint-plugin-import-2.25.3" // { + (sources."eslint-plugin-import-2.25.4" // { dependencies = [ sources."doctrine-2.1.0" sources."resolve-1.20.0" @@ -7326,7 +7037,7 @@ let sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.2.4" - sources."follow-redirects-1.14.4" + sources."follow-redirects-1.14.7" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-monkey-1.0.3" @@ -7361,7 +7072,7 @@ let sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" sources."has-1.0.3" @@ -7401,7 +7112,7 @@ let sources."humanize-duration-3.27.1" sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" - sources."ignore-5.1.8" + sources."ignore-5.2.0" sources."immutable-4.0.0" (sources."import-fresh-3.3.0" // { dependencies = [ @@ -7478,7 +7189,7 @@ let sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."jest-worker-27.4.2" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -7494,7 +7205,7 @@ let sources."kind-of-6.0.3" sources."klona-2.0.5" sources."levn-0.4.1" - sources."linkifyjs-3.0.4" + sources."linkifyjs-3.0.5" sources."loader-runner-4.2.0" (sources."loader-utils-1.4.0" // { dependencies = [ @@ -7514,7 +7225,7 @@ let ]; }) sources."media-typer-0.3.0" - sources."memfs-3.4.0" + sources."memfs-3.4.1" sources."merge-descriptors-1.0.1" (sources."merge-source-map-1.1.0" // { dependencies = [ @@ -7545,8 +7256,8 @@ let sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."no-case-3.0.4" - sources."node-forge-0.10.0" - sources."node-releases-1.1.72" + sources."node-forge-1.2.0" + sources."node-releases-2.0.1" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.1" @@ -7607,7 +7318,6 @@ let sources."picomatch-2.2.2" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-2.0.0" sources."plurals-cldr-2.0.1" sources."popper.js-1.16.1" (sources."portfinder-1.0.28" // { @@ -7641,7 +7351,6 @@ let sources."prettier-1.19.1" sources."pretty-error-4.0.0" sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" (sources."proxy-addr-2.0.7" // { dependencies = [ sources."ipaddr.js-1.9.1" @@ -7693,11 +7402,11 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.45.1" + sources."sass-1.49.0" sources."sass-loader-12.4.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" - sources."selfsigned-1.10.11" + sources."selfsigned-2.0.0" (sources."semver-7.3.5" // { dependencies = [ sources."lru-cache-6.0.0" @@ -7765,7 +7474,7 @@ let }) ]; }) - (sources."terser-webpack-plugin-5.2.5" // { + (sources."terser-webpack-plugin-5.3.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -7777,7 +7486,7 @@ let sources."toggle-selection-1.0.6" sources."toidentifier-1.0.1" sources."totalist-1.1.0" - sources."tsconfig-paths-3.11.0" + sources."tsconfig-paths-3.12.0" sources."tslib-2.3.1" sources."type-check-0.4.0" sources."type-fest-0.20.2" @@ -7815,13 +7524,13 @@ let sources."v8-compile-cache-2.3.0" sources."vary-1.1.2" sources."vue-2.6.14" - (sources."vue-eslint-parser-8.0.1" // { + (sources."vue-eslint-parser-8.1.0" // { dependencies = [ - sources."acorn-8.5.0" - sources."debug-4.3.2" - sources."eslint-scope-6.0.0" - sources."eslint-visitor-keys-3.0.0" - sources."espree-9.0.0" + sources."acorn-8.7.0" + sources."debug-4.3.3" + sources."eslint-scope-7.1.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."estraverse-5.3.0" sources."ms-2.1.2" ]; @@ -7839,9 +7548,9 @@ let sources."vuex-3.6.2" sources."watchpack-2.3.1" sources."wbuf-1.7.3" - (sources."webpack-5.65.0" // { + (sources."webpack-5.67.0" // { dependencies = [ - sources."acorn-8.6.0" + sources."acorn-8.7.0" ]; }) (sources."webpack-bundle-analyzer-4.5.0" // { @@ -7864,7 +7573,6 @@ let }) (sources."webpack-dev-middleware-5.3.0" // { dependencies = [ - sources."@types/json-schema-7.0.9" sources."ajv-8.8.2" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" @@ -7873,15 +7581,15 @@ let sources."schema-utils-4.0.0" ]; }) - (sources."webpack-dev-server-4.7.1" // { + (sources."webpack-dev-server-4.7.3" // { dependencies = [ - sources."@types/json-schema-7.0.9" sources."ajv-8.8.2" sources."ajv-keywords-5.1.0" sources."ansi-regex-6.0.1" sources."array-union-2.1.0" sources."del-6.0.0" - sources."globby-11.0.4" + sources."fast-glob-3.2.10" + sources."globby-11.1.0" sources."is-path-inside-3.0.3" sources."json-schema-traverse-1.0.0" sources."p-map-4.0.0" @@ -7890,8 +7598,8 @@ let ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.2" - sources."webpack-subresource-integrity-5.0.0" + sources."webpack-sources-3.2.3" + sources."webpack-subresource-integrity-5.1.0" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix index d09eab0f85..bec3164a00 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-+5yAwBUyhqmoV8l8VwIQMxnSgjNZNbGfGajPhA+IFwA="; + sha256 = "sha256-B2HAEJj8TX44YagJ993d7js/wi1D39/Hi85rxJoKa3U="; }; buildInputs = [ libnotify glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix index 204a090136..5f0c09303f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U="; }; - vendorSha256 = "sha256-TncVMDeZ8+Wuv1o0Cjks3Ve1OsO+WXH9mClC6GNaSas="; + vendorSha256 = "sha256-r0mYrtWllKOvKQJmW0ie4l+1nsCwU8O+CV6ESXNoETk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix index 7b52145f79..582295a2bc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.4"; + version = "5.5"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-ppaxfnZB3+aOzvc/wk1f8D2mFYngQspEOl9XArNMdBE="; + sha256 = "sha256-uygMc4SPYBk+G+ENp+KsgDhkm+oq9ZMvWX4wF6iohPM="; }; # dbus-1.pc has datadir=/etc diff --git a/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix index 7b25018412..7c362961b4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cloak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloak"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "evansmurithi"; repo = pname; rev = "v${version}"; - sha256 = "139z2ga0q7a0vwfnn5hpzsz5yrrrr7rgyd32yvfj5sxiywkmczs7"; + hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg="; }; - cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj"; + cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index 209e9f9e3b..a0ceabf9d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "cointop"; version = "1.6.10"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 870d3cceb0..1741e90866 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; }; - vendorSha256 = "1psyx8nqzpx3p1ya9y3q9h0hhfx4iqmix089b2h6bp9lgqbj5zn8"; + vendorSha256 = "1y0k03lg9dh3bpi10xzv03h7gq7h0hgggs304p78p3jkr8pmkqss"; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 3f62ffe7df..43bcef4c8d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.2"; # When updating also update fetchedMavenDeps.sha256 + version = "21.3.4"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "SifnnzuETFKtnEwLjJtB7CV2QZaToex3MjKGuiShlwo="; + sha256 = "sha256-n8QaOYFLQYxJcq/+7bBIKuYtqeIJIwa8b1pniH+FMXk="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "grSFtkohTlLtK8qE4A4wVppC6UHcyaXRQlGnrOmQDC4="; + outputHash = "sha256-fJs/XM8PZqm/CrhShtcy4R/4s8dCc1WdXIvYSCYZ4dw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix new file mode 100644 index 0000000000..4dfb5b6422 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix @@ -0,0 +1,47 @@ +{ lib, mkDerivation, fetchFromGitHub +, cmake, gcc-arm-embedded, python3Packages +, qtbase, qtmultimedia, qttranslations, SDL, gtest +, dfu-util +}: + +mkDerivation rec { + pname = "edgetx"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "EdgeTX"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-TffHFgr3g7v4VnNSSlLITz4cYjHM6wE0aI85W1g4IFA="; + }; + + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + + buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp \ + -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + ''; + + cmakeFlags = [ + "-DGTEST_ROOT=${gtest.src}/googletest" + "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" + "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + ]; + + meta = with lib; { + description = "EdgeTX Companion transmitter support software"; + longDescription = '' + EdgeTX Companion is used for many different tasks like loading EdgeTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + homepage = "https://edgetx.org/"; + license = licenses.gpl2Only; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ elitak lopsided98 wucke13 ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix new file mode 100644 index 0000000000..412aec97ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix @@ -0,0 +1,129 @@ +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, python3 +, zbar +, secp256k1 +, enableQt ? true +}: + +let + version = "4.1.5"; + + libsecp256k1_name = + if stdenv.isLinux then "libsecp256k1.so.0" + else if stdenv.isDarwin then "libsecp256k1.0.dylib" + else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; + + libzbar_name = + if stdenv.isLinux then "libzbar.so.0" + else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; + + py = python3.override { + packageOverrides = self: super: { + + aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { + version = "0.18.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; + }; + }); + }; + }; + +in + +python3.pkgs.buildPythonApplication { + pname = "electrum-grs"; + inherit version; + + src = fetchFromGitHub { + owner = "Groestlcoin"; + repo = "electrum-grs"; + rev = "v${version}"; + sha256 = "0wvbjj80r1zxpz24adkicxsdjnv3nciga6rl1wfmky463w03rca2"; + }; + + postPatch = '' + substituteInPlace contrib/requirements/requirements.txt \ + --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + ''; + + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + + propagatedBuildInputs = with py.pkgs; [ + aiohttp + aiohttp-socks + aiorpcx + attrs + bitstring + cryptography + dnspython + groestlcoin_hash + jsonrpclib-pelix + matplotlib + pbkdf2 + protobuf + pysocks + qrcode + requests + tlslite-ng + # plugins + btchip + ckcc-protocol + keepkey + trezor + ] ++ lib.optionals enableQt [ + pyqt5 + qdarkstyle + ]; + + preBuild = '' + sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py + substituteInPlace ./electrum_grs/ecc_fast.py \ + --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} + '' + (if enableQt then '' + substituteInPlace ./electrum_grs/qrscanner.py \ + --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + '' else '' + sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt + ''); + + postInstall = lib.optionalString stdenv.isLinux '' + # Despite setting usr_share above, these files are installed under $out/nix ... + mv $out/${python3.sitePackages}/nix/store/*/share $out + rm -rf $out/${python3.sitePackages}/nix + + substituteInPlace $out/share/applications/electrum-grs.desktop \ + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-grs %u"' \ + "Exec=$out/bin/electrum-grs %u" \ + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-grs --testnet %u"' \ + "Exec=$out/bin/electrum-grs --testnet %u" + + ''; + + postFixup = lib.optionalString enableQt '' + wrapQtApp $out/bin/electrum-grs + ''; + + postCheck = '' + $out/bin/electrum-grs help >/dev/null + ''; + + meta = with lib; { + description = "Lightweight Groestlcoin wallet"; + longDescription = '' + An easy-to-use Groestlcoin client featuring wallets generated from + mnemonic seeds (in addition to other, more advanced, wallet options) + and the ability to perform transactions without downloading a copy + of the blockchain. + ''; + homepage = "https://groestlcoin.org/"; + downloadPage = "https://github.com/Groestlcoin/electrum-grs/releases/tag/v{version}"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ gruve-p ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 841b943e86..29a1291929 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -74,9 +74,14 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum/tests ''; - prePatch = '' + postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + + # according to upstream, this is fine + # https://github.com/spesmilo/electrum/issues/7361 + substituteInPlace contrib/requirements/requirements.txt \ + --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" ''; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index a070bc321b..416adbe60c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -76,6 +76,11 @@ python3.pkgs.buildPythonApplication { prePatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + + # according to upstream, this is fine + # https://github.com/spesmilo/electrum/issues/7361 + substituteInPlace contrib/requirements/requirements.txt \ + --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix index 3acb493c1c..aa29063274 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -1,20 +1,36 @@ -{ lib, stdenv, python3Packages, radicale3 }: +{ lib +, stdenv +, python3 +, radicale3 +}: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + flask_wtf = super.flask_wtf.overridePythonAttrs (old: rec { + version = "0.15.1"; + src = old.src.override { + inherit version; + sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc"; + }; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.30.8"; + version = "0.32.1"; - src = python3Packages.fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-HBLQsq3B6TMdcnUt8ukbk3+S0Ed44+gePkpuGZ2AyC4="; + sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ etebase etesync flask flask_wtf - radicale3 + (python.pkgs.toPythonModule (radicale3.override { python3 = python; })) ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix b/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix index 2c31f24b6b..e838bd3eda 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0="; }; - vendorSha256 = "sha256-Ac3f17Ws3Ne8Zo0vT+qlaMm/rhak9ua2jh5jlT6jF2Y="; + vendorSha256 = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo="; # package does not contain any tests as of v0.2.3 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix index 93886b3a2c..9c6d95b319 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4="; + sha256 = "1qmxzpv2xy79aznzzr9fay61mzf1pdzv85ah3w3q2kl2i7pskfxb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix deleted file mode 100644 index 1f2ec28054..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/fslint/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: - -let pythonEnv = python2.withPackages(ps: [ ps.pyGtkGlade]); -in stdenv.mkDerivation rec { - pname = "fslint"; - version = "2.46"; - - src = fetchFromGitHub { - owner = "pixelb"; - repo = "fslint"; - rev = version; - sha256 = "048pc1rsslbsrfchl2wmdd4hpa2gycglib7kdx8vqs947zcm0sfv"; - }; - - buildInputs = [ - pythonEnv makeWrapper - ]; - - prePatch = '' - substituteInPlace fslint-gui --replace "liblocation=os.path.dirname(os.path.abspath(sys.argv[0]))" "liblocation='$out'" - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp * -R $out/ - cp fslint-gui $out/bin/fslint - - wrapProgram "$out/bin/fslint" \ - --prefix PYTHONPATH : "${pythonEnv.interpreter}" - runHook postInstall - ''; - - meta = with lib; { - description = "A utility to find and clean various forms of lint on a filesystem"; - homepage = "https://www.pixelbeat.org/fslint/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.dasj19 ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix index dbc66458a3..5668006dfd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = version; - sha256 = "SWt46YSXI6Dsv0ed3H4sN8kbEzQDL4U6jxFSbMyspJ0="; + sha256 = "1261gwxiky37pvzmmbrpml1psa22kkglb141ybj1fbnwg6j7jvlf"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 8f5eaf47b5..12649b5b7f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.20.3"; + version = "1.20.4"; src = fetchPypi { inherit pname version; - sha256 = "6d1d97bd08a2a0dcfb0578e759fb83c4902b395405b3e3238673f684973b0556"; + sha256 = "sha256-K22ee6qcVXbJJKH5/6EMvSdSNKBb7xAP++1s+A5ENu4="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix deleted file mode 100644 index c1a4ea2b67..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gksu/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu, - intltool, libstartup_notification, gtk-doc, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - version = "2.0.2"; - pname = "gksu"; - - src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; - sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; - }; - - nativeBuildInputs = [ - pkg-config intltool gtk-doc wrapGAppsHook - ]; - - buildInputs = [ - gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring - ]; - - propagatedBuildInputs = [ - libgksu - ]; - - hardeningDisable = [ "format" ]; - - patches = [ - # https://savannah.nongnu.org/bugs/index.php?36127 - ./gksu-2.0.2-glib-2.31.patch - ]; - - postPatch = '' - sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop - ''; - - configureFlags = [ "--disable-nautilus-extension" ]; - - meta = { - description = "A graphical frontend for libgksu"; - longDescription = '' - GKSu is a library that provides a GTK frontend to su and sudo. - It supports login shells and preserving environment when acting as - a su frontend. It is useful to menu items or other graphical - programs that need to ask a user's password to run another program - as another user. - ''; - homepage = "https://www.nongnu.org/gksu/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch b/third_party/nixpkgs/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch deleted file mode 100644 index fd711a321a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 7 Apr 2012 17:57:36 -0400 -Subject: [PATCH] Fix glib includes for building with >=glib-2.31 - -glib-2.31 and newer no longer allow most glib subheaders to be included -directly. - -https://savannah.nongnu.org/bugs/index.php?36127 ---- - nautilus-gksu/libnautilus-gksu.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c -index 8e44d29..4acf3f8 100644 ---- a/nautilus-gksu/libnautilus-gksu.c -+++ b/nautilus-gksu/libnautilus-gksu.c -@@ -5,7 +5,7 @@ - #include - #include - --#include -+#include - #include - #include - #include --- -1.7.8.5 - diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix similarity index 69% rename from third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix rename to third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix index e7a413e63b..00e55b9e7a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-secrets/default.nix @@ -5,19 +5,19 @@ , gettext , fetchFromGitLab , python3Packages -, libhandy , libpwquality -, wrapGAppsHook -, gtk3 +, wrapGAppsHook4 +, gtk4 , glib , gdk-pixbuf , gobject-introspection , desktop-file-utils -, appstream-glib }: +, appstream-glib +, libadwaita }: python3Packages.buildPythonApplication rec { - pname = "gnome-passwordsafe"; - version = "5.1"; + pname = "gnome-secrets"; + version = "6.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - sha256 = "sha256-RgpkLoqhwCdaPZxC1Qe0MpLtYLevNCOxbvwEEI0cpE0="; + sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8="; }; nativeBuildInputs = [ @@ -34,27 +34,39 @@ python3Packages.buildPythonApplication rec { ninja gettext pkg-config - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 + gtk4 glib gdk-pixbuf - libhandy + libadwaita ]; propagatedBuildInputs = with python3Packages; [ pygobject3 construct pykeepass + pyotp ] ++ [ libpwquality # using the python bindings ]; + postPatch = '' + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"; + ''; + + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { broken = stdenv.hostPlatform.isStatic; # libpwquality doesn't provide bindings when static description = "Password manager for GNOME which makes use of the KeePass v.4 format"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 75079967db..ad568863d2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "10.1"; + version = "10.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-tU37dKBxzz+sxe4R7xbscpD28if8QOm6xpZEOdhK8lE="; + sha256 = "sha256-rKUj2XeVI2KdyCinwqipINg9OO0IhCSFBjSeYBSMLcQ="; }; patches = (substituteAll { diff --git a/third_party/nixpkgs/pkgs/applications/misc/gxmessage/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gxmessage/default.nix index 9f09e3d978..f7c5714f12 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gxmessage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gxmessage/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.4.3"; src = fetchurl { - url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz"; + url = "https://trmusson.dreamhosters.com/stuff/${pname}-${version}.tar.gz"; sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "A GTK enabled dropin replacement for xmessage"; - homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; - license = lib.licenses.gpl3; + homepage = "https://trmusson.dreamhosters.com/programs.html#gxmessage"; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [jfb]; platforms = with lib.platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix index 9f1e89c0df..ce49cfd69c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hello"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; - sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; + sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix index 6ada1fd749..0562e1d52d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix @@ -1,9 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub, runtimeShell }: +{ lib, buildGoModule, fetchFromGitHub, runtimeShell }: -buildGoPackage rec { +buildGoModule rec { pname = "hivemind"; - version = "1.0.6"; - goPackagePath = "github.com/DarthSim/hivemind"; + version = "1.1.0"; postPatch = '' substituteInPlace process.go --replace \"/bin/sh\" \"${runtimeShell}\" @@ -13,8 +12,9 @@ buildGoPackage rec { owner = "DarthSim"; repo = "hivemind"; rev = "v${version}"; - sha256 = "0afcnd03wsdphbbpha65rv5pnv0x6ldnnm6rnv1m6xkkywgnzx95"; + sha256 = "YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc="; }; + vendorSha256 = "KweFhT8Zueg45Q/vw3kNET35hB+0WbUPfz0FYaAiIA8="; meta = with lib; { homepage = "https://github.com/DarthSim/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 264b4ba53d..3097de9117 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.92.0"; + version = "0.92.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rzAt6jGj1MJ5AvkEKjAH91mKnUcLOPgHgiDkzkdibks="; + sha256 = "sha256-fOurAHMDOEDdPSo1qCa6es7D0EZ+Zgucm43xwzAPYPI="; }; - vendorSha256 = "sha256-ftA7ktZ6dEownEwJC4tK5/V3fl8toACiFiq9xTa7NE4="; + vendorSha256 = "sha256-ZIbpzddgC1EHKia1KGWhQCSD663/0tK36GytsRpUB9c="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix b/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix index e8bfa00406..0fd6e72a57 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inherd-quake"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "phodal"; repo = "quake"; rev = "v${version}"; - sha256 = "UujcsvjbXda1DdV4hevUP4PbdbOKHQ3O/FBDlhAjfq0="; + sha256 = "sha256-OkgrkjO6IS6P2ZyFFbOprROPzDfQcHYCwaTKFsjjVo8="; }; - cargoSha256 = "HkdF7hLgThOWExociNgxvTxF4qL3F5CPK/j/ZKLg/m4="; + cargoSha256 = "sha256-EMRaChFwjMYZKSX5OvXYLSiwWo1m1H/tHVqc8RXX52A="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix new file mode 100644 index 0000000000..03f2558868 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchCrate +, rustPlatform +, pkg-config +, openssl +, dbus +, sqlite +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "leetcode-cli"; + version = "0.3.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "SkJLA49AXNTpiWZByII2saYLyN3bAAJTlCvhamlOEXA="; + }; + + cargoSha256 = "xhKF4qYOTdt8iCSPY5yT8tH3l54HdkOAIS2SBGzqsdo="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + dbus + sqlite + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with lib; { + description = "May the code be with you 👻"; + longDescription = "Use leetcode.com in command line"; + homepage = "https://github.com/clearloop/leetcode-cli"; + license = licenses.mit; + maintainers = with maintainers; [ congee ]; + mainProgram = "leetcode"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix index 05d5f93162..54ed6c10f4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix @@ -1,6 +1,7 @@ { lib , boost , fetchFromGitHub +, fetchpatch , installShellFiles , mkDerivation , muparser @@ -23,6 +24,14 @@ mkDerivation rec { sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch"; + sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs="; + name = "CVE-2021-45342.patch"; + }) + ]; + postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} diff --git a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix index d7f0624ad3..eadd6c8db5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; }; - vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; + vendorSha256 = "sha256-SzgiWqPuDZuSH8I9im8r+06E085PWyHwLjwxcaoJgQo="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/llama/default.nix b/third_party/nixpkgs/pkgs/applications/misc/llama/default.nix index 60598afcc4..f1822c6741 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/llama/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/llama/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6Xuwl4IpzbVfJ2MhHeImPFWxL/Y6rhnBExlh64PeGdk="; }; - vendorSha256 = "sha256-J/2R3XhGNmejc3jstJ0NWmJm/a1Re6UK6AuQb5gzh4E="; + vendorSha256 = "sha256-zbfQtTDbVWFVGQyjqlkv3mTvEPkKImzXAIXcmkh4wqk="; meta = with lib; { description = "Terminal file manager"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix index f39b88f27d..aae492c63c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix @@ -11,17 +11,18 @@ , qtmultimedia , qtsvg , qttools +, quazip }: mkDerivation rec { pname = "mediaelch"; - version = "2.8.12"; + version = "2.8.14"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "1gx4m9cf81d0b2nk2rlqm4misz67f5bpkjqx7d1l76rw2pwc6azf"; + sha256 = "sha256-yHThX5Xs+8SijNKgmg+4Mawbwi3zHA/DJQoIBy0Wchs="; fetchSubmodules = true; }; @@ -29,7 +30,11 @@ mkDerivation rec { buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ]; - prePatch = '' + qmakeFlags = [ + "USE_EXTERN_QUAZIP=${quazip}/include/quazip5" + ]; + + postPatch = '' substituteInPlace MediaElch.pro --replace "/usr" "$out" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix index 3e206730c4..8ca4ec4189 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/megacmd/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , autoconf -, automake115x +, automake , c-ares , cryptopp , curl @@ -25,22 +25,17 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc="; + sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A="; fetchSubmodules = true; }; - nativeBuildInputs = [ - autoconf - automake115x - libtool - pkg-config - ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ c-ares @@ -82,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = "https://mega.nz/cmd"; + homepage = "https://mega.io/cmd"; license = with licenses; [ bsd2 gpl3Only ]; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ lunik1 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mepo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mepo/default.nix index e65a5219ab..72e05d19bb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mepo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mepo/default.nix @@ -5,32 +5,28 @@ , zig , curl , SDL2 +, SDL2_gfx , SDL2_image , SDL2_ttf }: stdenv.mkDerivation rec { pname = "mepo"; - version = "0.2"; + version = "0.3"; src = fetchFromSourcehut { owner = "~mil"; repo = pname; rev = version; - hash = "sha256-ECq748GpjOjvchzAWlGA7H7HBvKNxY9d43+PTOWopiM="; + hash = "sha256-B7BOAFhiOTILUdzh49hTMrNNHZpCNRDLW2uekXyptqQ="; }; nativeBuildInputs = [ pkg-config zig ]; - buildInputs = [ curl SDL2 SDL2_image SDL2_ttf ]; - - buildPhase = '' - runHook preBuild + buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf ]; + preBuild = '' export HOME=$TMPDIR - zig build -Drelease-safe=true -Dcpu=baseline - - runHook postBuild ''; doCheck = true; @@ -45,8 +41,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 zig-out/bin/mepo -t $out/bin - install -Dm755 scripts/mepo_* $out/bin + zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix index 0845299c55..1a764dfaef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "3.1.4"; + version = "3.2.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "1sg8svb6xvkczp9slqnlm0b6k0z3bzdi4zzvwzzy21kpj6im9002"; + sha256 = "sha256-nvVBjBcuHKSn66Q7iTzslGOCkH6zMFf62zx5dDXSosI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix index f23ca82074..7bb9a89b8b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -31,42 +31,14 @@ let in stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48"; + sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; }; - patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [ - (fetchpatch { - name = "pdfocr.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; - sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; - }) - (fetchpatch { - name = "pdf-layer.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; - sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; - }) - (fetchpatch { - name = "pixmap.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; - sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; - }) - (fetchpatch { - name = "CVE-2021-3407.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a"; - sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6"; - }) - (fetchpatch { - name = "CVE-2021-37220.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=f5712c9949d026e4b891b25837edd2edc166151f"; - sha256 = "1zyw6w6zr7k2akpzkyycj2zzw3y5qc7afsn1ysklfj2rvb6cnsx3"; - }) - ]; - postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix index 967c3db4c6..dbc57794ee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,12 +1,12 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.4.7"; + version = "1.4.12"; name = "${pname}-${version}"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; - hash = "sha256-oEcSW7UIeiGY2fCPJQ5EtDBRtd73Q04HaSk+7ObLKJc="; + hash = "sha256-CfdXus9Zj6Tx6wAXpV2tRdqvJqowgE+NIL04v3fwtJE="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix index 41467e0c58..af50644f1f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.0.1"; + version = "1.1.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "sha256-8q5cEpQRnevY98PKaTUW10bqRAr5NVG/rU24+nx27rw="; + hash = "sha256-A6qwsbeNZXfSOZwHp19/4JQ8dZgjsK7Y2zho6vJXsGA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix index 61e7f5ad54..98609665c4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk"; + vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 6798e73c93..488f5cd997 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -13,13 +13,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - sha256 = "0vl9vfgpa1byf9vxn03j58h9zcbjd1y83b0kgv97cxm2mhqz12dg"; + sha256 = "1d3qh42cwayb5d9ymhfs2vrbg5x5x6x73hw77m3xb9y4vyhji85x"; }; # No tests diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 290553b8d3..6626c33215 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.13.19"; + version = "0.13.23"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "1jx1raynr0dgffqwya7cp4yr3szdn9bfwrhzk09bkmn8ys7d426r"; + sha256 = "1chxf6vrybjvc64k66a3l5xvv6iv6w8b03pdcrc0pr0nnlwkcf8c"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index a38421b317..84565a5dff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -223,13 +223,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4="; + sha256 = "sha256-U6g7WysHHOlZ4p5BM4tw3GGAxQmxv6ltYgAp1rO/eCg="; }; propagatedBuildInputs = with super; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix index 284339b13e..6de5736e9a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix @@ -26,6 +26,9 @@ mkDerivation rec { mkdir -p $out/etc/udev/rules.d cp 60-openrgb.rules $out/etc/udev/rules.d + install -Dm444 -t "$out/share/applications" qt/OpenRGB.desktop + install -Dm444 -t "$out/share/icons/hicolor/128x128/apps" qt/OpenRGB.png + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix index 7e63bf04ee..a2f2a676ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-dLYmY2bS+DycYBLZdLw8CsRIIE8EfDJEx6RZ/r9yMS8="; + sha256 = "sha256-xedunFzar44o+b/45isXWacDcC81wWkxgGwnpLPH/n0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix index 0776cc6572..184e09a275 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -6,6 +6,7 @@ , lib , libsodium , libuv +, nix-update-script , openssl , pkg-config , zeromq @@ -13,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "1.4"; + version = "1.6"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-syeVRweQJTNzKVl9FuIQl36WwzoI/oV2ULZbSGiDkv0="; + sha256 = "sha256-SumAHliY2cX2Q1umyw0ljCFmgnGKKHqoEFGglNJ/Bfg="; fetchSubmodules = true; }; @@ -34,6 +35,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Decentralized pool for Monero mining"; homepage = "https://github.com/SChernykh/p2pool"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfmod/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfmod/default.nix deleted file mode 100644 index da9340f307..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfmod/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, gnome-doc-utils, intltool, lib -, mono, gtk-sharp-2_0, gnome-sharp, hyena -, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "pdfmod"; - version = "0.9.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9"; - }; - - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/City-busz/Arch-Linux-Repository" - + "/master/gnome/pdfmod/pdfmod/pdfmod-mono-2.10.patch"; - sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; - }) ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp - hyena which makeWrapper wrapGAppsHook - ]; - - preConfigure = '' - substituteInPlace lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \ - --replace libpoppler-glib.so.4 libpoppler-glib.so - ''; - - postInstall = '' - makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \ - --add-flags "$out/lib/pdfmod/PdfMod.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} - ''; - - dontStrip = true; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Attic/PdfMod"; - description = "A simple application for modifying PDF documents"; - platforms = platforms.all; - maintainers = with maintainers; [ obadz ]; - license = licenses.gpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index 782fc30f4d..298b4bf2c0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.10"; + version = "4.2.12"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-YxUozMrsR65A7+xeerMaYxkGALobG1wLguWGZnoQYcU="; + sha256 = "sha256-B9V3dw5A52yPoNfROI3+wAql+Y0hY4T3sTm9uN70TQQ="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix index 18e8136eb7..c91f6f64cf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix @@ -4,6 +4,10 @@ , callPackage }: +let makeurl = { pname, year, version }: "https://download.qoppa.com/${pname}/v${year}/${ + builtins.replaceStrings [ "pdfstudio" "viewer" "." ] [ "PDFStudio" "Viewer" "_" ] "${pname}_v${version}" + }_linux64.deb"; +in { pdfstudio = callPackage ./common.nix rec { pname = program; @@ -17,9 +21,7 @@ libgccjit #for libstdc++.so.6 and libgomp.so.1 ]; src = fetchurl { - url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${ - builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; + url = makeurl { inherit pname year version; }; sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45"; }; }; @@ -33,9 +35,7 @@ PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { - url = "https://download.qoppa.com/${pname}/v${year}/PDFStudioViewer_v${ - builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; + url = makeurl { inherit pname year version; }; sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix index 67e7407225..7acdcdf02c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix @@ -43,7 +43,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A="; + sha256 = "sha256-kfMM/YjgAktpOKHNcxxl1FPVbgATPDNRhEJ/sVT1LYs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 72941e3f23..930051d5b1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -5,8 +5,8 @@ let description = "PrusaSlicer fork with more features and faster development cycle"; versions = { - stable = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; }; - latest = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; }; + stable = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; }; + latest = { version = "2.3.57.10"; sha256 = "sha256-/1oZgmZpRoizVpklKaI12qP4bVIGYyVpybmuCIz3Y0M="; }; }; override = { version, sha256 }: super: { diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index 4771666cc2..8ee84f2ca0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tNTKX++LrWwuVGdmAjvBStNYp4p1ai12JwJmozo1GV0="; + sha256 = "sha256-xEbmCVZ28CHVvI6tGCQWzMFrmVyCQ2Xmzh2Lz3tGU14="; }; - cargoSha256 = "sha256-t1d8K0v7kHPjH78lYCRCa4pyPCvyQT1kaQtVpoROZIE="; + cargoSha256 = "sha256-8g/dNCm5I5/qCAPOGQ9a453DND8LoeSpX9Nb8LwUme4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix index 3f964824e6..0914d2599c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix @@ -1,23 +1,23 @@ { lib, mkDerivation, fetchFromGitHub -, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors +, cmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors , nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry , python3, pyotherside }: mkDerivation rec { pname = "pure-maps"; - version = "2.6.5"; + version = "2.9.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - sha256 = "17gfb7rdaadmcdba4mhish0jrz9lmiban6fpzwhyvn8z1rc43zx9"; + hash = "sha256-pMPjY6OXR6THiSQZ4mw9Kz+tAXJaOwzJEcpPOyZ+YKI="; fetchSubmodules = true; }; nativeBuildInputs = [ - qmake python3 qttools python3.pkgs.wrapPython + cmake python3 qttools python3.pkgs.wrapPython ]; buildInputs = [ @@ -25,12 +25,7 @@ mkDerivation rec { nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry ]; - postPatch = '' - substituteInPlace pure-maps.pro \ - --replace '$$[QT_HOST_BINS]/lconvert' 'lconvert' - ''; - - qmakeFlags = [ "FLAVOR=kirigami" ]; + cmakeFlags = [ "-DFLAVOR=kirigami" ]; pythonPath = with python3.pkgs; [ gpxpy ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix index d3449da97f..f557a8bf99 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qMasterPassword/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, libX11, libXtst, openssl, libscrypt }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, qttools, libX11, libXtst, openssl, libscrypt }: mkDerivation rec { - name = "qMasterPassword"; - version = "1.2.2"; + pname = "qMasterPassword-unstable"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "bkueng"; - repo = name; - rev = "v${version}"; - sha256 = "0l0jarvfdc69rcjl2wa0ixq8gp3fmjsy9n84m38sxf3n9j2bh13c"; + repo = "qMasterPassword"; + rev = "7ade33952531731c266c2597f4212c93aca68c59"; + sha256 = "sha256-MdV6AkRh072++sKoeuwvhgqLEfUkTF34xt6OH9n59Q0="; }; buildInputs = [ qtbase libX11 libXtst openssl libscrypt ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake qttools ]; # Upstream install is mostly defunct. It hardcodes target.path and doesn't # install anything but the binary. @@ -22,12 +22,16 @@ mkDerivation rec { ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword '' else '' mkdir -p $out/bin - mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps} + mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps,qMasterPassword/translations} mv qMasterPassword $out/bin mv data/qMasterPassword.desktop $out/share/applications mv LICENSE README.md $out/share/doc/qMasterPassword mv data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png mv data/icons/* $out/share/icons/qmasterpassword + lrelease ./data/translations/translation_de.ts + lrelease ./data/translations/translation_pl.ts + mv ./data/translations/translation_de.qm $out/share/qMasterPassword/translations/translation_de.qm + mv ./data/translations/translation_pl.qm $out/share/qMasterPassword/translations/translation_pl.qm ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 10dc4edc48..86ed90cbd4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -18,13 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.1.3"; + version = "3.27.1.6"; src = fetchFromGitHub { + name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-DHDfDwGrYMRd5gxFaPL06B/wssQho9420MxUg8fI2r0="; + sha256 = "sha256-NnaCwbk8w0ZPnBz7xxs5LMFMUSnEERCSRBXpJL0u+s0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/ratt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ratt/default.nix index a7583dabd7..8b49232051 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ratt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ratt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-NW5B9oO/LJqPigvOcMeL4hQLKmAL01I2Ff41y169BTQ="; + vendorSha256 = "sha256-4TEdnJ7lCuBka6rtoKowf5X3VqCgfwvGHeJ5B5Q5C20="; # tests try to access the internet to scrape websites doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix index 6a4beec6a5..0c1d9cf20e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.18"; + version = "0.0.19"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-Yrq21eiyNem9P219FxuQMHpagKQDaNsASwi2REaDAgk="; + sha256 = "sha256-HXWE6688jhRQQEiZuPfuJStSQeueqoWwwa+PfneHprw="; }; vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix index 1d232d8a3f..58adba4499 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rofi-emoji"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Mange"; repo = pname; rev = "v${version}"; - sha256 = "01f9nw54mbwlj00mclf7qc2y95riaihzznbbmp0wc4c52pvxki4q"; + sha256 = "sha256-y+WJYSiDXYvg+N3wok44hJ8Tuqrd3E63pZyiYx0NWXg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix index 7a86ef0f23..0dff62cca2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "marvinkreis"; repo = pname; rev = version; - sha256 = "sha256-TNAAImQaIJRgvD8kFf2oHNj4bQiq1NhD8KkCgW5dSK8="; + sha256 = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix index bce4b297cd..1d7c183ea7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "davatorium"; repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "vre8kFou01P7S6KBBtfzvfFP554mhV+d6rjvY+GfWXk="; + sha256 = "sha256-bUedRRmrfdmzNW+2PzJvLbCTIWta2rbQ3CTLRSdJqbs="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix index c2c2da37b4..ac0d1c216a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix @@ -8,14 +8,14 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { pname = "rofi-wayland-unwrapped"; - version = "1.7.2+wayland1"; + version = "1.7.3+wayland1"; src = fetchFromGitHub { owner = "lbonn"; repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-INFYHOVjBNj8ks4UjKnxLW8mL7h1c8ySFPS/rUxOWwo="; + sha256 = "sha256-qvIxWxiQj42VgScSsrF1Yf6ifgEbZes0flNbbwc3O8I="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/skate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/skate/default.nix index f7d3173b0f..1c5dcc7be5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/skate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/skate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc="; }; - vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk="; + vendorSha256 = "sha256-2jyhDSPO/Xg3xBCA93SMSlm7D+ze0MGbNtRpL82IAsk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix index a7c0f6f704..336271b6cb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "06vb5xnss6ibgbsny6cadphfkzw8z3np5qgn3hp2wpf3hxgcnnvs"; + vendorSha256 = "11gxr22a24icryvglx9pjmqn5bjy8adfhh1nmjnd21nvy0nh4im7"; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix index b8f8684e42..6f2b43785c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-GXpM5dJ3JPf2HgrgTONyeCG6JjK4JhbcGP5ck7v4cqk="; + sha256 = "sha256-hbqIwX6YCrUQAjvKKWFAUjHvcZycnIA6v6l6qmAMuUI="; }; nativeBuildInputs = [ 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 3035f74cac..a3aafaf4ef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.8.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WsNiMlqr9ya06Urvw/m3yPsGLCTOvYFaO0oNHuVKNTs="; + sha256 = "sha256-PHKmrLN/JVPqefcK1FQByPWvMzNxHG5htXzgZ1D+Eds="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix index 8b97d9c485..2ba3783074 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "spotify-tray"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-E86rA8cBjy/bI7sZHlT40o7i23PcONXT5GTHEfcaDf0="; }; + patches = [ + (fetchpatch { + name = "fix-building-with-automake-1.16.5.patch"; + url = "https://github.com/tsmetana/spotify-tray/commit/1305f473ba4a406e907b98c8255f23154f349613.patch"; + sha256 = "sha256-u2IopfMzNCu2F06RZoJw3OAsRxxZYdIMnKnyb7/KBgk="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix index ba3880aa20..02bf65761f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -20,7 +20,8 @@ let inherit version; src = subsurfaceSrc; - sourceRoot = "source/libdivecomputer"; + + prePatch = "cd libdivecomputer"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix new file mode 100644 index 0000000000..a93436362a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, gtk3 +, glib +, gtk-layer-shell +, dbus +, dbus-glib +, json-glib +, librsvg +, libhandy +, gobject-introspection +, gdk-pixbuf +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "SwayNotificationCenter"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwayNotificationCenter"; + rev = "v${version}"; + hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0="; + }; + + nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ]; + + buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ]; + + meta = with lib; { + description = "Simple notification daemon with a GUI built for Sway"; + homepage = "https://github.com/ErikReider/SwayNotificationCenter"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index ae25ce358d..c65f9b5b84 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.13.35"; + version = "0.18.5"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-sXJto2YygPz2B5y7m8uUfOhuRCbKkZGoCmzHOhvH2MU="; + sha256 = "sha256-Rztz/qye+VsZ0czPt6xk4PwK0e6Aq1GC404+843W55Y="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-mUlwpH2XhVDtjV7ChEqlEUXffOIbips4FzQyGejFvWk="; + cargoSha256 = "sha256-H2A78ACz4TxHxCCtcOuzrfAk4awU6/HC/TlHLNtb/bk="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index 62a4151010..e345c344f9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8="; }; - vendorSha256 = "sha256-aPL3npryiCv+SiSyEUNhdPCDmM/hJDMspCbSNy+SuoA="; + vendorSha256 = "sha256-1FnewgsKlOnBAdm7vyBngrFsDHNCzpZA3IDccxALeJ8="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index bcd277cad4..fa77f3b529 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_15, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; - sha256 = "1c4qmfyfi4hm3fs5bkxjbq1hxs5sgyp531xi5z5vpnzzi5z7dw0k"; + sha256 = "sha256-bHX/RWDfe+ht66U7xg4HBZxeWlNBu4gYlIVd+9OuMNU="; }; appimageContents = appimageTools.extractType2 { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix index 08c88e376b..7e76d4a4e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix @@ -3,13 +3,13 @@ # Upstream has a `./vendor` directory with all deps which we rely upon. buildGoPackage rec { pname = "tty-share"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elisescu"; repo = "tty-share"; rev = "v${version}"; - sha256 = "sha256-+bdQ7KyGEdJJAopzGnDOcLvFNyiKqpagPR1EoU1VR5E="; + sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc="; }; goPackagePath = "github.com/elisescu/tty-share"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix index 6ccaa8ff2e..690f2148e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "sha256-KQXEiDg5KRCMFFyDlR8D6CQTxRdIZx4/U1csTFCr0sU="; + sha256 = "sha256-ZJdmsb+2ElgLFWsicc0S8EQAZhF+gnn+ARgdAyaFDgc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix index 4c5c5e3a84..6149c52e77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages, installShellFiles }: +{ lib, stdenv, fetchurl, python3, installShellFiles }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles - python2Packages.wrapPython + python3.pkgs.wrapPython ]; dontConfigure = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Upstream doesn't provide a setup.py or alike, so we follow: # http://fungi.yuggoth.org/weather/doc/install.rst#id3 installPhase = '' - site_packages=$out/${python2Packages.python.sitePackages} + site_packages=$out/${python3.sitePackages} install -Dt $out/bin -m 755 weather install -Dt $site_packages weather.py install -Dt $out/share/weather-util \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix index ef4a0ab7e5..0193321ef4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix @@ -14,13 +14,13 @@ let ]); in stdenv.mkDerivation rec { pname = "wike"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - sha256 = "sha256-Cv4gmAUqViHJEAgueLOUX+cI775QopfRA6vmHgQvCUY="; + sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix index 6fdfe92da2..e29d58039a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0hd5gnydxfncsmm7c58lvhkpnyxknvicc8f58xfh74azf363wcvm"; + sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y="; }; - vendorSha256 = "1pkdfg042kg3b6m5rf044gz5yg6vp3bbsay1mrrbaysnb3gs51dq"; + vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix index 973acbbf65..bf5b0484c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xdg-launch/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { pname = "xdg-launch"; - version = "1.11"; + version = "1.12"; postPatch = '' # fix gettext configuration @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-qrBxyJ3dUNdnE1nANLKKL0cXw/Hc4qxDoY1anIRN+VA="; + sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw="; }; preConfigure = "./autogen.sh"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index dc3415ac76..3f3c7932a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.16.2"; + version = "6.16.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-RbpvEPjRwwGbjt4+A4tbnvEdLc+hH1VszE36xXnIxPE="; + sha256 = "sha256-YR/8ApkuZtO2vJA/VlZ06JdQnGDbTzQ5fNqHgBpFZjQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix index 5b6a5dee9b..0a18975d7c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eRA9v5C6FFYs01a8cwnaVGliuNj026/ANSPC2FxEUws="; + sha256 = "sha256-iy03ucPFbFL/rRILt9P+NtfdGoIpjutbUDrykpZkAtk="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-xali/nvYVpvKIFRlOZpDNE/rv7iUHJCU9QV6RctJSO8="; + cargoSha256 = "sha256-VeV/vsM2XCg9h8KoYmniCmo/MJHjwcfn/tUCoZ1rKzM="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix index 45dba0a931..3b915cae5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix @@ -31,14 +31,14 @@ let in stdenv.mkDerivation rec { pname = "yambar"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; rev = version; - sha256 = "sha256-NzJrlPOkzstMbw37yBTah/uFYezlPB/1hrxCiXduSmc="; + sha256 = "0d8n9hvmxj7759pfqssqcl9wvb986qsph8bnjsjm9bf97mflhy6d"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix deleted file mode 100644 index d031f63a09..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/yarssr/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ fetchFromGitHub, stdenv, lib, gettext, gtk2, makeWrapper, perlPackages, gnome2 }: - -let - perlDeps = with perlPackages; [ - Glib - Gtk2 - Gnome2 - Pango - Cairo - Gnome2Canvas - Gnome2VFS - Gtk2GladeXML - Gtk2TrayIcon - XMLLibXML - XMLSAXBase - XMLParser - XMLRSS - HTMLParser - DateTime - DateTimeFormatMail - DateTimeFormatW3CDTF - DateTimeLocale - DateTimeTimeZone - ParamsValidate - ModuleImplementation - ModuleRuntime - TryTiny - ClassSingleton - URI - AnyEvent - AnyEventHTTP - commonsense - FileSlurp - JSON - Guard - LocaleGettext - ]; - libs = [ - stdenv.cc.cc.lib - gtk2 - ]; -in -stdenv.mkDerivation { - version = "unstable-2017-12-01"; - pname = "yarssr"; - - src = fetchFromGitHub { - owner = "JGRennison"; - repo = "yarssr"; - rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d"; - sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; - }; - - nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ]; - buildInputs = perlDeps ++ [ gnome2.libglade ]; - propagatedBuildInputs = libs ++ perlDeps; - - installPhase = '' - DESTDIR=$out make install - mv $out/usr/* $out/ - rm -R $out/usr - sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr - sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr - sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm - chmod a+x $out/bin/yarssr - ''; - - postFixup = '' - wrapProgram $out/bin/yarssr \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ - --set PERL5LIB "${perlPackages.makePerlPath perlDeps}" - ''; - - meta = with lib; { - homepage = "https://github.com/tsyrogit/zxcvbn-c"; - description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes"; - license = licenses.gpl1; - platforms = platforms.linux; - maintainers = with maintainers; [ xurei ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/default.nix index 1548b0581b..67fe3032d0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/default.nix @@ -30,4 +30,4 @@ let }; }; -in self.zathuraWrapper +in self diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix index ccbde19d2a..60ff0bd688 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix @@ -11,7 +11,7 @@ symlinkJoin { in '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ - --add-flags --plugins-dir="$out/lib/zathura" + --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" # zathura fish completion references the zathura_core derivation to # check for supported plugins which live in the wrapper derivation, diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 3006d5022e..bb7425f2e6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.1.2"; + version = "2.1.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-gfq5eXSoEfOb3FVAv/iDDSGeEeZxFRp4BFtwf87WQGE="; + sha256 = "sha256-prUKMtM9qf34OXaMjuWa1jTZ+2tn99rVJBdqk1El3zs="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix b/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix index ddb137137c..5682091237 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix @@ -9,31 +9,27 @@ let binaryName = "AetherP2P"; + aether-app-git = fetchFromGitHub { + owner = "aethereans"; + repo = "aether-app"; + rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; + sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; + }; in stdenv.mkDerivation rec { pname = "aether"; version = "2.0.0-dev.15"; - srcs = [ - (fetchurl { - url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; - sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; - # % in the url / canonical filename causes an error - name = "aether-tarball.tar.gz"; - }) - (fetchFromGitHub { - owner = "aethereans"; - repo = "aether-app"; - rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; - sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; - }) - ]; - - sourceRoot = "Aether-${version}+2011262249.19338c93"; + src = fetchurl { + url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; + sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; + # % in the url / canonical filename causes an error + name = "aether-tarball.tar.gz"; + }; # there is no logo in the tarball so we grab it from github and convert it in the build phase buildPhase = '' - convert ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png + convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png ''; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix b/third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix new file mode 100644 index 0000000000..31f33be386 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix @@ -0,0 +1,153 @@ +{ lib +, stdenv +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, dpkg +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, libdrm +, libxkbcommon +, makeWrapper +, mesa +, nixosTests +, nspr +, nss +, pango +, pciutils +, systemd +, undmg +, writeShellScriptBin +, xorg +}: + +let + inherit (stdenv.hostPlatform) system; + + version = "3.1.0"; + + # At first start, the program checks for supported operating systems by calling `lsb_release -a` + # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy. + fake-lsb-release = writeShellScriptBin "lsb_release" '' + echo "Distributor ID: Debian" + echo "Description: Debian GNU/Linux 10 (buster)" + echo "Release: 10" + echo "Codename: buster" + ''; + + binPath = lib.makeBinPath [ + fake-lsb-release + ]; + + systemArgs = rec { + x86_64-linux = rec { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-linux.deb"; + sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = runtimeDependencies; + + runtimeDependencies = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + pciutils + systemd + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + xorg.libxshmfence + ]; + + installPhase = '' + dpkg-deb -x $src $out + mkdir -p $out/bin + + chmod -R g-w $out + + addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung + autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung + + makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \ + --prefix PATH : ${binPath} + + mv $out/usr/share $out/share + rmdir $out/usr + + # Fix the desktop link + substituteInPlace $out/share/applications/breitbandmessung.desktop \ + --replace /opt/Breitbandmessung $out/bin + ''; + + dontAutoPatchelf = true; + dontPatchELF = true; + }; + + x86_64-darwin = { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-mac.dmg"; + sha256 = "sha256-2c8mDKJuHDSw7p52EKnJO5vr2kNTLU6r9pmGPANjE20="; + }; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications/Breitbandmessung.app + cp -R . $out/Applications/Breitbandmessung.app + runHook postInstall + ''; + }; + + aarch64-darwin = x86_64-darwin; + }.${system} or { src = throw "Unsupported system: ${system}"; }; +in +stdenv.mkDerivation ({ + pname = "breitbandmessung"; + inherit version; + + passthru.tests = { inherit (nixosTests) breitbandmessung; }; + + meta = with lib; { + description = "Broadband internet speed test app from the german Bundesnetzagentur"; + homepage = "https://www.breitbandmessung.de"; + license = licenses.unfree; + maintainers = with maintainers; [ b4dm4n ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} // systemArgs) 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 3c06908611..110d06071a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.34.81"; + version = "1.35.101"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "bMNk1l3MguQho0vck78U1e3A+/571DyoWSKKerQVE7s="; + sha256 = "q5GL6R87b3iYLiM9oJQgCOVeXzyNFY6x8fQ9KsDN7gk="; }; dontConfigure = true; 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 74133a9d47..0f021b2075 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -161,28 +161,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "97" "98") [ - # A critical Ozone/Wayland fix: - # (Note: The patch for surface_augmenter.cc doesn't apply on M97 so we extract that part.) - (fetchpatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - url = "https://github.com/chromium/chromium/commit/dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d.patch"; - excludes = [ "ui/ozone/platform/wayland/host/surface_augmenter.cc" ]; - sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; - }) - ./patches/m97-ozone-wayland-fix-surface_augmenter.patch - ] ++ lib.optionals (versionRange "98" "99") [ - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; - sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; - }) - ] ++ lib.optionals (versionRange "97" "99") [ - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) - commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; - sha256 = "sha256-2x6/rGGzTC6lKLMkVyD9RNCTsMVrtRQyr/NjSpaj2is="; - }) ]; postPatch = '' @@ -314,7 +292,6 @@ let enable_hangout_services_extension = false; enable_js_type_check = false; enable_mdns = false; - enable_nacl_nonsfi = false; enable_one_click_signin = false; enable_reading_list = false; enable_remoting = false; 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 f296da05c3..b3738ed8c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -182,8 +182,8 @@ in stdenv.mkDerivation { in with lib; '' mkdir -p "$out/bin" - eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --add-flags ${escapeShellArg commandLineArgs} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ed -v -s "$out/bin/chromium" << EOF diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch deleted file mode 100644 index e63000fabc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc -index d971d15e71426..6e5408398bcea 100644 ---- a/ui/ozone/platform/wayland/host/surface_augmenter.cc -+++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc -@@ -13,7 +13,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxSurfaceAugmenterVersion = 1; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 1; - } - - // static -@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->surface_augmenter_) -+ if (connection->surface_augmenter_ || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - -- auto augmenter = wl::Bind( -- registry, name, std::min(version, kMaxSurfaceAugmenterVersion)); -+ auto augmenter = wl::Bind(registry, name, -+ std::min(version, kMaxVersion)); - if (!augmenter) { - LOG(ERROR) << "Failed to bind surface_augmenter"; - return; 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 index 981861d6a2..0780b13611 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,27 +1,8 @@ { "stable": { - "version": "97.0.4692.99", - "sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9", - "sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8", - "deps": { - "gn": { - "version": "2021-11-03", - "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" - } - }, - "chromedriver": { - "version": "97.0.4692.71", - "sha256_linux": "0lw74ycw8vh3qz4nxynnvrw8sngy3g0vcaana15y4b2ks73gcvci", - "sha256_darwin": "1zv1ndv1d7a29yvg0b242g8dw5f8s9vxhr454zd9vahn0ar4ksbs", - "sha256_darwin_aarch64": "0jzn75rrjw3y1bqg0ywfjcm2zn9dd2h3lswih51glvdrlcz3vw2a" - } - }, - "beta": { - "version": "98.0.4758.66", - "sha256": "06hdd2cy6mdiiwbrn2jawmcidxbf46z9wyklkm3mmzbrj1xrh0gd", - "sha256bin64": "0r1lmgvvxb1h6p20gzp8qwdfs4czvqyg6bgp4wb2aax1n0448rbr", + "version": "98.0.4758.80", + "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", + "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", "deps": { "gn": { "version": "2021-12-07", @@ -29,12 +10,18 @@ "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" } + }, + "chromedriver": { + "version": "98.0.4758.48", + "sha256_linux": "1nk3vki803b30mc7ww911l68jfxmpp6mddyq02a3f68893qa2mcf", + "sha256_darwin": "09m5vsqfn6qyn3faf2p0dldll6fracjg6z81xzpyp2bh9zp8vk82", + "sha256_darwin_aarch64": "04lnbm9wiaz8dlc4qigxakcwghhjc3wvahvl5j80k8agkbv7fdvi" } }, - "dev": { - "version": "99.0.4840.0", - "sha256": "0l1azyd7an8nw2gjnn313gn6sljvw6lbd9g59s7d59lpn2bmbc7j", - "sha256bin64": "145qjhdmi39aaw0a3sarlgi67rjhik1xbm62rw7ba0wgnrbvvrjb", + "beta": { + "version": "99.0.4844.17", + "sha256": "18bhfy64rz4bilbzml33856azwzq4bhiisc2jlbncdnmk3x6n71s", + "sha256bin64": "1vaxcfgiww4skanny5ks431jyrnf0rgx7g850m29v8v49c3qflm8", "deps": { "gn": { "version": "2022-01-10", @@ -44,20 +31,33 @@ } } }, - "ungoogled-chromium": { - "version": "97.0.4692.99", - "sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9", - "sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8", + "dev": { + "version": "100.0.4867.0", + "sha256": "1ay6p2aky90lf3gk3n87m4mrxyyhg4anr389kl648ijigsg6wlrd", + "sha256bin64": "11g8rlw5aahpn4cd2fl4b942g1giv05zcs10y0qrvirnwmp2i3ha", "deps": { "gn": { - "version": "2021-11-03", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + } + } + }, + "ungoogled-chromium": { + "version": "98.0.4758.80", + "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", + "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", + "deps": { + "gn": { + "version": "2021-12-07", + "url": "https://gn.googlesource.com/gn", + "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", + "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" }, "ungoogled-patches": { - "rev": "97.0.4692.99-1", - "sha256": "1jgxpp3wl24hq39291mgmdwcxbarxg4rpa6il53k8z3rf6gd2s4i" + "rev": "98.0.4758.80-1", + "sha256": "0a8y9yz6xyh025gk3dr0ndrdwmrslhd1ph2f8nivmqk61j7c2g8h" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix index f39ae2f166..6b525fbca9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix @@ -8,23 +8,15 @@ mkDerivation rec { pname = "falkon"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; + sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; }; - patches = [ - # fixes build with qt5 5.14 - (fetchpatch { - url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff"; - sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld"; - }) - ]; - preConfigure = '' export NONBLOCK_JS_DIALOGS=true export KDE_INTEGRATION=true 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 935739b522..c5998084a5 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,985 +1,985 @@ { - version = "96.0.3"; + version = "97.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ach/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ach/firefox-97.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "aee9a5f570fec2c8c0566f70673a6db1f60a92bb2c165ceb30f434b0dcf1a65b"; + sha256 = "1d02f86f1e903f97e36a90e89af2190c905e2c15bd78e252d4e52f77b347c7d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/af/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/af/firefox-97.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f929516c277cfb2d45100e677ed9dd200f8b3a09166455f39c2474bad7cc4d74"; + sha256 = "f82635fa7e2835fbdd998e0a0132c83c5831f5d4969ac8c2840a0b690ccba805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/an/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/an/firefox-97.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "daee2330478c036da51128c1f32d372b73b5400c8c0f261d50bfd821456042c5"; + sha256 = "cc817e42258c09944108bea46553ebea9859c99884b157b322f78f2550f9018b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ar/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ar/firefox-97.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "51549041ec1cbf2e0caea181f4468f46d15dd1a7b6a620e359f6de533118f8af"; + sha256 = "87b782af877baebae09aa2d0e0ab399b3ad9a9d6d8aa63ac8519fc7767f7cc60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ast/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ast/firefox-97.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6cbce2293f1982e3e1cc993104a46f3093bec3f420af9ea561eb2601776b9cf6"; + sha256 = "f8889f0a843da8c681701e559bca94ce9bb6db446387cc142e2c4547115b5811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/az/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/az/firefox-97.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "45ba4e47ef4a32d4a8daa7b873a3658de2ebe88532f33af2fead1619939c8294"; + sha256 = "bab0951865aa8f62b6aa2b92437fc861caa4c6f2757848835d6523e0677e3bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/be/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/be/firefox-97.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "58666c9b75862076b00144de96bbcdd8b0b3a5bf5bd0895065fb38d3c12a30ac"; + sha256 = "fd6d94270bf1333d2f12229bcf843a43a9b1d9775bc9fa71ce6260d924176310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bg/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bg/firefox-97.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4ff97af116eb450edbb2a4c2d9864da3c0b07c5f6913f198b905779f2be48f98"; + sha256 = "95a576e8624745e94087aeb51718cb9ef55a0ed3258e06a8f0341ea6b1e993d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bn/firefox-97.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "bda665d796fe62524f1d1c96afc4c8da569e9b264895a26aaeb20bab7c2f3030"; + sha256 = "a27340668dde133d2526607cd67f5216c62b22ba9f46c943ada18b979d8fd010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/br/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/br/firefox-97.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2305e226c5e492505dfc82fe34f17c8725eeab2ea10b61b089c92ad7b85a5186"; + sha256 = "2f66ff56c261d8b30614937fd7c1ccb3a89474b5cafe9573dab180279b3c18c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bs/firefox-97.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6aeb690c82790a72906ff80d55ae5de2dc7aa5a430c45a0ef2861336a6e73b15"; + sha256 = "d3fa9bcaf628cdfe067449e79abe378ef44fca46fcb43ab9a14fa73f75b817f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ca-valencia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ca-valencia/firefox-97.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "86e2a4720b991d6ffd7c9ce996162db9ef9ccd80da96fd5ad184ef006ae8fb1a"; + sha256 = "3339e4a2859893368534b9390ef1475d115a4ba1058dcc44dacbb7da80e0fef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ca/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ca/firefox-97.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0e9675d739eec02c98812e4d707c37d352de7605e9567d9d4adccd0e6ab40e8e"; + sha256 = "1c2e354248e8bf969ad026a472e6820dd125df35f23b9663aa65090a71af4398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cak/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cak/firefox-97.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "35d5d2c5eef32819499b4078c7f31f23c848b44c40788ff42ba66d10b3771fda"; + sha256 = "580c7fb31030d000bf9f1c807690a4df6d67a37a41c88a2b70d8aee10ed37b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cs/firefox-97.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "67f42b8ce23ef78aab9fd5e61abada98d7fba5dd76d8c57ceefb43a1783d29a5"; + sha256 = "3be967c8cb22ae11587a48e0e2592097c486a9dfc2b5eb252442d7302cb04d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cy/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cy/firefox-97.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c6bb154bb341b88994d060f18430670184bd3646c662da6351df11e2ce9a6abb"; + sha256 = "cc1c93fff75ea41e45020ed81d8d68a5663effe695993b7fc34d34c76f1b0d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/da/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/da/firefox-97.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3c268391a116f9b8ada73a98020c44f67bb9f275fbb7462a188e6d2d8acede7a"; + sha256 = "34d7952beb7d5dad269df9664faabb43ff94475ef5acb3f4bc726be5f92c4d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/de/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/de/firefox-97.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dc5ce8991db83708bfbe686db8a3244e28e61077a754b6dc41f29946b8afb489"; + sha256 = "475f14c65678178ef0581003a0a04c2fa3f8904f0261946387dd114a8c03d679"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/dsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/dsb/firefox-97.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9afd277a20cc47de854ec48c9aa484118e274ce24532e53076eafeb78d4f8e0a"; + sha256 = "d20671dedcf007a2d3e2be65bea9a13b98fa33c4cb34181a1996cb1629dc0de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/el/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/el/firefox-97.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "58130d71888ee7f3c40a1656ee0e7ab9f3538573f1dde104a93e850863ea1be9"; + sha256 = "92daba146e93c9dd378208f85fb530d241f4e9fbaebc10670ba67f3e707e8c5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-CA/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-CA/firefox-97.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2548098aa8527abd10b0f23203a1a4fafb231c6bf853d67c938006d6c230856a"; + sha256 = "b7f9aeb6ecd2f0053f2df7e4e7a168b7ac425fb7c91435446d554042b55f38c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-GB/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-GB/firefox-97.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c8f8e171e28b629fc9cfc4557409987e7a72aa9507a51fe2bf0f8347530cc962"; + sha256 = "99f3af63a1ac4f16a0fbb714d42592881e0b20714c04cbdfe4ba51d1ead81213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-US/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-US/firefox-97.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2b642cfd2db0c2cb0f67453307a5a7d8c90e372a03274644212b51f60d503965"; + sha256 = "3d0f74790fe6ff5e38324222ab0c47e10edb31970ed67c6dd7a1c84e7017d1a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/eo/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/eo/firefox-97.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "803ea1560568fb1c2af0bc0ff47a01ec7d854866b209bce7ceff8f7351a1cffc"; + sha256 = "0ecc3d02a07c48076549ad9420c0ac9cf692470705ca390051ee5bc2a15af026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-AR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-AR/firefox-97.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4ab03c3623f26785b09308ca3d334536b169aec7690050db2141e40a83bd7b0d"; + sha256 = "7a4a3f330fb00c9e1083d65ded0006e44bbfc2b75f16acb93f49c257f3bf4243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-CL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-CL/firefox-97.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "578e4ae8697ddf6754c88e94c7676b1f1fb4d0cd65dadd833966f1b69a277f14"; + sha256 = "4a2c44c4def2502a5606d4951d6436ff38de02a678a2c3385d0bb2ac60612d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-ES/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-ES/firefox-97.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "91ed54c34aac2fa5f3345403f4123f154679759bdbc4d6453de093216db630d4"; + sha256 = "31b3c7ca8f3f9bf46fcf6a3cf33b1182cbc3cecd09f4e1741ed9a3e1257c2eff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-MX/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-MX/firefox-97.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8cad63aedba46ae735a6d69e510c912f746ed5f1d0af8a8bc7f396a53ca9bd7d"; + sha256 = "c9a2e2ed18dd3b08828cb08e1da038bd887429543e55ce4597a802169445240e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/et/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/et/firefox-97.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c12317af0fc4a4ae13a0ddb376192ba62ef3a2bc3205a0a87531ea4147707c5d"; + sha256 = "5b929209e539d57d94ff0ce3e2bfd4da41ab06e60fe050e7351a09b91e08ee10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/eu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/eu/firefox-97.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a244b1fbd2ef6197c739834177e6bf9c8f1241f9257baa77eeebac149da0919e"; + sha256 = "285dac2db38f2cec56b1bb5c81790dac85f6097de2262038fafdca42680246fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fa/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fa/firefox-97.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7eac238a916f009c83f8a95cb5f6d13e08461630094d85a78cfae041df7b9179"; + sha256 = "fec85a746389ca7ee1e11d1e4b23f24fc31b4c72fd9628ca2772bdd544ff7f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ff/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ff/firefox-97.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "afd6d4635f3840287ac5497ec33555fa6399d0555e8a9a8cd8c58384d6aba6c3"; + sha256 = "819c604b071e0f95cc3209d6ce0d6e733e4f15dc93a9154aa9b0a63c2b3c3af5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fi/firefox-97.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3e68e136d8a9a1522fe6477fec66df20fb454ab017d9337fbaab39cd4e607192"; + sha256 = "92e242fd2ea40389d0710ce798d795df9509fc0e0bbd93ec69ac29df93609e66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fr/firefox-97.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5b1b622c122acba08315918969dfc14f952de946e121c7c037d53ca422fbc3d6"; + sha256 = "44e95b2045e407f08be367f17573520ceadbb1198d16f0fc2c200d265f904c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fy-NL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fy-NL/firefox-97.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c6588dc0436e8c96fe2660c356bd26dbd3065f04ab439aa034a154c28e5feb49"; + sha256 = "abdc4e3bcf9e1d8b0aac777adc55ceb52cfca92e27523f22614b2347b6209ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ga-IE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ga-IE/firefox-97.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d289f690338b6191f6da0201745d361915c83839f829375913a004bf63482fd3"; + sha256 = "699866a4b21d6c0015a0a65b937f784e4d66a24f0560f00b73c75b68ceaa2fb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gd/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gd/firefox-97.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f007344cb0ff1a2999d87ab4563cde87c2afa416cf3e20f7c369c9e6d4f17193"; + sha256 = "ad7a9847468cf3dd84f106b712ed9ff3824a9bcd8e15032fc371843b5357eb5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gl/firefox-97.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d42233e3a6cce9d0464428bf8e2dbaecac1eebf2c03f58e0045f971d38a2d844"; + sha256 = "efa8b59f8b7c7a3638adfcd31095dff88ba24016b8891f7cc496e9f286259559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gn/firefox-97.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "333e9de73b08a2c86d3491ff15a39312c63fcd2ab46f45d271fc37244242f39f"; + sha256 = "e850bd2e1940f755c7eaa1c517972e2d2e7ae2bdf5fc75142fda1c7aad05e0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gu-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gu-IN/firefox-97.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2ef9974b7281e17ba3469947365b299b821afca28d5369c374e18d9498a5d15f"; + sha256 = "d74495e5369db197e614d99aefd2b26ab858511017b44c18da668d0a16a69a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/he/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/he/firefox-97.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6df30dc08a3f85cb1c78269d05fc56af9651efed5d5bd2d09cbd1eba264e5eeb"; + sha256 = "c9889e3356e2a7cd99519f97c9f7053f2b1ccaafa48a3462cd4bb3192f174e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hi-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hi-IN/firefox-97.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1ddb67ff888a37dac8e92637a051d3cc4f632bf3b22d05b91bd58bbad223e04f"; + sha256 = "3d02c2af702972412cc6923c426fd7235c7dafbf3a95f2a0703abc002813ef88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hr/firefox-97.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "85425e1a026d9ae2a5d55b0ad2b355a715e35904ac88a706f027dbf18ba11a0b"; + sha256 = "ac6eef6986bfea61aced2183eb592b2ff1d033e4ec60dbbfc4e2301947b3d40c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hsb/firefox-97.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "abeee49422541d11d2eed2d159b7f20f3f0f36b7ce82505a2991368275f6bccb"; + sha256 = "719e01cec8be4d16b6bef69d45bbe838a4ca8c3b84a1340c88de48511970379e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hu/firefox-97.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2c42e7ed59de20b5377c37a41bfe083279f0e481c61cba6249790ff83ce2977a"; + sha256 = "3774aee9afd211b50605ab76a213d36ba6692ff695fdb464ccd116dcb0a64d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hy-AM/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hy-AM/firefox-97.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "74a0b038ca4cbccbfcd276b299ed0d127f4d4cdea159789cf01313095ee8874f"; + sha256 = "d27c4148627a2f32bf4ee900e50b8f96805deaead292b4ccc33259c8fdabf626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ia/firefox-97.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c711c1cf38ab231ae74404852999d74e4d802f36c12e44835e9bc6916133eab9"; + sha256 = "d1bd6d3f5c78a3ec6e7caf25cd5befe1e35125aa2456431cb0487d968375798a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/id/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/id/firefox-97.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e03819b47694a6ded168212877294b187f3e3218ab78dcf888a947d90479fc30"; + sha256 = "325af486e9faaa9202d013dcd9a6fd4e0b04237ccd54a132b79480475033e936"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/is/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/is/firefox-97.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "94eabb7522d56e732ee816a7ee1236307d8dd7ebe22fafa6bf4a3ae14d3a0d8b"; + sha256 = "2b980ba98d7edcb737bb47d3eced8fde9a3285e43e345a52fe0d375343e841e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/it/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/it/firefox-97.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "5b73da04bfd5601fd199e1ad32cc02b41ccd056551e3e14ae975ae401baebb53"; + sha256 = "b7f9c12f31e7306592a2640582b327c12f250f3237aed83848d37be0dc6a2647"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ja/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ja/firefox-97.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2e8992b199d36c9857627942b43d3472f56e7657f929dc655cd4bc74b0441fe5"; + sha256 = "7d535b695a0adf5a6068c33c03f0ab589fb00e33192fe855eca3953b94dd7a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ka/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ka/firefox-97.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6c4059f00b2598bc28755f8051ef20159cf8cffc9732f1644822769799e886ca"; + sha256 = "e712558a74a73600cb751b583be37294f7b23053b560bef3ba8468baf8614cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kab/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kab/firefox-97.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "730e62f6d18da4519ae2ed46266d2014fd44260549d8d2dd4d0fd8b6174a2831"; + sha256 = "f46c4c90bf3a3da559e7c4cadc9bd6fea92dba6635058bf82a276b1483640951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kk/firefox-97.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a7f4afdd9d43f0bfec34edf17dd5ff0d68d529731b51deb86e2a09d85e7b86b1"; + sha256 = "379a45ae1b5f6fa2a039ab2bfdd342d40c5cc6ae556bd6f7ab54b79964533948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/km/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/km/firefox-97.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "c69f54f1a9775c76f7126a18c5c8c66f683737076e3e59479b3e36a34a6c30f6"; + sha256 = "d619c47406d024691e63657e11dfb34624c01f120470f1acbffc2b39ab6f95a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kn/firefox-97.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c9fb9ff1e2c79dc0ad804846bbcccf608a09ad380932bd7d68267e10cc9eeb65"; + sha256 = "c058146a99dd06e71c61e780a232efca883e181b237ba03d0bc70942181109e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ko/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ko/firefox-97.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "43adfc767b7869adcbb2d39410813eeab6ca7d50df6398bc00106f1b73daa564"; + sha256 = "f9d5f7d11c8ac517fc7f19b7d1c3dbf325a224c3a8993c6a91879e0aca05c3ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lij/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lij/firefox-97.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "812ebc60c69de188a12247cf82881824ee0efff571b91527fc343f50f216c27b"; + sha256 = "2d450a105ff42bd396df813438085b88cf6a4fbd7c59af05be482a0e316e03df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lt/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lt/firefox-97.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "375ce82258424250c48051f33551958adad2b72bff9c06f2109a54618fb0a038"; + sha256 = "ecd64fb4eaa169e36a36e039563ecc5de9cf97f655fffce496373dadd5e4b49a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lv/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lv/firefox-97.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5b27b13ae0406e6ac0bdd612ab8523fab2665b8e4e146aaf2f47a83712453958"; + sha256 = "a0fcb7699d6b76165b7274b2316c192dbd933ed39349148882a682c8d354497f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/mk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/mk/firefox-97.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5215eb91572c7f863d79d44d23fff9181b1c910817d40383a83459d6ce0fffd5"; + sha256 = "850f5589b9d4951738ed1d32bf14270191bfc34f7278243c42c7a745ee893e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/mr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/mr/firefox-97.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "056491449edc305d2994f8eb985dad136d9687b3f0aaf9b95d134a352f72ea34"; + sha256 = "bc13f72cde29dd1ba5e770b929376572a9cdd4a755fce685b44e34af757f240f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ms/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ms/firefox-97.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "eb7244a97611860167f98dd038e4d1f60c3b52a2cf81fdf93c2402d780c1ecfd"; + sha256 = "bbb9fb8ae7548ffe1e1d982925d7b3933fbcded03c5bc31df606282c4d4f538f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/my/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/my/firefox-97.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "93b93324e305b5ba0f9a005b73230de8acc6607ff0e284c5d3814892f95181a6"; + sha256 = "05f5c5eca3d02480ec61b42ec92bd71c9d27a1e843439f527fa57ba7dc5762ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nb-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nb-NO/firefox-97.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "255056583e093d4b733326f732a529ddbe18010b64e5a093e6a17e09953f6c5b"; + sha256 = "715a82164dd577d36100bb28859efa1468e7213993e622eb97a44c4423c5829a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ne-NP/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ne-NP/firefox-97.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "65fcb5475f2ad6e4e9471e4129ed26c615786e6b90c13e1f38c1c679b913b023"; + sha256 = "d7c55ac4e78309718caf4b1e911999f6d4a1558b885f9831747d4fbd3bffba55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nl/firefox-97.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1197ff7d9bb843d56d081da51105283923768884cecee4ce9cb50a93952e909d"; + sha256 = "6b539b2486aa1deff4b99828a319285ce73277c93bd863777f88b4a906b83c76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nn-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nn-NO/firefox-97.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "47fe60e6c0115914630edf99a56447f5a1536da0e55e6253e58e4e9ac54c9eec"; + sha256 = "42777f881c86b597f7c39cef1651d65aabdae9d616d8a115a0a993867adba92f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/oc/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/oc/firefox-97.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "17d363269d5b0911d47ea3ba52e9a7b28f911e4f0a1eaa83849d749b4bfe906c"; + sha256 = "76ad8b28abea06743e7e70a463ca39c6eae94dd406d7db27428246d190266aaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pa-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pa-IN/firefox-97.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6c1f582c50b36055fb9f3b8c20db1bc823cbd2d56cf36c8495e7c18599a906a9"; + sha256 = "8f30e7f2835c6421e41da2558d30448911d1eb4b84d4d9b076833d70450030b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pl/firefox-97.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e4a1fdc104a58966e760a1ea78bd353f61272462920085c347693adbac769d43"; + sha256 = "107b879c5c34608f1c5aca1cfc3c0722be2df4c1573a0bbc8cf0968742c11cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pt-BR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pt-BR/firefox-97.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "90a1bff86400f555d284fd8094df9d7c13556ebad0ce982710508d901c6cb1ff"; + sha256 = "83f52f48d55efa4b52ffead877ba7fcf69823d136a307d2d84640edf586c4108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pt-PT/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pt-PT/firefox-97.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7e59d9ab9369f8f7ef00b85c6c6be62b4bb9da488071268ddab808367541892c"; + sha256 = "523f082daad8c56e258eb053ba0d2383cbd36a8924b01b57cc2efdaa85292d3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/rm/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/rm/firefox-97.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ca20e98f9703ccf00cde6793b2e1d28c0c429c0fff01a2eb592e4270181e8c1b"; + sha256 = "798bdf60c52b331edbae3ed77734e1204696ba18c08b509b9465a999a7707484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ro/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ro/firefox-97.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "55ac07f7ffa919ba37d29899f8fcbb13793db9f198e2a9cc0b5dda717b1d4116"; + sha256 = "811d95d5ecfa02e2f315ac1c6065251d9b7e7f862748a9466b3464c02687088f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ru/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ru/firefox-97.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f05ba84219501f904d51f320fecd84df6c51cb1f4ad541afbdbf8a781e46699a"; + sha256 = "dd9060448a645c7395d2abb75b1b6c0d33399ef7fc4ee7fa2474e4de4e5cd5ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sco/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sco/firefox-97.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "5186773e72363dd05e46ba418e58a9e4d80381fc530c509135c76c5e63353d48"; + sha256 = "27f119009eae212234ce78dc77d66e99505c1a7058658b5cfd4952f5bd5b7732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/si/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/si/firefox-97.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8bdc526c6d7b4c672d12c860376458d03efd5305f4823405c0827a4b75912a8c"; + sha256 = "73f37697e72ebc8ee72583ab2061f10dedd09a7c91dfcd00f051f9d372e10700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sk/firefox-97.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bb17d52c6c549dc7861c32ec9a4f57a0df323845a6076a9499c1faa9ae3c8d28"; + sha256 = "9aeb7a0a38defc38e7483c1fb6e939421cab6704dc69dd882b7dbf2c413af246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sl/firefox-97.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fecd2cf24bed949a02360ae74f6701ac9b65186a7a51f851249a2cee67ccb63a"; + sha256 = "ff2020d595daf151fcf1d8c20614b848b8dac981f7ad9b9b11497fd3adb94a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/son/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/son/firefox-97.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c3130c49ad77912107c61d0b24e5290f20ec7dcf95d329682a0703f43c768c28"; + sha256 = "eb758e0772b33a955f0a69e673dc53c419e83b29e7003b90161555567bd0c9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sq/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sq/firefox-97.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4cf2ac0f3957a205a26548655f00c3af0c35751ff6f69d25e5a38dde86dbc335"; + sha256 = "8cfcd1863bb79e537547f296f08c6e34b441d110e0d360678aecb43564eaada7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sr/firefox-97.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7f3e01919220b39029bf48c651864dfe9970c858f4c379a0a458bbadc1cea666"; + sha256 = "84246cd93b2762e06af5aee56139484b70bb37dc10d8077c58323bca88ca86a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sv-SE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sv-SE/firefox-97.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "bdeba12b07803a1bf86c7e38185fc1add59a10e09ed59aff7d135107d004f0bb"; + sha256 = "b57f4a6ea4e8011c1fdf448d67afca9a028f76c9a08e399919937aaf3cd1bf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/szl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/szl/firefox-97.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "f6b69c4e88e23da50b4f7f3b4961a92ddb3321dab8a988d29150fc1ad60258f5"; + sha256 = "71f1b134dc8b363856596e4c0b398641702d37811e84008c9efe36b3722e8633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ta/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ta/firefox-97.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d7bb8645992788ac5161f3becf98248526b02b767cff958d5094ad24086cad06"; + sha256 = "25cc66d29ad3e85be20a620c40426d0afe65df22f75001ecffec733122006841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/te/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/te/firefox-97.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "692b65313b3b792e35b1160ee830fd9c9ff082d6f6177af7be135dd6096efe09"; + sha256 = "15dc00d56d31699e3d7089b82ad9e585be5a857b7b2e1056b678b2ecf9c50994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/th/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/th/firefox-97.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c792a126f487b51f4832a56fec8a6fb502fe3a0a38dea7a8f3c5a7060b9d7576"; + sha256 = "16629550b5eafbe3ad4c9137d3e89225050918dfca55bc898aa001084e1882bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/tl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/tl/firefox-97.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "ef633b565abf5349aaa86afcd9934145b70abc036bcddc733075e5157a736406"; + sha256 = "ad4ecfe3d7c103090d8642101543b6e2970fdefb3923afd28ac4f1602c926b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/tr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/tr/firefox-97.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ef04eff4e101405dbf8291b0384f8ecc95febf6730aabdc28d8c8cfaf305810e"; + sha256 = "5d8b1b1dd0ae04869be672f098ceb1ddd3b70be40fd5c09d52006120a434f3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/trs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/trs/firefox-97.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "0a5c709f86dd33c771aec4760a5df1dbfd7baade90c8d9519c46a1dee8f18aad"; + sha256 = "f64a6a311034b7d02737bc1ed5aac991286a42463554c10eb96795cd1a5d169d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/uk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/uk/firefox-97.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "488baa16c6d60043d5da0aa667e3973eb0df141d50bef117effecc2a39a30019"; + sha256 = "b0e98a5ddb7ec8bce8dd456c6587733ac6bde6f8058cfcd735f10751d4b95d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ur/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ur/firefox-97.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "039278fc25b62c6ccc024965ea296de4381f86c485b10cfa93cd5025d39f7e47"; + sha256 = "d6fdbc3111b040a8b4880d81e22aa76abfe45ff05d551950324ffcbff2cb8eef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/uz/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/uz/firefox-97.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "59c1a1f8a85f1f569112df4dbfeaaf15f4337210f50111193b36bdedf4d3b2b4"; + sha256 = "4d806ff1b92ce4ec56f49d0ec474c5bcf01bbfb2aa46ce3ed3eb3297658cf185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/vi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/vi/firefox-97.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e9a1a2330b1d09ae8f9ecb95613799db87a06f7a4fcd70265ebca2a6aa179bf9"; + sha256 = "0ee797028b2464417fef119de35e78895e0c14d43c8344e3bb5332e71958fa76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/xh/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/xh/firefox-97.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "8dd8816267c62f309206a45cab60bd6dd4d067b0de3002111d86b737f4f9d11e"; + sha256 = "6c3acd60b0124f23403160c3194e3c1624d16c7c4450c2eeae929ba562e138c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/zh-CN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/zh-CN/firefox-97.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b080362a5fa2a660770698915abbbc9230d85ce1eb3510e96ff9374ee19fbf94"; + sha256 = "22606e4647d267ec369382ecca328e2022becaf6600449da482cc3d402fd60f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/zh-TW/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/zh-TW/firefox-97.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "34f43a3dc69a116d5b9a136d89fe0180deee13907a94eb6d02ef2ffacb94ef49"; + sha256 = "7046246516f83e6747706e164f75b03ea5358c9ef262a2eebe9091eb67037791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ach/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ach/firefox-97.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "b2f21e188e6ab08be9b57a1a50dc735c50cc6586a70c3243af1dc242def66f79"; + sha256 = "8f2b6c27b89643661fb6c457daea22403787d9255da83f57cc1ece1c133ff6f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/af/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/af/firefox-97.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c153b40cccdb36903e3ced9d8685443a9dd4550419b45f09c201fc5b9ef2d12c"; + sha256 = "f0066a19fe65b6d4a32e202a09bd2e454d5265e424543235ce4dd5c440c6f492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/an/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/an/firefox-97.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0514725b38a83e6385362dfdac57b7d374a458e6621296c4285d769933aa7bdc"; + sha256 = "7aeb5226c869c2ba438ba62a49e0a1b5dbaca2c4b7a427794ad2603e522024b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ar/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ar/firefox-97.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ba1003e913322f06aa113f61d6de5ce52e08bdb5644fd6c5c8d9f059765a7737"; + sha256 = "6e8d27e6ce8051e918e0ce29976aa048d58a38b31fe6ade18965881bdb07268d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ast/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ast/firefox-97.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c2983efe1ba2b201006581d10fa629e2704f70590290a2720817b49ea3cb6ec0"; + sha256 = "e1814ef2b6f314fc46693e822a8bb7f6340bdda8af9a48d2534aa8a385e1646e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/az/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/az/firefox-97.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "b4cf2197f83835fb580ed79e01851e7be2d9d7e319e1dcea3028e075f244d6f6"; + sha256 = "14d3bcd5251620d59764c9c905c56f8332174ff1bbe78087cdb73e1803edf3cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/be/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/be/firefox-97.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "519c34bffab78065fcd3b9027eac4e0eda7ab864784f98474dcc04d887540bc4"; + sha256 = "903eaf9f4ebe60d69605da083733cca327b25fa9842c9c9384600b4a4b6d6fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bg/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bg/firefox-97.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "fc897672d9eed6bcc835fa3e9e6e7fe07214192fd6899b2e7f85d64a0fbb1179"; + sha256 = "e71e1fab1a87d4346e5f8a90b8f674eb10af292a5bf640a94cb7d765d6217b46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bn/firefox-97.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "67550724f06e82f430e398171715a96eb2b4aa6e902066faf7e7a1efc5bfcbb1"; + sha256 = "f815f71dc8a1f288c7fc62978b8bfba1e53323459f99de0ac931d9f6c266e641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/br/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/br/firefox-97.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "22d15a81ee580824465ff2bae1f134efc4525cb2b7e3707c365f8b720f8511b9"; + sha256 = "4443dcd0d1e1fbaa7f52884734bdf2378caeeece0e2f62f36b56eb6aea8b73bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bs/firefox-97.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0d2bca33d770c88b808c74f3178e5f4782424f804e59acfdb884879e195e3ba4"; + sha256 = "0d02992545c745b95c341204585b0163ce32938a7112903f7878c91196c883ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ca-valencia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ca-valencia/firefox-97.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3214ba1b640b1802d1a22c0a76ed5a26f0f2c23785cced7ed1cc8eaecb0c0030"; + sha256 = "bcd25813e25d30f4d6e3cfc999c02c014f2d6335e52ff4c46226540bdc0c720c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ca/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ca/firefox-97.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "07fa269368d120c547c6faad6c896c73cd95cfb1a99da9bb7bcdec1453e4c898"; + sha256 = "dc5874fe3c9e9fb01cda7e7dfcf93ce3c9de2e8a65b7443e231e193ef4debb14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cak/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cak/firefox-97.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "3350662d19a2f4bf68688917c4b37565c9049f22c272ed860e1d47f6f11e3be0"; + sha256 = "979008d2f21b0cdeb877841e66dd6013c32d8eb00a7bfe95fc3343d66bd3eff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cs/firefox-97.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2a70bc5fe26c427ac4d0c6ff75670dc485d9f4701926572ff46f6e6044a94d97"; + sha256 = "27a831c18f74e449a624905c18485989391b4e8769f1ac2646e2567a6cccc91f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cy/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cy/firefox-97.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d5e4177638e84295f2733357548791a179cd32e97c1080666a6b48270236f8e8"; + sha256 = "a6cb71d9eb5d19a00818faf353b7f454e38316fadb242150948fb9ab485133ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/da/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/da/firefox-97.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3d31f922d743c9ec84841bacfcc563c6c71716f75cef8b78b5331bfe6916dcb3"; + sha256 = "2224b753fc1e9355ebffcf381adce940e1e517e33e11098d3a8e92ea36216eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/de/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/de/firefox-97.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2e1ff6056e589d420ae813a448317de248910694fa89ecfdce9b5545a647e2b5"; + sha256 = "aa7f041d58eedb41b7460574d736cbed6bd990dc68de6687f143e9a2cd450ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/dsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/dsb/firefox-97.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "73d2c7e568d7e6bf8831dc4405f407357e3066896446d3ea2bbaf7de45c1314f"; + sha256 = "7d14ef8d451e8274c3a03af9111c3d1f09cc83fad57ee0a6f84366428bed417e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/el/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/el/firefox-97.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1669c35b9ab66367d998f1b15556ababbb3b80aa191bed6a7b7f34c6f29fef1c"; + sha256 = "bebc24fd34af4d3a7d5820a0df0a2753956a82034603c4a71441b8cb66b99066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-CA/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-CA/firefox-97.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c5aba93081eaf416dab845e0e8d2e5db10992c3aaeab209182c4af2e725dc5c6"; + sha256 = "f39a52a27af7b68f683df373a35b29848fa990fb6fc251a511f0525061e6f930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-GB/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-GB/firefox-97.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "72acf998d686d34727ca307855d3c0139c620868b13614ef5c7a61953a3c2ac8"; + sha256 = "858e86a232cf23be1ca2c6aff1954d28782f8e893c096d8263e486b92a6498f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-US/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-US/firefox-97.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "096169898ad97b2575b0b5e07c012f55f8749b7bc85f373c276d97948c3b7e08"; + sha256 = "7df5164de2eea1c32657c6ba813664a15ba5a198ac1a19c32ab494f9fab1d39c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/eo/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/eo/firefox-97.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "365611e7265d56b3c9bab3a6aca71b838d48b945119b710624696080170443cd"; + sha256 = "c48804fe31c7ec37676fe2f875b61faa992aa2dc1ff67bb5b3033b790e927d79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-AR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-AR/firefox-97.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "49a54d184ea10380fac710f49f6c3e36c2e338e5324acf94b39535f6e06c91ce"; + sha256 = "4aef2060aca1d24a2ae0ad8e6f9029ab0cc1296bc2efc53ce4f28073f6b15757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-CL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-CL/firefox-97.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "3a5fbabf862c35f29db2c325e6b2e89af8a2fafea9c6613dbe4f367ce07e1abe"; + sha256 = "5423bbcea8a0454202c099fb66a39eba4a274d2062f45464783c9a8aee5c2305"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-ES/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-ES/firefox-97.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "241fb3c9a2d07276085d586cf51fc55eaa6293d188ec286f25c6f58eb1919f31"; + sha256 = "cbc1dcbcf7c2e3602507826e9d2e299f213855c5e7aa1968cdc2fd19a1fee872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-MX/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-MX/firefox-97.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "066bfc95073b28afbf61accf2455e3294281749eb048bfab0670b21f920e51bf"; + sha256 = "9225ef8b083b8b7fb91cd142ec204a53d74ef49518db6f9f5eb98851ecf52def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/et/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/et/firefox-97.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "437b61d073054cfb81063991c03afeeb5be52a31bd4f3bd1a2e65bef0c92a1d5"; + sha256 = "32d4dbf6ab64e7a54fed85c6ff58d514e43b4427a30e5009f157a21bf21997d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/eu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/eu/firefox-97.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "bf998de6b1b2dee067ee05d0a28d0128f63c9e6e7b788181d785b8afce8b0789"; + sha256 = "576696120b4dfc64174a0a208506482dfb24cf45bc4794c4d4255796539b85d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fa/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fa/firefox-97.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "efe1cd9c8acbb8cdd8d72eee6c81f100c17c90fe0e13784992c5cfbe712a1eaa"; + sha256 = "96b394c28bc77fd4d650196b75e266c70774af5a4f6f49c813cdbd5d0ad6de9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ff/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ff/firefox-97.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "dcd0dbe923403f1b078695257bb2705a4be9c91ad51fe065500ebfdfd0e8bf45"; + sha256 = "d9aa3dac84c96163bf3c2a4370d7cf1a27045b8c506df3da2c8751bde80e1a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fi/firefox-97.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8c2288c2c7e96e2176b005227c504d7be001e03c43757f9e945f8a5a360dfc74"; + sha256 = "594e1b265abd354aabd180af2e9099f5d22eaab05d66dbd7511468dee0fb31df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fr/firefox-97.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dbb3ebec1fb7da951c30d9a9fb50d59fe4b10cc56354c6d988708b4912092ae7"; + sha256 = "542441111026dca84050e6ecec1007dce9910d41d8f961a2dc6a4ed49a7aba6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fy-NL/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fy-NL/firefox-97.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "510522af3fa4c2f264223ac1970222c6d77abee42cf41ae1725f615bc519ba0f"; + sha256 = "40ea9e076c5df6c81a4c19960a2c96f83a8174817db33aff882d4c121e58d8de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ga-IE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ga-IE/firefox-97.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "82225bd4f8a00ffd38af9c4ce19cc3d224bcced34f6523cbe02a9c7f3d228697"; + sha256 = "b7839aeae2734ac52fad253311e255a5e5d203ae117730bb9bd8a414489f300a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gd/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gd/firefox-97.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5c11e2efaab296b436c6d21c7693612b910297681c49af90d376d9e1525b1aa8"; + sha256 = "86820d66c8f6e7a03f4a73b564d0f94bd70477a4e5d74b27f7cfc23f70d0b559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gl/firefox-97.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8895ec691bdcebfc5eb13ef4a59fc1e08bd7aebd8ba336fc2a99db47608e03ca"; + sha256 = "4c121697d38f717cbf66d48bf9af5d65d67e2e3458ad17ac72266b522e89c6c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gn/firefox-97.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "fb6f99ee38f85d45b4d529934acdb94e804c5d8e85ae54124667c302156523b0"; + sha256 = "71a823797c386c3b50e4034bcd404197f40af00128eedc614638bda51a7bdeca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gu-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gu-IN/firefox-97.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "69aaf403dc5fb15f92b95175a1be399452cd06ab751d3c6ff2a78c2ec9ebcab0"; + sha256 = "498a2222df5fc34e2565b76a797723d8e01a7569c168fb549fe07cb6b1d20c2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/he/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/he/firefox-97.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "eedd4f7d709b56e002f8f9955debe3bd4b2c4caef61b5160af78a44677f44530"; + sha256 = "7b86815403bda8e156ad2d461391b81f869222ce93ead4bf40fadb2c687dc850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hi-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hi-IN/firefox-97.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "3df9f781a68686c430da2f5aeafec68b983e1a9c64989701a78cec7a25830202"; + sha256 = "068b26208c44b2c5fe46c29e5a1c4e98ee1eb81f335cde5935575e05088fd18a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hr/firefox-97.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e809039217112743f459f37ae9b8cda21bb63aa00a23641a5f869a65ac55a527"; + sha256 = "876985390499fb65e29c91ae1410c41959d9baef96cf0857baf4988e7ac2e94f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hsb/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hsb/firefox-97.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4ee840b8014aa7b0e8ef5262ac2d69e48049a7b2beab803ee7dc09c35dee8f03"; + sha256 = "d366bf448d82abda3cf1728fb4bd57489010fef0885e5f0d4eb5c8d371e004ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hu/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hu/firefox-97.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8e62842f1be4afd2d61c0ef9a9be05f6e3c133d1994a55d8b165d39560d96018"; + sha256 = "5b080f77d0990a026a73bdc298ab1bfc3e1bbc07714646e3ebf0c064104b58f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hy-AM/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hy-AM/firefox-97.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e0fa7cbc6bc4679585ce832f8cc1380e7de0cb0ca46b93293c9ba08fb04f91d7"; + sha256 = "86a9c6285a87ecb3f41f4c894f4b27f28975daf487cab8600e18c6a7f8446919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ia/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ia/firefox-97.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d20630531aba75aa0641422fadcfd2d3bc663fc817c22641a63e9bfc4cd29a76"; + sha256 = "fdba1012d16a7b4fe98cabc7527a7c912f81383e09d7f3d195248b52072a3040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/id/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/id/firefox-97.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b11550957bf6caf0f088e5791db67f7685d4626f7535691c4201764244649fd5"; + sha256 = "0cde2aeae0bc24841d8487880d80b0842c3d738d110c6235a2b09b03df366e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/is/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/is/firefox-97.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d9112f5dc6c3fbc415d9bb9da52f36dbce325d36d8ec1843cf96b093d19d4b69"; + sha256 = "76dccb349d505794a13863960d432f1362c1d24df25e0152e710aa661760d95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/it/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/it/firefox-97.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "35f4350d1cec94cb4402b7b22f11e929e8a08b44a150f7910f278c9a5cb77324"; + sha256 = "b8f85fdafff993e12e02cc9fda1c79e38c06a1cff6c04a75edfcf227e2e4b6f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ja/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ja/firefox-97.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5fe015cc6d0250500912187edc04e697cbf62028b447e47e8d1532dfd0628d2c"; + sha256 = "2880b426221b983e92248e7e1a58e7b5940c6a782d6f6abe8679b3dce09b675b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ka/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ka/firefox-97.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a696df24f1b95e5b228f53328514c77639020a8719cdb23f88017be7e6d2a037"; + sha256 = "d2dd3f4061dce484eb40c4f7d8a3101bbf4e838e657c4cf3b7fd31efe5ac1556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kab/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kab/firefox-97.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "4d9c7c0cf22aacd5c18f75eb511db2ebffc393019af1f01fb5d1dbb837da96a6"; + sha256 = "c49cd9e7a5786fcd2d123bef197c1361b07644244e869bc038dd2ca1022da089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kk/firefox-97.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "db9c1eee0cd6a696e24b7edb142aa3f04a89bb3b30ec46e76be3738e3787bbe4"; + sha256 = "466dbe14d44fcc547d5bba6d8475f908af0cc8fc5a788edcc9ea314b74e01aae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/km/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/km/firefox-97.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e05b5a315de970a2bb58276204a341870d0028214b2a402eef5db36ce8ca8190"; + sha256 = "67499ddaf97d90f07cbb8e7bec337287346d964630a73e99a192be94ac38f19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kn/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kn/firefox-97.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1c60915882ba74ddb257517036932c154a5081e9418b98e0fb533f1c71479eaf"; + sha256 = "1c661152b25860acd10d6ca039107957ce8811b448c88c55df0627436ef35955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ko/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ko/firefox-97.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1c69656cf1e302973ee92d9064388cd537b70ca8e36882b2aba5ba477522192b"; + sha256 = "d43000c9c03f855e2d3b061d085c4c1dddce06b511145370cacb0e11e272382e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lij/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lij/firefox-97.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "bef0d7289833480363ab76d610e2cfecb286f5ed614d910ee84c9016da358c1c"; + sha256 = "d330473b0a20100c9fcfbbb6488dbf367a21816683a1b21b861a729defbbcfc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lt/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lt/firefox-97.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "738746e5e17271ebc97963a890e6951c9338c7f9bdb6021c3db0de1f346eb66c"; + sha256 = "0d89e5bb389c6d4ab91965141d5f16bc6e34b1cf2a7022e4d97db135501b3cce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lv/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lv/firefox-97.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d16713a766aecb20428d6642805fdb94a70523c0eb557b4a143c60afbc7ab623"; + sha256 = "754b82aa04425353fb85a02fcfaa02a47f6f2e5218af4e814970c91282c77e82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/mk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/mk/firefox-97.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f04eb09a5ccf6fb017a652ed8016d2e6f83202acb1f596a9f1b972caea8bc6ad"; + sha256 = "e554245a73bca28a816c1f4605164554a8a2680fb098aee3020c972c1e535541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/mr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/mr/firefox-97.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8cb8bdfe8b57fde90425e242de2a6c6a2fd76341efe32017febce6eb8189595b"; + sha256 = "e3a0daf03fe745268e08a82b53a94c192dbf499d9f7fc556f835552a2002bf63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ms/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ms/firefox-97.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "785a87e3cbd7521913c47b9ba0f3838ee44e729df17680d780c78735c2ede188"; + sha256 = "dca49aebc098103f212a16ab135de42aa3a7eae98cf3775c9d3c8e48d27816e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/my/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/my/firefox-97.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6a555d259acd118123630f2da9c82c72fb95208b6aa02cec36ee8f803a94db82"; + sha256 = "471986bf5b5aa0f63c9953a465cb2ce527699f497ed720defe80aef8b7dbe249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nb-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nb-NO/firefox-97.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "a095c6f9991033a60015416f049e39f403368aafd85b3eb63dc3b7ab1183b9a0"; + sha256 = "d184e4b06acca71983b6a075c5d4d70a5419162a96ba5ef612b9a7e9727759ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ne-NP/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ne-NP/firefox-97.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3e3d546d2c2671f026414c809ac29431e4497a609c429c549f3183b101282766"; + sha256 = "7a8ebb648a0aac4c7d101e99da6a396ed5f3bb7688b59cee94f67aa6f627d4aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nl/firefox-97.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "5a0f987ddf354053e128a9c4d27b0eb73df227569643bfdca211aa2d4aef9208"; + sha256 = "6f24663da51d9c38b1e66e0064a161630da5f0a9e8a5920f63b76ef96d7d6a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nn-NO/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nn-NO/firefox-97.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "736ed19fe6aabe0db06c3b5ba8971b9f73ec7014d876ce5fc0b5caff491cdff9"; + sha256 = "9f02fb57edac62277fd649f5da56d14eb52940581adbcf6b970883cb020ad0c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/oc/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/oc/firefox-97.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "abde35c0c8ec426bdf5b35d0d19d2076fb72091939dded1318af90234efdc795"; + sha256 = "766c5f0ea370fc0c2fa3c39096a9bb1d0f1b71c6c0a410f34bdbd21469d932db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pa-IN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pa-IN/firefox-97.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f40fca6a7f15b21ed61ff1293f9ce26cd4331736c4f59dc3515fa895176a15af"; + sha256 = "d5f44b2116490596780d4af5e14f815e40e344a1b29cae556957a0b537aaa8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pl/firefox-97.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "37dbcf64865442c1e42d22cb926888dee9aed8f3d99e08c8a8da3fc3bbcc18a0"; + sha256 = "5dab218cd9efe307e844913218769eb845b6abe4153191dad34b8f9853a2fd73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pt-BR/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pt-BR/firefox-97.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "60059b1fd78fd5dbf4df958274dc3c272142b4daaaf7fcd527491674bafbc234"; + sha256 = "20d3a3f3f3e037780de788f858d3c9c4d778219a9158cbb1496ba968e9f50b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pt-PT/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pt-PT/firefox-97.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "958dd069404ef0b5aa3426c0436f7cc2fb0665d7aeb17b894f555baa875b1808"; + sha256 = "a97777d502c304541d1fb2c177198dc41d46e66052008f0adaa97141b4fb81c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/rm/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/rm/firefox-97.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5d1379af25c004d0e16b3763fe2a78ddbd766a1ed8d3aa966a71bf44b65a8140"; + sha256 = "b008b8767060459644fe8a1221b6b02710393d8074d685dc60f188424c6272fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ro/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ro/firefox-97.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "11ac629ea7b38db0043e9563fc5d75ea26ad75b0a3565d12798d56d2c7256992"; + sha256 = "9716c8abba493f6f2f627276aeeb0e7a434301bf59142a0ec90a35f0d683df89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ru/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ru/firefox-97.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "2cc4cc849625dfc20a3dcdfa3a964218b521d4271c0cc166312b016948944b33"; + sha256 = "8cb413a6ca340356c9ba3500e6e683d7d6e807b56e44651f69252e82d31f2484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sco/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sco/firefox-97.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "956160210c34a207a129a08667c3c3a3f978ad444a3f524e5cf4ce3406205c3b"; + sha256 = "a6df0b4240863b6a41f8a10d3d73577e0391cb98fecc82b544ea33099cff2d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/si/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/si/firefox-97.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "68b2d054ed0af6e2608b42f958e5790d22552882ae2c143fd5a35b755232577b"; + sha256 = "bc7bbe3c418d78afca0ab5f1907ee6d95e7e1488101e2adea56e4efc3ee53584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sk/firefox-97.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5e5f318c5783feedcdd155afd7b2755fe0db513766378d823bec141a34245d73"; + sha256 = "56f7be236c7d0135e6d3a9fe2e7d173c7f7c9c95dd46f170ed616dba8d1c4edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sl/firefox-97.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "75be9829bc9b3e9167eac5c24a9c1d091a7f932c99c496b7a07c0d438523ba13"; + sha256 = "eb4c4c11ef6f853d88447a96381093ac37130728ef131a6ec7f74a84803298df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/son/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/son/firefox-97.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "eb18e65b5ff61953e8a8a2eff766dd13b9ecc5ce66179108eeb919b64219efcc"; + sha256 = "49cad9188901a1fda74afab30dbc430c465c2a8f91b03499d5bf55f361ec9c97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sq/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sq/firefox-97.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e21779796d19e344b518cc06106d9da298430dea03842c37e7856676999e57f4"; + sha256 = "c2080aa59871af97b1ebba2e25f32fc0ab88cf5c407c43f63406dcc3c2fa5087"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sr/firefox-97.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "12ff3eb22ea684b81909f9c03a4ce2ea802d6160bf1b7b939a808b28ad042d7e"; + sha256 = "e4c0723595f741bc306a066b96c11f8c125c1e7cf2c70998548a8b77375fa8ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sv-SE/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sv-SE/firefox-97.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ed48713a2c50e806fa4ecb082bf87765e00f4b496f7087ac642d4b7d5287a373"; + sha256 = "665d95546dbcf38e91102a559ad7063052b8554f5f8799c127231b93d0d75744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/szl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/szl/firefox-97.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "0a8335399ff54640d374c0c1035a4ba74a0a88b3940c02e7351c0372be4efd3e"; + sha256 = "f85aca1b01a2ae08915c893d25ce6243c405fe3e32f18cc28e111451cae006b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ta/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ta/firefox-97.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "6d39220c2d88014acbfcb0d6ac93f1539a668b787a26acd31b80312f59f6be12"; + sha256 = "3d263a4ab9991f25cdc130f42f8bf37212f06fd614966cec0f42a9e5e3585a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/te/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/te/firefox-97.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "f037e673f47ce4569eec2525be5c1b903ffe0df71e322eeda033c91cc92cdd0b"; + sha256 = "59ad98ba6c2b4f9eab95c200ca36d884fc7b7d99e0c121fc7bd8867a2a1cad05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/th/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/th/firefox-97.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dc7aae98e8b4928f7b3b703aeca5d07aa1a820efb5bf34b1d07d9360b2eefbec"; + sha256 = "c1f73e025dad87d5314093abbeabef1e0107dd4f29c3a8cec2f7ab1c01d8a0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/tl/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/tl/firefox-97.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1fac0d3b63677d85d1921a7b9a9e81bb45be52a63ddeaa679022a9178acb2081"; + sha256 = "a71fcb2727d70e02bb2d50e1284b4c783d227c2da3940c918c7e7eaa2cebbbda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/tr/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/tr/firefox-97.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d380b853b024daa0c11a34ce80c90b1840a2439b89b9f471ed1d483577c9e297"; + sha256 = "597a37f249f46ec9bedc4605afb5c13b213c4eee1d1544a1f74a645446d92e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/trs/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/trs/firefox-97.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "4b143569552d987f05fa482c481b846398cc45fa98edb59b257764762198a5f2"; + sha256 = "f6a93b3835aabe44781fb73985193d6c704202cefdcc2823ea77cb13df8844ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/uk/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/uk/firefox-97.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a6df28358b227cbc03887ecc6e3ef516a71b09050fed3ba19f13a7bba8fe7f3f"; + sha256 = "ba11ca8bf215bf0190b273374228db3019baa6db85a5acb372dbe550d94148fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ur/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ur/firefox-97.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "0eb5d0680e985acc6bd5dc9602080c953a0664260e0ad62ba697b9a13b0282ca"; + sha256 = "61e9becb283fdd38961bc79629e332946fc449d40b37163d46303de9dab2eb26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/uz/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/uz/firefox-97.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1916a60680587dad773be1a63eb6a8959d84d08ffd3aaf9c062d12a7bb9f1fa"; + sha256 = "9e47cd99a5a5309c7b388a4e17e0101558bfdd397ad0caee82902e8d56d652e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/vi/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/vi/firefox-97.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b4072149b45d7514af7260f1f13605823dc3420c5f45198266503f3a9e42119f"; + sha256 = "e2fb08af58be123b81edf9d7ec0dd532388fb81a7cf9a2952012b5758f5329f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/xh/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/xh/firefox-97.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ed0c483448b2eeff1adac520be15dee6ecff162f0420669902e565eaf30e0dd2"; + sha256 = "cc19114d522b0e9bf00dd2293e80643919229262afb01316e95e34f4fc18dbca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/zh-CN/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/zh-CN/firefox-97.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c1416988cbff23e6a68a04ff54b65fe11909dba59e9a0b2709a5ce4599a9d8aa"; + sha256 = "11c608bb9511dc12e8c55d31fbf322a2524aec99ce90fea35a5d83d7282976d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/zh-TW/firefox-96.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/zh-TW/firefox-97.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ee7b2c30ae3e685f631a132ef1992b6b59c189781385ef0823330ee24fd4d43e"; + sha256 = "6a0268efa615f9559d258cfc05f113d54700d81c5ca0546054c10b9879d76d2d"; } ]; } 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 677c41e723..3816689f84 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -134,9 +134,6 @@ buildStdenv.mkDerivation ({ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ - # Fix wayland 1.20 compatibility (https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:) - lib.optional (lib.versionOlder version "96") ./fix-build-with-wayland-1.20.patch ++ - patches; # Ignore trivial whitespace changes in patches, this fixes compatibility of @@ -178,6 +175,8 @@ buildStdenv.mkDerivation ({ rm -rf obj-x86_64-pc-linux-gnu substituteInPlace toolkit/xre/glxtest.cpp \ --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' + + patchShebangs mach ''; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch deleted file mode 100644 index 49ce627faf..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c -index 7a448e6..7792581 100644 ---- a/widget/gtk/mozwayland/mozwayland.c -+++ b/widget/gtk/mozwayland/mozwayland.c -@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; } - - MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, - struct wl_list* other) {} -+ -+MOZ_EXPORT struct wl_proxy * -+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode, -+ const struct wl_interface *interface, uint32_t version, -+ uint32_t flags, ...) { return NULL; } 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 6fc369c60d..0ae962f255 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "96.0.3"; + version = "97.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3dd5fbc96e369d5f4fb3eca778c2bd3e2313d089f867de9fac3556810a797e9b5629ef1b8840fb2f22a18df7de95ea1993eee052f691d861a555cea544b05966"; + sha512 = "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.5.1esr"; + version = "91.6.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "26239e7a94b79f1e24a6667d7cf1c398d75992e8850144affbc5d3f34f04b91f0c9b020cab662b2cd4927924839ff2ddd2f3605c537bb5494fd9ac0d951b14fa"; + sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index b0fc87a180..d1fd9f05cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -118,6 +118,9 @@ in stdenv.mkDerivation { cp -a opt/* $out/share cp -a usr/share/* $out/share + + substituteInPlace $out/share/google/$appname/google-$appname \ + --replace 'CHROME_WRAPPER' 'WRAPPER' substituteInPlace $out/share/applications/google-$appname.desktop \ --replace /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ @@ -142,7 +145,8 @@ in stdenv.mkDerivation { makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ + --set CHROME_WRAPPER "google-chrome-$dist" \ --add-flags ${escapeShellArg commandLineArgs} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" 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 64658d6442..4285ee3298 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.10.1"; + version = "1.10.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-HwrIdQv4LDVLLuvukzp28AuKKbEMQeHSb0ZW+a9q4ug="; + sha256 = "sha256-tj/RDGPu1hB67eTdq7NrbRd+OwBhIAm1lBgoft5m4v4="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix index ccbc7a8dc8..7c1cb7f04a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, lispPackages , makeWrapper, wrapGAppsHook, gst_all_1 , glib, gdk-pixbuf, cairo -, mime-types, pango, gtk3 +, mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas , xclip, notify-osd, enchant }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gdk-pixbuf cairo - mime-types pango gtk3 + mailcap pango gtk3 glib-networking gsettings-desktop-schemas xclip notify-osd enchant ] ++ gstBuildInputs; 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 bf220c02b4..7584cd3aa2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -19,11 +19,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.0.2497.32-1"; + version = "5.0.2497.51-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1l333q002z9rr08np0r0j89j26shmsl8y2clyqwh54h22h7hmypz"; + sha256 = "OOLTY6Q0BI65PVN/B6+Q9t4Fa5Z0p9U2KyAeCGwCCPw="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 4c99319fbb..c1629afbd0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "cloudflared"; version = "2022.1.2"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index fdd0e4967a..41d125f6cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-esSpCNvgYhuz9i22AU4ZowU5A5ZOPZ15+XHB4OOfTa4="; + sha256 = "sha256-mebxbS0PVP2EdYt31G0HQ0Z+wxpXOe9/xaKdH0wwB60="; }; - vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; + vendorSha256 = "sha256-T2a5FBjISXprgMA6ye2xwAFLE62Qb3AUQVjpGtnduU0="; subPackages = [ "cmd/clusterctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix new file mode 100644 index 0000000000..64a8ebd4a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "cmctl"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "cert-manager"; + repo = "cert-manager"; + rev = "v${version}"; + sha256 = "sha256-RO7YcGEfAQ9kTxfqgekYf6M5b6Fg64hCPLA/vt6IWp8="; + }; + + vendorSha256 = "sha256-4zhdpedOmLl/i1G0QCto4ACxguWRZLzOm5HfMBMtvPY="; + + subPackages = [ "cmd/ctl" ]; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/ctl $out/bin/cmctl + installShellCompletion --cmd cmctl \ + --bash <($out/bin/cmctl completion bash) \ + --fish <($out/bin/cmctl completion fish) \ + --zsh <($out/bin/cmctl completion zsh) + ''; + + meta = with lib; { + description = "A CLI tool for managing Cert-Manager service on Kubernetes clusters"; + downloadPage = "https://github.com/cert-manager/cert-manager"; + license = licenses.asl20; + homepage = "https://cert-manager.io/"; + maintainers = with maintainers; [ superherointj ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix index 5243c4130f..36b3141b31 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.18.3"; + version = "0.18.5"; src = fetchFromGitHub { owner = "cloudskiff"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-JD3T0dCRg0UQlG0pWnI8RJZuRrIFfSMVHMoaEIymdWE="; + sha256 = "sha256-Qz/yObF1Df62Hqwl6fPHGkWcsifvgO5EfeiyU3aql3Q="; }; - vendorSha256 = "sha256-g3+g+mPXEO2ZcVraKuVYZCMBD5zEr1l8ogcYt3r4UjU="; + vendorSha256 = "sha256-wOk4IXD9qHG8R4iddlc4TLH39jVSof9bwTDU1kyAmuA="; postUnpack = '' # Without this, tests fail to locate aws/3.19.0.json diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix index 55f3e23ad6..8b93b88be5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; - sha256 = "149b9ae774022acc0109dced893ca2d73430627a612be17ff12de8734464aff8"; + sha256 = "1rm2x66179ybfyc8v3va3svjxrnkslqn3dc84qkglqjaiqciadnr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 7ea8fa76cf..30a12281c8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.25.3"; - sha256 = "1j7jw6vfki67dz9lkx3f94b9hi6d2bc504yy3nfppp3hx8nwxb37"; - manifestsSha256 = "1akp1i3xasfjq6zqbk7mnbkhnzmq7if7v82q6zdp2678xrg6xps5"; + version = "0.26.3"; + sha256 = "0j6zvcjykk775nnj8s0n5154lqslgfpi8884gh6sv204z2drfjff"; + manifestsSha256 = "1pfk0fj228zy0m1cz0400l4r41l7p0gsdq5lqnl3a8vgb4f6i41q"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-/VeJq6l3kSZ9qcYf2ypyyoXVKME+rig6aDdWDoRqNzA="; + vendorSha256 = "sha256-34hSbOB7n9OFpVqe8y1+jAC3j0HEBg9LhYOvVGH9kLY="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix new file mode 100644 index 0000000000..6920c11dca --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "glooctl"; + version = "1.10.6"; + + src = fetchFromGitHub { + owner = "solo-io"; + repo = "gloo"; + rev = "v${version}"; + sha256 = "sha256-t63tK0hwbVnUP9UxS8g3uzL3rBvKR10vu1E85mNV3E0="; + }; + + subPackages = [ "projects/gloo/cli/cmd" ]; + vendorSha256 = "sha256-IBuAUKbX1esx2p4Q/b3UxQH9S3VVNYZcn5vRKtmhO0A="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/glooctl + + export HOME=$TMP + installShellCompletion --cmd glooctl \ + --bash <($out/bin/glooctl completion bash) \ + --zsh <($out/bin/glooctl completion zsh) + ''; + + ldflags = [ "-s" "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ]; + + meta = with lib; { + description = "glooctl is the unified CLI for Gloo"; + homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; + license = licenses.asl20; + maintainers = with maintainers; [ nelsonjeppesen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 2d9545bc13..42d2e63eaa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGo117Module rec { +buildGoModule rec { pname = "helm"; version = "3.8.0"; gitCommit = "d14138609b01886f544b2025f5000351c9eb092e"; 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 4f9de00dcf..b209a5c5bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-KZrv447Yz4WxtkmQkGLsnZC0ok0rWCM2Fs+m8LVTGfM="; }; - vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; + vendorSha256 = "sha256-F+b4EXAxa4+O6yepx+9eRrdq294ZcQ+sODFUCKYpSuo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 689922515d..256d7e6422 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-Fk1aYSa3LqzxiHtlzH5pcNtodOprjfnCFh4UMqCa6Rc="; }; - vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc="; + vendorSha256 = "sha256-21C6wZ8lKQnbUg3aD0ZFVOgopblXyWk4WP/ubZVk3Yk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 27514303a1..a844f22167 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.commit=${src.rev}" ]; - vendorSha256 = "sha256-jWZ1N1A8VECBQvkXyuzMUkI4u2NLr5/gSvJUfK5VgzM="; + vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix index 596a71251b..0a2386d37c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw="; }; - vendorSha256 = "sha256-1D+nQ6WrHwJwcszCvoZ08SHX0anksdI69Jra5b9jPCY="; + vendorSha256 = "sha256-PkCUwe3S1bq37ME2WyTUnwEcbnFcNI0eaI9yW/HZ1uw="; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index 02c1c83478..1b1089f655 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-V/g2RHnZPa/9hkVG5WVXmbx6hnJAwUEyyUX/Q3OR2DM="; + sha256 = "sha256-xLeS0vfYuLEdzuou67ViduaBf62+Yqk+scaCCK+Xetk="; }; - vendorSha256 = "sha256-bTCLuAo5xXNoafjGpjKLKlKVKB29PEFwdPu9+qjvufs="; + vendorSha256 = "sha256-zE/y9FAoUZBmWiUMWbc66CwkK0h7SEXzfZY3KkjtQ0A="; subPackages = ["cmd"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix index d7a58f09b4..2db3036135 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { inherit pname ; version = "1.4.0"; tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl"; + vendorSha256 = "19rd450gmc51gmwa13991lbkva7r80d2camikkxmmgywyhrd06sf"; src = fetchFromGitHub { owner = "kumahq"; 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 0af651246e..8c8a6d9293 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 = "21.10.3"; - sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv"; - vendorSha256 = "sha256-J/+YFXHC6UTyhln2ZDEq/EyqMEP9XcNC4GRuJjGEY3g="; + version = "22.1.4"; + sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n"; + vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc="; } 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 14a3675797..bcbc8439c2 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 = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA="; + sha256 = "sha256-s116SwgOj5xzfoz/iw17xubEKzPUx912QHk1+C6YhE8="; }; - vendorSha256 = "sha256-S0WRLln80pdGWCe6ub3bMZ6G2PbXwvCEGDDzez+nF9E="; + vendorSha256 = "sha256-VvK4pHmV1WkIzQDHiFVzjurigP3F4xYl0DJCnImSx3s="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index cfa86ea2dc..54cecde094 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, go, removeReferencesTo, buildEnv }: +{ lib, fetchFromGitHub, buildGoModule, buildEnv }: let package = buildGoModule rec { @@ -28,23 +28,21 @@ let sha256 = "sha256-SmlcQH+K/axl6Gj+bX0Quk6K/usP0c1hWnIdFjS1dn8="; }; - vendorSha256 = "sha256-tO8vi9jBV6rVcGk/OoaXzpnQi4yPdozYZZwAMFCz2+c="; + vendorSha256 = "sha256-g3INNvAQ124kBJSe5cnsIq1y8sWpPYKLwJONgbIUaoM="; - subPackages = [ "." ]; - - nativeBuildInputs = [ removeReferencesTo ]; - - # buildGoModule overrides normal buildPhase, can't use makeTargets - postBuild = '' + buildPhase = '' + runHook preBuild make build plugins + runHook postBuild ''; # tries to pull tests from network, and fails silently anyway doCheck = false; - postInstall = '' - mkdir -p $bin/bin - mv $out/bin/nomad-autoscaler $bin/bin/nomad-autoscaler + installPhase = '' + runHook preInstall + mkdir -p $bin/bin $out/bin + mv bin/nomad-autoscaler $bin/bin ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler for d in $outputs; do @@ -54,7 +52,6 @@ let # have out contain all of the plugins for plugin in bin/plugins/*; do - remove-references-to -t ${go} "$plugin" cp "$plugin" $out/share/ done @@ -73,6 +70,7 @@ let mv bin/plugins/prometheus $prometheus/share/ mv bin/plugins/target-value $target_value/share/ mv bin/plugins/threshold $threshold/share/ + runHook postInstall ''; # make toggle-able, so that overrided versions can disable this check if diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix deleted file mode 100644 index 079c957ebb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.13"; - sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8"; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix index 5a3e964ad5..750e49fc1e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -4,7 +4,7 @@ , nvidiaGpuSupport }: -callPackage ./genericModule.nix { +callPackage ./generic.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; version = "1.1.8"; sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix index 1bf38a8457..3eb99e7370 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -4,7 +4,7 @@ , nvidiaGpuSupport }: -callPackage ./genericModule.nix { +callPackage ./generic.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; version = "1.2.3"; sha256 = "0qjj1pnq2yv4r8dv03m08ii4118drjnswf4n1r95dqh8j3bymv5i"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix index c028e47602..180cf48e3f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,27 +1,30 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub , version , sha256 +, vendorSha256 , nvidiaGpuSupport , patchelf , nvidia_x11 +, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "nomad"; inherit version; - rev = "v${version}"; - goPackagePath = "github.com/hashicorp/nomad"; subPackages = [ "." ]; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev sha256; + rev = "v${version}"; + inherit sha256; }; + inherit vendorSha256; + nativeBuildInputs = lib.optionals nvidiaGpuSupport [ patchelf ]; @@ -39,6 +42,8 @@ buildGoPackage rec { done ''; + passthru.tests.nomad = nixosTests.nomad; + meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix deleted file mode 100644 index c2e6573175..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, version -, sha256 -, vendorSha256 -, nvidiaGpuSupport -, patchelf -, nvidia_x11 -, nixosTests -}: - -buildGoModule rec { - pname = "nomad"; - inherit version; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - inherit sha256; - }; - - inherit vendorSha256; - - nativeBuildInputs = lib.optionals nvidiaGpuSupport [ - patchelf - ]; - - # ui: - # Nomad release commits include the compiled version of the UI, but the file - # is only included if we build with the ui tag. - tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; - - # The dependency on NVML isn't explicit. We have to make it so otherwise the - # binary will not know where to look for the relevant symbols. - postFixup = lib.optionalString nvidiaGpuSupport '' - for bin in $out/bin/*; do - patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" - done - ''; - - passthru.tests.nomad = nixosTests.nomad; - - meta = with lib; { - homepage = "https://www.nomadproject.io/"; - description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.unix; - license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 67db6edd98..30ca2ee1cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/k9lQS3oPOYxhaaXuaDwPnai7byDkge4yBu7/9g4RUE="; + sha256 = "sha256-sB7C0IKadgpQ2h6HuH4D6ku/GXnFfFS+fGCW/RBSc10="; # 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 { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-7SVEyyJRE7oYIhuENraZy0aieIAoFFWtq4mrSXxURlQ="; + vendorSha256 = "sha256-R7tF724y5WNIByE+9nRoNSZDZzfLtPfK/9tSBkARaN0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 959c40637f..19184ac15a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U="; + sha256 = "sha256-+V0mRSjAwhZoiIS/OpZyqa5rvlqU9pGJwmW0QZ3H2g4="; }; - vendorSha256 = "sha256-ybsDB54kkbONi3b9URtNUusHIdUfzymOpYlNHJz4i2A="; + vendorSha256 = "sha256-IPHu23/2e6406FELB1Mwegp0C16cFD65mbW5Ah32D4Q="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 819bf4741a..e9202205ea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "talosctl"; version = "0.14.1"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 8bdbf63a9f..0d21e44003 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM="; + sha256 = "sha256-Wtfn9ffUNKuwByRbeCYq27xvr2DuzxSSQMH9Sv5a7rU="; }; - vendorSha256 = "sha256-pqwdxFFcATfxGmz6quIH8OL4U2DZKmuVyOLEct2nBlE="; + vendorSha256 = "sha256-ed6rC+wrZHDViGfJrSBl5VUqX/o6RKytXbTKqxb3ZtU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0db134bdb2..d29888aee0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; + sha256 = "sha256-VGdYnynEm0ShG96W0uKiWBbUy/EitX3od5Nnho6T0pg="; }; vendorSha256 = null; @@ -22,10 +22,14 @@ buildGoModule rec { excludedPackages = "\\(third_party\\|cmd/docs\\)"; preCheck = '' - # Some tests try to write to the home dir + # some tests try to write to the home dir export HOME="$TMPDIR" - # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden + + # the tests expect the clientVersion ldflag not to be set + unset ldflags + + # remove tests with networking + rm pkg/cmd/version/version_test.go ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 8690e65be8..53e3aab634 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -10,42 +10,42 @@ let # Our generic constructor to build new providers. # # Is designed to combine with the terraform.withPlugins implementation. - mkProvider = - { owner - , repo - , rev - , version - , sha256 - , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ - , deleteVendor ? false - , proxyVendor ? false - , # Looks like "registry.terraform.io/vancluever/acme" - provider-source-address - }@attrs: - buildGoModule { - pname = repo; - inherit vendorSha256 version deleteVendor proxyVendor; - subPackages = [ "." ]; - doCheck = false; - # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml - # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled - CGO_ENABLED = 0; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; - src = fetchFromGitHub { - inherit owner repo rev sha256; - }; + mkProvider = lib.makeOverridable + ({ owner + , repo + , rev + , version + , sha256 + , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ + , deleteVendor ? false + , proxyVendor ? false + , # Looks like "registry.terraform.io/vancluever/acme" + provider-source-address + }@attrs: + buildGoModule { + pname = repo; + inherit vendorSha256 version deleteVendor proxyVendor; + subPackages = [ "." ]; + doCheck = false; + # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml + # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled + CGO_ENABLED = 0; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; + src = fetchFromGitHub { + inherit owner repo rev sha256; + }; - # Move the provider to libexec - postInstall = '' - dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} - mkdir -p "$dir" - mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" - rmdir $out/bin - ''; + # Move the provider to libexec + postInstall = '' + dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} + mkdir -p "$dir" + mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" + rmdir $out/bin + ''; - # Keep the attributes around for later consumption - passthru = attrs; - }; + # Keep the attributes around for later consumption + passthru = attrs; + }); list = lib.importJSON ./providers.json; 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 8612e898d9..d1cb172d3f 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 @@ -3,47 +3,47 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v1.2.0", - "sha256": "1jxnamd701fjz0y62k229njrxa3ijmr1m1dszn0x3mpak5qgw7li", + "rev": "v2.0.0", + "sha256": "1v62lfm9w8d8iq70nwjrry52zxh5ixmxfp0dlmxvck7qjzcng8rg", "vendorSha256": null, - "version": "1.2.0" + "version": "2.0.0" }, "acme": { "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.7.1", - "sha256": "0gnq8jm31v0q2a4v310cjrrdc7y17c9vi326c6x9cs3lgjvn27m2", - "vendorSha256": "1wssw8x8zlrgx51ij0ghhwsbyzfl2r1qy4aqv03v705xipil8yn3", - "version": "2.7.1" + "rev": "v2.8.0", + "sha256": "06wjvjsh8qgncrbdhziqjd4pgp550q21p0xm4igdx80gd7541hr1", + "vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc", + "version": "2.8.0" }, "aiven": { "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.5.0", - "sha256": "1x37bnykn28hmb80qi530zgk6jfqpk97nswrm0hdw8x5vac4v63a", - "vendorSha256": "0ldk06dj72551b6djsq7vil0hzfsp3ixwh3ikqb40shsdq10iplx", - "version": "2.5.0" + "rev": "v2.6.0", + "sha256": "1vbphaxw6qskn7g4jah00cpw2w960x50rpvx5kq143d8b2vbiix4", + "vendorSha256": "1zxs0p2xwxgvxdx65h0yfvzl7qmqlw41ipw0gsf25g0mvs4jckwb", + "version": "2.6.0" }, "akamai": { "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.9.1", - "sha256": "17a3ml4h1b1480z9dzppig20jx9mgldnmpz8cn2x8qgzbpiqz3hs", - "vendorSha256": "0l50hy4cy360g6adbhhbl4x8hagma9zfb3yyzk6vbslal9m4kd6j", - "version": "1.9.1" + "rev": "v1.10.0", + "sha256": "1nsgdqdg3p08f40427qxk3whwgqw1xdsks55d3j8j94zgrndmpv3", + "vendorSha256": "11q46n36yv56ivdax7w2hsyl65jwylxgwdfvnfz4w3p1bpyy0qxv", + "version": "1.10.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.153.0", - "sha256": "1h37sxzkngmikvmyj9isx45vcpd31ml47f4r6ii1h2l69182hsqs", + "rev": "v1.154.0", + "sha256": "1wmmy82c44jdq9xgli24wgh2nb2jg6xw0nlm35psyj0jmmxvisrw", "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", - "version": "1.153.0" + "version": "1.154.0" }, "ansible": { "owner": "nbering", @@ -67,10 +67,10 @@ "owner": "alexkappa", "provider-source-address": "registry.terraform.io/alexkappa/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.26.1", - "sha256": "03nzwsda6n1nycpk2w87b8fj6aqzid8i2fa29qd9skwplm7hyjfk", - "vendorSha256": "0k6lylkcdvm0piaic8hdbhg1jf1vzc897w1sq7v57brx7586h3sc", - "version": "0.26.1" + "rev": "v0.26.2", + "sha256": "1n9gn7zsdygdr2ybki7xz2snp3fygls6myb1w5zndby497kgxrkw", + "vendorSha256": "1x61f7vz73m2q6pdb6ddy27j4npiwrrlgzvd90zrcc0yj22h6mms", + "version": "0.26.2" }, "avi": { "owner": "vmware", @@ -85,37 +85,37 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.20.3", - "sha256": "1k3sdfn0np9nzvc0bfc2wi7ixbrv0ikmzwyh103jfppidkasy5yq", + "rev": "v2.21.0-6.6.ga", + "sha256": "0svims34vw8xplza77flp675r90rsh9gj8cb5c02knnh4lgf7ffv", "vendorSha256": null, - "version": "2.20.3" + "version": "2.21.0-6.6.ga" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.73.0", - "sha256": "0la188dljw15l09j2farlhgri0vhrlbmsay7q1ar2y4ralqlsgl8", - "vendorSha256": "1h2x1318ax4qdy261wm8pqxq21ra50hymcykhw6mhj5lqxcb5r5z", - "version": "3.73.0" + "rev": "v3.74.0", + "sha256": "1w8xgsc4xb86m2why5wgq3vj48rsz9m4fp9lpdid0x5836dg3wxl", + "vendorSha256": "104a93i9dqcbwr4rzbqlzz6jw68x2bq2w21s5n03i4pf4a170p1l", + "version": "3.74.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.15.0", - "sha256": "1gjx91svfg25x0hlx6mfam40615x278b9vxsy5p88s3dl6xs3hdv", + "rev": "v2.17.0", + "sha256": "183lpw9d22arw9yap614khbn77w5914rgq5vclscsa4k8jbiszy3", "vendorSha256": null, - "version": "2.15.0" + "version": "2.17.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.93.0", - "sha256": "0akacaih0smdjxh9ssdir1j248m5bpcc4wpwhykb7922yvj581ds", + "rev": "v2.95.0", + "sha256": "1xqfnc7c3ddgpj3mhp9x50kaszc01jwrwhkm0gxn9ixy0bqy4v7m", "vendorSha256": null, - "version": "2.93.0" + "version": "2.95.0" }, "azurestack": { "owner": "hashicorp", @@ -148,19 +148,19 @@ "owner": "brightbox", "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", - "rev": "v2.0.6", - "sha256": "0k3k6d0rnvs1r2fb22q37g10zi0wq9kvakvj6zw97hkfld9wrqfj", - "vendorSha256": "07mznpp2mr1n9izgk2s8aibfvqsamj533666s46x1k49p0sh7lqx", - "version": "2.0.6" + "rev": "v2.0.7", + "sha256": "0p2gg24yvzghhsa5g1dqd27vkj6p2wyr3wxd964r5kz0sl80xh1y", + "vendorSha256": "05min7zgl9q4qw8v5ivf352pg4i5jnv449jl129vdsqz7p2wrc6d", + "version": "2.0.7" }, "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.4.0-rc1", - "sha256": "125ng4yzsmnbzgvwn3d2070cxnp3jvzpp8m9sc95q9x7dprbxzvl", - "vendorSha256": "1dkij2anw0cy8h2pv8h9a0cr0r9skpcc0j26bggspigk8qa4nzsx", - "version": "1.4.0-rc1" + "rev": "v1.4.0-rc2", + "sha256": "0n8wlngvz3lnpadsj339gx73jnnfxlhsy091a2lws4s3c9a0ncgb", + "vendorSha256": "1bqwfl5qc0w5qwkg0b42iyrhcchm2zxaxh6qmvk5hynxdwczqvk8", + "version": "1.4.0-rc2" }, "checkpoint": { "deleteVendor": true, @@ -185,10 +185,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.7.0", - "sha256": "1d1wljk033b9j5sx01xjv5jmclw79f2f21s8zsix036mmzvaiswb", - "vendorSha256": "1g3fyxrdqa4ds6n9pcw2mvi8nfiz4dna57ssvggfwic4jl89q7zm", - "version": "3.7.0" + "rev": "v3.8.0", + "sha256": "1splgbfjwfjx9qv5f526jk7yzfh24crw0xasx42jfia639m6s49c", + "vendorSha256": "0cf96s4xgx2idx7g40qhk16fwhdfnk1pcl6dy3cl2zr4afz5sky1", + "version": "3.8.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -266,10 +266,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.17.0", - "sha256": "0in6xg4kgqy1izi8zapdi0f6dsni3i27fxh1l4sqp5kwh3vgpn0d", + "rev": "v2.17.1", + "sha256": "0dfw4sjmsfzrs28gf5k4vqjs6phwa6w3pwi7fpbngnw6l2r4m6h9", "vendorSha256": null, - "version": "2.17.0" + "version": "2.17.1" }, "dme": { "owner": "DNSMadeEasy", @@ -302,10 +302,10 @@ "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.15.0", - "sha256": "0fk4i8hi0x40rgcnq40j4jv12wsn9kn974h8qwhzxnd66n0xbnv0", - "vendorSha256": "0ax2368nhi6hfs4zwf84dqnf5ijyy93gz0brlfk89m7d2a90gfkp", - "version": "2.15.0" + "rev": "v2.16.0", + "sha256": "0bh27al9s6zczdz208lr70qab517lsazpi708z6711pgns7qhwjm", + "vendorSha256": "0ykfmksffcc62xwni9dqwgj3vlcmzf6paz6kviljib6sv9vqf0pm", + "version": "2.16.0" }, "dome9": { "owner": "dome9", @@ -356,19 +356,19 @@ "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.26.0", - "sha256": "1n22jll76gw3cxnyi2xfzh3mh0g9912rmkqpps7fid0imaz5jlck", + "rev": "v1.27.0", + "sha256": "0xc0a1gzdld039b4vlivf9b8g3pjja6pfzyqhjx0iy01akm1a9cc", "vendorSha256": null, - "version": "1.26.0" + "version": "1.27.0" }, "fortios": { "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "repo": "terraform-provider-fortios", - "rev": "v1.13.2", - "sha256": "042fn5jii9fx7vb6x4kcvmrmiccj7s13xqm91l3b2i9mzh4cgb3k", + "rev": "v1.14.0", + "sha256": "078wvbihrs6j5yrbqsx5g6l7z05y98kwlyanq5w99fsazz78rr4h", "vendorSha256": null, - "version": "1.13.2" + "version": "1.14.0" }, "gandi": { "owner": "go-gandi", @@ -383,48 +383,48 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.19.2", - "sha256": "0k6w1wxx9a67wkgh4j4aswbpcnlnjcvqnfi0gy2rw9kqbyxb9j0m", + "rev": "v4.20.0", + "sha256": "0cibbzj3nj5dgi2mcr93bdxwvb7r2qscwshjbssbc7avwvhh3171", "vendorSha256": null, - "version": "4.19.2" + "version": "4.20.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.8.0", - "sha256": "0ha6lp0z3lqdk05fhggdgdz50dm7z6ksn648khp44n7in0c0c5pj", - "vendorSha256": "143marl3zrqd37cgr6s6fdbx8dfmcchzc1f63140i4m07ygxwhxn", - "version": "3.8.0" + "rev": "v3.9.1", + "sha256": "1pqwgshjrzdw8prgadwq0hf0q72jjjfaas6kgh2as3yn8q24ynca", + "vendorSha256": "04v5hgq23rpz6h242v0m2zhpsfmx4h97pf396w4v6j0kj1wabf87", + "version": "3.9.1" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.7.0", - "sha256": "15w69dyr0s818as7v8pwzdbfs82l23qn846a7xlihw2g49xk0cah", - "vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj", - "version": "4.7.0" + "rev": "v4.9.0", + "sha256": "17f6d9dhsakllrlxxnp9ysqqqlr876jyjpz1hvk2h99skwp89xg5", + "vendorSha256": "1izwgxv1kplay15p8dbjnkllpnh4ic9di93zyi7wy6lhl8gi83hx", + "version": "4.9.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.7.0", - "sha256": "0jnz05yvhlawgc188xazv1fvqsqvpm867xf3i93xpl248pr1vqlf", - "vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj", - "version": "4.7.0" + "rev": "v4.9.0", + "sha256": "0wv5m9ixhsq3i0vhcc9jcm0xx1mryab2m22wfiy1w8m73gls96r2", + "vendorSha256": "1izwgxv1kplay15p8dbjnkllpnh4ic9di93zyi7wy6lhl8gi83hx", + "version": "4.9.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.18.0", - "sha256": "1qvhdshaiy1v7557nkh869k1wmz604pv2gchv98vrm3cp7zj83zn", - "vendorSha256": "1rgvil2kw38kbgbgcjy8mbkahj6zm91s187x41vd4x7ypc5kgbkn", - "version": "1.18.0" + "rev": "v1.19.0", + "sha256": "1ch4nxva1ixmgm6kjyvbd4ydrl8w39ll0ljpk1m2lrg5pn349mjn", + "vendorSha256": "0z8sd1hq0hhm51fi91ri6dmsq6brba9vd22gxkgzxfdsncq24h2a", + "version": "1.19.0" }, "gridscale": { "owner": "gridscale", @@ -457,10 +457,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v4.8.0", - "sha256": "12v0agcib8bziywaqzn6p04pwxnzyn74kqc5al8n572k0ndw3bps", + "rev": "v4.9.0", + "sha256": "0h61wldnjmmqfhjxvjf6jh0h6v22zx7rmff48pw1dyir19di7mdr", "vendorSha256": "183j20my61mqhch87cn455l938jqx4ssbnv8yl416i6bxgcpy6f9", - "version": "4.8.0" + "version": "4.9.0" }, "http": { "owner": "hashicorp", @@ -475,10 +475,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.32.1", - "sha256": "05rm1cmpbmavza1pyqjzrd316v6r68427cjhqy6bngb749nc1als", + "rev": "v1.33.0", + "sha256": "07m2kzx4m9gn9j5czlfdsq0a1ki8vfwlywrfgz2jxvz2cqnn4gsx", "vendorSha256": null, - "version": "1.32.1" + "version": "1.33.0" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -502,10 +502,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.38.0", - "sha256": "0cbyq74fy3y7ia8lywr8amwcjq53bn3psymyl5cnwqx8y97avx5w", - "vendorSha256": "0cgl87pij4amn77ksbrzl0qlf6a5ga29b64cnasq8lq03lbmqzw4", - "version": "1.38.0" + "rev": "v1.38.1", + "sha256": "08ssvqa4c4f2fnxzi3gfz9ygl6abh13s330q0lwq1zmfy1lzfjvg", + "vendorSha256": "1s77rmqd7igzlhd01jh6l56yar241jhb5ipfkch50yglkr7lqij5", + "version": "1.38.1" }, "icinga2": { "owner": "Icinga", @@ -547,10 +547,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.6.0", - "sha256": "1lrnzfjrw0yn4hsklhikf75n6drra7nljlzxf2asfkfaiwgcik99", - "vendorSha256": "17v5h5s2vijfx5yxhindr30g8ilmz7hamkxhmlk0zg5qb80mzqc1", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "1qzdm0jgk6f0zyjbv5qaq24h9a37bgb4ghym61vg763lqra69als", + "vendorSha256": "1q5z54rz5lqgdv9gfl20gfnzi4in0d65jkfxnmmsx6fjcb9ih4p6", + "version": "3.7.0" }, "ksyun": { "owner": "kingsoftcloud", @@ -592,19 +592,19 @@ "owner": "dmacvicar", "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", - "rev": "v0.6.13", - "sha256": "1fvxvijl5vjx7gb4w19pf4gcq97pisiznr2n72ybpma46c2clx2h", - "vendorSha256": "0rck411b4dh2zh4m4m6h2d03zlv5wm94li9dq5ggr0lspfx6nv1i", - "version": "0.6.13" + "rev": "v0.6.14", + "sha256": "1x1xl3blcs4dpjavf4im82l9vrv0plyyiayy475qjf0sl028criy", + "vendorSha256": "1kq0sbz7sv4gw35wl52z7gjv588r82izhrz7ydf5n0c4d2izmg6a", + "version": "0.6.14" }, "linode": { "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.25.1", - "sha256": "1sy3hg9scfidrn3z9ip6ryxghv1s9zlhwccl8k2s2b05xkx43j23", + "rev": "v1.25.2", + "sha256": "18w9x80zary64873d1r824g28l5dhkda1qq0lr895afwh8g11dfp", "vendorSha256": "0c882yafydhdhnp5awb8llzbmiljfdbamqlx740347ywpliy0ga2", - "version": "1.25.1" + "version": "1.25.2" }, "linuxbox": { "owner": "numtide", @@ -674,10 +674,10 @@ "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.2.0", - "sha256": "07f7kflmy0n8vbcxs2f62iqwm8fw8r97vgwwp38hmz3f1bix42qn", - "vendorSha256": "0pg1m7zp6363c98cww9cv4jsyavq201spc4lxcs5920xz00z86bw", - "version": "1.2.0" + "rev": "v1.3.0", + "sha256": "0cgjcq5fk4cyxrpvqkg7nk9hjzr28nmhmlnhclx9bw2rm3g7i000", + "vendorSha256": "0p3mg2j89jjkhgv57l5pkpyjdhbh41ilb5az5y2m5zz3kbl4y13b", + "version": "1.3.0" }, "mongodbatlas": { "owner": "mongodb", @@ -692,10 +692,10 @@ "owner": "NaverCloudPlatform", "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", "repo": "terraform-provider-ncloud", - "rev": "v2.2.1", - "sha256": "0igzwc1hycnlcvgi0il1z94xlb6rlklr1h7j909im1am3p6s3q1s", + "rev": "v2.2.2", + "sha256": "0f2q0k04bkkqw6qsjfpbmrqgxn504ys0ffg2ids82vzxjsmfpi1n", "vendorSha256": "1799i4d32y22v6ywwklm3ncmzir5hg8cw23jzb8d28xiw8vswhs4", - "version": "2.2.1" + "version": "2.2.2" }, "netlify": { "owner": "AegirHealth", @@ -710,10 +710,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.35.0", - "sha256": "0pwy3vsj332v82n3is6xaw4mgvv968ffr8n41s1r7j39r8bpl77f", - "vendorSha256": "13xqrdv0xnza0yxdgk155x4vq8lai9jrjvnfp153jb5p5hfnzwmp", - "version": "2.35.0" + "rev": "v2.36.2", + "sha256": "0gz6yynpmzv2hs85y6a6kfsci1hx25gikbmq35w9kvv91gn7vd22", + "vendorSha256": "1i7zgdh63q8m6267k51xn711vhjx5zyq2xgnfr7i38xczrw6rcsq", + "version": "2.36.2" }, "nomad": { "owner": "hashicorp", @@ -725,14 +725,13 @@ "version": "1.4.16" }, "ns1": { - "deleteVendor": true, "owner": "ns1-terraform", "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", - "rev": "v1.12.2", - "sha256": "01cmfmg429vp7j8xb9fvfvwg9l3pwjrpv9a4jbdbhh8gaarpw8db", - "vendorSha256": "0nk8xs24hwsarr22h5m1qcpixg7ijdkah5686wkp51y8cp69v25r", - "version": "1.12.2" + "rev": "v1.12.5", + "sha256": "0g69jr96ns2h578cmh5zz27m5dkgygrfr6shvx79wal26fpr8413", + "vendorSha256": "0s70626ng7pvqxnx0a4rp22b8spy45y011bvvm77fndm8fc1w9zn", + "version": "1.12.5" }, "nsxt": { "owner": "vmware", @@ -766,19 +765,19 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.60.0", - "sha256": "02wxisy2c9g6kkg6wrgv99qfrds26xwqfj2m3v97y0ldpi2fhbpa", + "rev": "v4.62.0", + "sha256": "1mnk1sk12jk9xsqfarfl0c33h176jhj7c8jdhxv2p8bf92c5jhfn", "vendorSha256": null, - "version": "4.60.0" + "version": "4.62.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.20.3", - "sha256": "0m9y0dagav1pw8cz6pv9zkhag59f9bbn8b6zi1h3lcgvmzf303wv", - "vendorSha256": "156nyjga5q5mgwiq6aynp199i0hn5mvckj2h7j3pfzc1yz8ri5cc", - "version": "3.20.3" + "rev": "v3.20.6", + "sha256": "0v6fmdkdc3bqvqb1jh1z75sk03qy7409anfd2xdxr5nfvmkd9jrr", + "vendorSha256": "1ybwn1v77kq93h9v8ymfmlf1lk4lm4yh9490js583v0kasnm2q5s", + "version": "3.20.6" }, "oktaasa": { "owner": "oktadeveloper", @@ -884,10 +883,10 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.14.0", - "sha256": "08z8i2y4qmq7zd50hjaiz6vazwb9yszm1c0mxc87sxayj0mcyl6r", - "vendorSha256": null, - "version": "1.14.0" + "rev": "v1.15.0", + "sha256": "04gm7y5qyvipg0a0glgyx257vjrkk4k5pjrvzik6adyrjyidixw1", + "vendorSha256": "0pp9c76zdpfyq57jcwv258gipvmy6hjqi933xdi155hkx45cnixr", + "version": "1.15.0" }, "powerdns": { "owner": "pan-net", @@ -929,19 +928,19 @@ "owner": "rundeck", "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.4.2", - "sha256": "0447hsmdf8k4464m56c7ipn9a05rv6hlrjb7q8b1jdwh2j5yq8pr", + "rev": "v0.4.3", + "sha256": "1bvk5mfjpl57dfglksnz1cnvd5qgk2cnidwiwjwa3ssmm2kzji8s", "vendorSha256": null, - "version": "0.4.2" + "version": "0.4.3" }, "scaleway": { "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.0", - "sha256": "1l9cmdz46rhvbnlyxi3hyk8rszf44xphpz22w56mrbi91z1yr8c1", - "vendorSha256": "0zbz0y3fg94c9794jgfcqngh1xcyqcdhcgmy74pdscrvydjhd5z8", - "version": "2.2.0" + "rev": "v2.2.1-rc.1", + "sha256": "0f4sizgcy3000k67nb3axa8xhpczvzdla3bnpda27jdrx22ckyz8", + "vendorSha256": "11g5v5kvs4qxdg34ai7fpinwbshrjwi9hxzav2vpnzhy8lfqpkzb", + "version": "2.2.1-rc.1" }, "secret": { "owner": "numtide", @@ -956,10 +955,10 @@ "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.7.1", - "sha256": "02sfzrs3k907djcyjz7qn42b21wccykw0fw65ms34h5vz5ld73mx", - "vendorSha256": null, - "version": "3.7.1" + "rev": "v3.8.0", + "sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n", + "vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf", + "version": "3.8.0" }, "sentry": { "owner": "jianyuan", @@ -983,10 +982,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.7.10", - "sha256": "113q9wwvz0lxn1l948g5mnwbpd76q8j2pm9q90nbkg1yvwsidsqi", - "vendorSha256": "1dd42a9kqsrvvllign6g9kzb0jvav71x7kg9n2w9rs9wvmmang4w", - "version": "6.7.10" + "rev": "v6.8.0", + "sha256": "1hd71ig9m5c2xfnkxqv6kr3jnnh53cz82cd9icx3391rlrswwcbm", + "vendorSha256": "1an1issc7yk9rnx7dl6n2pvnyjqakk1qfg4yz2yk29j1cbrcnjrs", + "version": "6.8.0" }, "skytap": { "owner": "skytap", @@ -1055,19 +1054,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.61.2", - "sha256": "1i9jyz4r344swdvnnpgz2s1ds5b5s2hif3bjr82mmfd7gshyagnq", + "rev": "v1.61.6", + "sha256": "10zx8gcvcadc184d3lfmx4ipi54z3a1xa48dki3wibwmvg5nw1mf", "vendorSha256": null, - "version": "1.61.2" + "version": "1.61.6" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.27.0", - "sha256": "00lra2d8dzczlmx74cblk7hglj2dvlkkgv30ndb85fbmaq2jqw0n", - "vendorSha256": "0p2kdf7l6k75c9ngfysj70fqf3my8fsm41gi8d1j1djfsxgzfpxs", - "version": "0.27.0" + "rev": "v0.28.1", + "sha256": "0xvah6qaf6kxgxhgzgh4rqswjda3366i6gqqwaiw4gc3w0ks2i3g", + "vendorSha256": "1qxbsnay75v6ss3fvi00rif10ra1l23b107d0v5cc1il4smqc36g", + "version": "0.28.1" }, "thunder": { "owner": "a10networks", @@ -1119,10 +1118,10 @@ "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.30.0", - "sha256": "1difp4nkyr8hp9l3ik5vdxl3kxiq9i342mmpc0j3drmr341djf1s", + "rev": "v1.31.0", + "sha256": "0maiqxrr1xl2q4lgpv0d78znsrrl95qi2bgpr5jd14w1kvw2bj73", "vendorSha256": null, - "version": "1.30.0" + "version": "1.31.0" }, "vault": { "owner": "hashicorp", @@ -1165,19 +1164,19 @@ "owner": "vpsfreecz", "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", "repo": "terraform-provider-vpsadmin", - "rev": "v0.2.0", - "sha256": "1jb5s8lv8az1az9an8kj8bi0hh71zcaw5mpa4zyba5xk1vqig0kv", - "vendorSha256": "1xnscd7yir736y913r7nvn3a78h8cwc7m206h0vcc0hrl1jvf45i", - "version": "0.2.0" + "rev": "v1.0.0", + "sha256": "1ci86ikdz8i6gwdiif4ayx15hjm9phr756rvywz8pblaa6niwl9h", + "vendorSha256": "1wc0kzinz39kv4gib438js2qv07ndm6yj2qpj041d75hnlq06drv", + "version": "1.0.0" }, "vra7": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", - "rev": "v3.0.3", - "sha256": "0f4mc7gbjbzw4x6rw6cbhc9xrmkhwhvjdzcinvc96pfm2fy3cdxh", + "rev": "v3.0.4", + "sha256": "1w16cl27fqpzy1v6cdp61shgrmj787fdfjwhr719n57hqax4pck5", "vendorSha256": null, - "version": "3.0.3" + "version": "3.0.4" }, "vsphere": { "owner": "hashicorp", @@ -1192,10 +1191,10 @@ "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.9.0", - "sha256": "0hx1n1wcjx40s94bysr14j0w4bc1xzkrrmkpjcwwbqywn75p6ggw", + "rev": "v2.9.1", + "sha256": "1w6699ngk6vcjii9skhrzv93p79mn6rmyqbb7fdchrwcvamk3y9a", "vendorSha256": null, - "version": "2.9.0" + "version": "2.9.1" }, "wavefront": { "owner": "vmware", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 46f0ce1be5..57e1ab32f0 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -18,5 +18,5 @@ echo "${providers}" for provider in ${providers}; do echo "Updating ${provider}" - ./update-provider "${provider}" + ./update-provider "$@" "${provider}" done 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 0cbb855da2..255e82aee1 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 @@ -11,7 +11,7 @@ shopt -s inherit_errexit show_usage() { cat </] +Usage: ./update-provider [--force] [--no-build] [/] Update a single provider in the providers.json inventory file. @@ -27,14 +27,14 @@ to add the provider to the list: Options: * --force: Force the update even if the version matches. - * --vendor: Switch from go package to go modules with vendor. + * --no-build: Don't build provider * --vendor-sha256 : Override the SHA256 or "null". DOC } force= provider= -vendor= +build=1 vendorSha256= while [[ $# -gt 0 ]]; do @@ -47,9 +47,8 @@ while [[ $# -gt 0 ]]; do force=1 shift ;; - --vendor) - force=1 - vendor=1 + --no-build) + build=0 shift ;; --vendor-sha256) @@ -142,12 +141,10 @@ update_attr rev "${rev}" sha256=$(prefetch_github "${org}" "${repo}" "${rev}") update_attr sha256 "${sha256}" -repo_root=$(git rev-parse --show-toplevel) - if [[ -z ${vendorSha256} ]]; then if [[ ${old_vendor_sha256} == null ]]; then vendorSha256=null - elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then + elif [[ -n ${old_vendor_sha256} ]]; then echo "=== Calculating vendorSha256 ===" vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") # Deal with nix unstable @@ -162,5 +159,7 @@ if [[ -n ${vendorSha256} ]]; then fi # Check that the provider builds -echo "=== Building terraform-providers.${provider_name} ===" -nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}" +if [[ ${build} == 1 ]]; then + echo "=== Building terraform-providers.${provider_name} ===" + nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}" +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 a5e92bedef..07302ddc1e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, buildEnv , buildGoModule , fetchFromGitHub , makeWrapper @@ -87,7 +86,26 @@ let withPlugins (x: newplugins x ++ actualPlugins); full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p)); - # Ouch + # Expose wrappers around the override* functions of the terraform + # derivation. + # + # Note that this does not behave as anyone would expect if plugins + # are specified. The overrides are not on the user-visible wrapper + # derivation but instead on the function application that eventually + # generates the wrapper. This means: + # + # 1. When using overrideAttrs, only `passthru` attributes will + # become visible on the wrapper derivation. Other overrides that + # modify the derivation *may* still have an effect, but it can be + # difficult to follow. + # + # 2. Other overrides may work if they modify the terraform + # derivation, or they may have no effect, depending on what + # exactly is being changed. + # + # 3. Specifying overrides on the wrapper is unsupported. + # + # See nixpkgs#158620 for details. overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins; overrideAttrs = f: @@ -102,12 +120,35 @@ let terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) else - lib.appendToName "with-plugins" (buildEnv { + lib.appendToName "with-plugins" (stdenv.mkDerivation { inherit (terraform) name meta; - paths = actualPlugins; nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - mkdir -p $out/bin + + # Expose the passthru set with the override functions + # defined above, as well as any passthru values already + # set on `terraform` at this point (relevant in case a + # user overrides attributes). + passthru = terraform.passthru // passthru; + + buildCommand = '' + # Create wrappers for terraform plugins because Terraform only + # walks inside of a tree of files. + for providerDir in ${toString actualPlugins} + do + for file in $(find $providerDir/libexec/terraform-providers -type f) + do + relFile=''${file#$providerDir/} + mkdir -p $out/$(dirname $relFile) + cat < $out/$relFile + #!${runtimeShell} + exec "$file" "$@" + WRAPPER + chmod +x $out/$relFile + done + done + + # Create a wrapper for terraform to point it to the plugins dir. + mkdir -p $out/bin/ makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" @@ -150,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.4"; - sha256 = "sha256-PzBdo4zqWB9ma+uYFGmZtJNCXlRnAHxQmzWxZFPzHH0="; - vendorSha256 = "sha256-Rk2hHtJfaS553MJIea6n51irMas3qcBrWAD+adzTi1Y="; + version = "1.1.5"; + sha256 = "sha256-zIerP8v6ovIx+xwLsSmMFH41l140W9IwQMvomb/pk8E="; + vendorSha256 = "sha256-4ctuErxZIaESfIkS7BXI+eQcdatXE/1p20P9f890twM="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 3753e9393c..92810bcad4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HUhV6FcLd75ZOPKw9Fl+7KUsSVG7HpQ6X2JZo9C9eeA="; + sha256 = "sha256-aGVhxyPm5GtYjJlFNiPNxkPtdGdOiYOSkRRTlzyF/lM="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; 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 dbdf06771b..4519d76762 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.23.4"; + version = "0.24.1"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SWofXsbkuirPvqgU639W8IQklafLKbThoZUzOzfYwdQ="; + sha256 = "sha256-lvls/2ukwcHSJCgZkumuFMtJTKOBl0CXijedjcGJePw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix index f8d4e5f52c..b41e443ba3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGo117Module rec { +buildGoModule rec { pname = "vcluster"; version = "0.5.3"; 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 fdc1648dbf..30966deb0c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.56"; + version = "1.2.65"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-6gDSH/YWkXeYyEwJDYNNCAWTBjwGx7kNcsCqmmwqJy0="; + sha256 = "sha256-uQO8zJ3+eAu/F5vmaGCd2qqwK8GRlensqypRlK6CXSk="; }; - vendorSha256 = "sha256-Cod7nFLu6au0uxrJLBf7SG1YBasRzmDjt+FmtZqMw3U="; + vendorSha256 = "sha256-dRevwdLiSsM2zzNQ913ytXf2XxZOfLWAUiJjk04mY28="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 92421b33a2..8b6a5e2cc2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.13.1"; + version = "3.14.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg="; + sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU="; }; - vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ="; + vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix index 8e4c85cebe..0a02c1db18 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-MLNgaxxvPGRzBEWRuKTDskl0J2IVushW11E5prpYsE4="; + vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g="; meta = with lib; { description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index d79356da83..6c3a9b7693 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.15"; + version = "3.2.18"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "0ygkygd0gcldwdx6wl1kbvzi93k75m0v05m614cahh0jc7j27xy7"; + sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix index ff620989f9..f024de8d55 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { --zsh <($out/bin/gmailctl completion zsh) ''; - vendorSha256 = "sha256-zEWEcv6G/9tmM6/+lhMFkyew3r/pvQRjvh74BENTYI4="; + vendorSha256 = "sha256-nAczO439tRiQU9f9LbJVENJiURVRnBAInwUp699RxOY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 97530b722f..ad57e2c662 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.25.0.78"; + version = "2.26.0.136"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-Xk9iU7mNm3YlXKsmf6yPqd1YAklsFOWu+04Llb+2yWQ="; + sha256 = "sha256-9QiE7CjCepDXQCzduqGzNUGqUgYS+PWBS71ouzHa83o="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix index fe7881de99..a82a3617dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -11,6 +11,7 @@ , evolution-data-server , feedbackd , glibmm +, gnome , gspell , gtk3 , json-glib @@ -27,14 +28,15 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; rev = "v${version}"; - sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d"; + fetchSubmodules = true; + hash = "sha256-8haVzRfAZwdTlYu7oKeu8E3uEH87yrHS4j+BWFQ/Nj0="; }; postPatch = '' @@ -55,6 +57,7 @@ stdenv.mkDerivation rec { evolution-data-server feedbackd glibmm + gnome.gnome-desktop gspell gtk3 json-glib diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index abcdf61735..7e2f242257 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -23,5 +23,6 @@ buildGoPackage rec { homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; + broken = true; #fails to build with go >= 1.16 }; } 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 2f58ec414a..0672cb7242 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 @@ -7,11 +7,16 @@ let canary = "0.0.132"; } else { stable = "0.0.264"; - ptb = "0.0.58"; + ptb = "0.0.59"; canary = "0.0.280"; }; version = versions.${branch}; - srcs = { + srcs = let + darwin-ptb = fetchurl { + url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; + }; + in { x86_64-linux = { stable = fetchurl { url = @@ -34,11 +39,7 @@ let url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p"; }; - ptb = fetchurl { - url = - "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; - }; + ptb = darwin-ptb; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; @@ -46,13 +47,7 @@ let }; }; # Only PTB bundles a MachO Universal binary with ARM support. - aarch64-darwin = { - ptb = fetchurl { - url = - "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; - }; - }; + aarch64-darwin = { ptb = darwin-ptb; }; }; src = srcs.${stdenv.hostPlatform.system}.${branch}; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index c091a882d7..90a0823667 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.9", + "version": "1.10.1", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -61,18 +61,19 @@ "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "13.5", + "electron": "^15.3.5", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", "electron-notarize": "^1.0.0", "eslint": "7.18.0", "eslint-config-google": "^0.14.0", - "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-matrix-org": "^0.4.0", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-web-i18n": "github:matrix-org/matrix-web-i18n", + "matrix-web-i18n": "^1.2.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json index 25e335decc..05e20b01d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.9", - "desktopSrcHash": "IMqco5HeAgsh1LMBXFH1/HnlIEFEQU0xqnHbTKwHGL4=", - "desktopYarnHash": "0zzr14fcyc5q2562x50nvxxda10yr5ihbr12nykzg4j534rgb55y", - "webHash": "1i3zka9cfn14rv5wzz969w6dz5dbkw87clrgajs8p1s2l62ac1jf" + "version": "1.10.1", + "desktopSrcHash": "cA+yXVkfizVRbbykFRhNIbdaGLuEk2IuKFO8YJt78Q4=", + "desktopYarnHash": "0kz6vkfxxk4sbr9zpaig1lhsbwj4f57v4f4pr373xxsnk1wagkfn", + "webHash": "1g5hw39fr7adazmafpxivfxv28nzcv99r8sihga1j91avf6lxkim" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix index a324d061aa..f39b731132 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -7,7 +7,7 @@ , autoreconfHook , pkg-config , perl # for pod2man -, ffmpeg +, ffmpeg_4 , pjsip , alsa-lib , asio @@ -39,7 +39,7 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); - ffmpeg-jami = ffmpeg.overrideAttrs (old: + ffmpeg-jami = ffmpeg_4.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/ffmpeg/"; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7bd27285fd..2395a196f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.11"; + version = "2022.1.1"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-DznbSwA1UISw3EkIfM5hGgmIToeXsH1b1HB7UOgDTKU="; + sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l"; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 874fbd6375..6f53fe2b3a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,105 +1,91 @@ -{ lib, stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, -freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, -libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, -libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, -hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk, libappindicator-gtk3 }: +{ lib +, stdenv +, fetchurl +, atomEnv +, systemd +, pulseaudio +, libxshmfence +, libnotify +, libappindicator-gtk3 +, wrapGAppsHook +, autoPatchelfHook +}: let - rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk3 - pango - libappindicator-gtk3 - libuuid - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - nss - stdenv.cc.cc - udev - xorg.libxcb - ]; + + pname = "mattermost-desktop"; + version = "5.0.3"; + + srcs = { + "x86_64-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; + hash = "sha256-KLSWJpNSMGmfugbkFIJLDnxcZtrtBZOGjLlR+kAoMTA="; + }; + + "i686-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; + hash = "sha256-4ofjOsfGbgO1PSqQpigNp90JsvlGP1kGexVAR/h3/88="; + }; + }; + + inherit (stdenv.hostPlatform) system; in - stdenv.mkDerivation rec { - pname = "mattermost-desktop"; - version = "4.6.2"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "0i836bc0gx375a9fm2cdxg84k03zhpx1z6jqxndf2m8pkfsblc3x"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - sha256 = "04jv9hkmkh0jipv0fjdprnp5kmkjvf3c0fah6ysi21wmnmp5ab3m"; - } - else - throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; +stdenv.mkDerivation { + inherit pname version; - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; + src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); - nativeBuildInputs = [ wrapGAppsHook ]; + dontBuild = true; + dontConfigure = true; + dontStrip = true; - buildInputs = [ gtk3 hicolor-icon-theme ]; + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ]; - installPhase = '' - runHook preInstall + buildInputs = atomEnv.packages ++ [ + libxshmfence + ]; - mkdir -p $out/share/mattermost-desktop - cp -R . $out/share/mattermost-desktop + runtimeDependencies = [ + (lib.getLib systemd) + pulseaudio + libnotify + libappindicator-gtk3 + ]; - mkdir -p "$out/bin" - ln -s $out/share/mattermost-desktop/mattermost-desktop \ - $out/bin/mattermost-desktop + installPhase = '' + runHook preInstall - patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh - $out/share/mattermost-desktop/create_desktop_file.sh - rm $out/share/mattermost-desktop/create_desktop_file.sh - mkdir -p $out/share/applications - mv Mattermost.desktop $out/share/applications/Mattermost.desktop - substituteInPlace \ - $out/share/applications/Mattermost.desktop \ - --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + # Mattermost tarball comes with executable bit set for everything. + # We’ll apply it only to files that need it. + find . -type f -print0 | xargs -0 chmod -x + find . -type f \( -name '*.so.*' -o -name '*.s[oh]' \) -print0 | xargs -0 chmod +x + chmod +x mattermost-desktop chrome-sandbox - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/share/mattermost-desktop" \ - $out/share/mattermost-desktop/mattermost-desktop + mkdir -p $out/share/mattermost-desktop + cp -R . $out/share/mattermost-desktop - runHook postInstall - ''; + mkdir -p "$out/bin" + ln -s $out/share/mattermost-desktop/mattermost-desktop $out/bin/mattermost-desktop - meta = with lib; { - description = "Mattermost Desktop client"; - homepage = "https://about.mattermost.com/"; - license = licenses.asl20; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ maintainers.joko ]; - }; - } + patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh + $out/share/mattermost-desktop/create_desktop_file.sh + rm $out/share/mattermost-desktop/create_desktop_file.sh + mkdir -p $out/share/applications + chmod -x Mattermost.desktop + mv Mattermost.desktop $out/share/applications/Mattermost.desktop + substituteInPlace $out/share/applications/Mattermost.desktop \ + --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + + runHook postInstall + ''; + + meta = with lib; { + description = "Mattermost Desktop client"; + homepage = "https://about.mattermost.com/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.joko ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index ca6da2100b..b5c558e770 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.7.6"; + version = "3.7.7"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "sha256-lOiYj0eC/Mw2icdizK7wvBG2xuIBRkCF0aBJ24qzyK8="; + sha256 = "sha256-WTsiNZ5XANdRQyJX4n8VL66JzyF8QyRWu2ctsV4TxuY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 30ca1e9f47..aceeec448f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.7-sc.1", - "srcHash": "0qrjjwcxa141phsgdz325rrkfmjqdmxc3h917cs9c9kf6cblkxaq", - "webYarnHash": "19c594pql2yz1z15phfdlkwcvrcbm8k058fcq7p0k6840dhif5fd", - "desktopYarnHash": "058ihkljb1swjzvgf8gqci5ghvwapmpcf2bsab3yr66lhps7fhci" + "version": "1.9.8-sc.1", + "srcHash": "1ki4ccsa2i0mv10ypxg6bx9njikipdqkc5bsq5h7bi86scjm4lni", + "webYarnHash": "1za6r0snrflh2605xw4m19p88chx19ip8jj592bqjdagildqm50l", + "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18" } 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 7489e765ac..8ed3166871 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 @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.29.1"; # Please backport all updates to the stable channel. + version = "5.30.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1a56mnmv0lnizmd4dl8fya3mdsy0jy5qr5bqb72m9cipq0069alc"; + sha256 = "sha256-+e3QzV4WIBOSGkpy6uk6vzIcNB5NpqQ05ZZfaoi58IU="; }; nativeBuildInputs = [ 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 2ba8fcf579..493f38c585 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,39 +45,38 @@ let pname = "slack"; - x86_64-darwin-version = "4.22.0"; - x86_64-darwin-sha256 = "094p9vyv56m5qfp9jh2205ijfqcp0dr6bkmiv0wxihy2rg20b5zp"; + x86_64-darwin-version = "4.23.0"; + x86_64-darwin-sha256 = "0l4zfyys0yf95dn0sldyjkhzp7bpn84z9q9li1lvv5jj55f0g9jd"; - x86_64-linux-version = "4.22.0"; - x86_64-linux-sha256 = "0k84glxp653lxgfv5b65zvvysax7fr3lhsjgq76safk7g7cjc86i"; + x86_64-linux-version = "4.23.0"; + x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is"; - aarch64-darwin-version = "4.22.0"; - aarch64-darwin-sha256 = "1z2pcgva9ixjx702c1535b4k0xr9fdnfzi5m08xgvabk9x66hqx4"; + aarch64-darwin-version = "4.23.0"; + aarch64-darwin-sha256 = "053psiqysyi7l8pviq0vwvk2azlxcpdrwfa0b99f1h6lbfcf48f3"; version = { x86_64-darwin = x86_64-darwin-version; - aarch64-darwin = aarch64-darwin-version; x86_64-linux = x86_64-linux-version; + aarch64-darwin = aarch64-darwin-version; }.${system} or throwSystem; - src = - let - base = "https://downloads.slack-edge.com"; - in - { - x86_64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = x86_64-darwin-sha256; - }; - aarch64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; - sha256 = aarch64-darwin-sha256; - }; - x86_64-linux = fetchurl { - url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; - sha256 = x86_64-linux-sha256; - }; - }.${system} or throwSystem; + + src = let + base = "https://downloads.slack-edge.com"; + in { + x86_64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; + sha256 = x86_64-darwin-sha256; + }; + x86_64-linux = fetchurl { + url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; + sha256 = x86_64-linux-sha256; + }; + aarch64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; + sha256 = aarch64-darwin-sha256; + }; + }.${system} or throwSystem; meta = with lib; { description = "Desktop client for Slack"; @@ -195,7 +194,10 @@ let runHook preInstall mkdir -p $out/Applications/Slack.app cp -R . $out/Applications/Slack.app - /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES + '' + lib.optionalString (!stdenv.isAarch64) '' + # on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting + /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES + '' + '' runHook postInstall ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh index 0bb0d78416..688fe579f8 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -16,21 +16,28 @@ nixpkgs="$(git rev-parse --show-toplevel)" slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') +nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') -if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then +if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \ + "$nixpkgs_mac_version" == "$latest_mac_version" && \ + "$nixpkgs_mac_arm_version" == "$latest_mac_version" ]]; then echo "nixpkgs versions are all up to date!" exit 0 fi -linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb" mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" +mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg" linux_sha256=$(nix-prefetch-url ${linux_url}) mac_sha256=$(nix-prefetch-url ${mac_url}) +mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url}) sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix" sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" +sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix" sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" +sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix" if ! nix-build -A slack "$nixpkgs"; then echo "The updated slack failed to build." 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 52935267cf..84310498ee 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 @@ -14,109 +14,150 @@ , xdg-utils , systemd , nodePackages -, enableRectOverlay ? false }: +, xar +, cpio +, makeWrapper +, enableRectOverlay ? false +}: -stdenv.mkDerivation rec { +let pname = "teams"; version = "1.4.00.26453"; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf"; - }; - - nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; - - unpackCmd = "dpkg -x $curSrc ."; - - buildInputs = atomEnv.packages ++ [ - libuuid - at-spi2-atk - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libappindicator-gtk3 - ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") - gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) - gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) - ''; - - - buildPhase = '' - runHook preBuild - - asar extract share/teams/resources/app.asar "$TMP/work" - substituteInPlace $TMP/work/main.bundle.js \ - --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ - --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ - --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. - asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar - - runHook postBuild - ''; - - preferLocalBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{opt,bin} - - mv share/teams $out/opt/ - mv share $out/share - - substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ "" - - ln -s $out/opt/teams/teams $out/bin/ - - ${lib.optionalString (!enableRectOverlay) '' - # Work-around screen sharing bug - # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html - rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay - ''} - - runHook postInstall - ''; - - dontAutoPatchelf = true; - - # Includes runtimeDependencies in the RPATH of the included Node modules - # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated - # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) - # instead of EXEC or INTERP it expects. - # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 - postFixup = '' - autoPatchelf "$out" - - runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" - - for mod in $(find "$out/opt/teams" -name '*.node'); do - mod_rpath="$(patchelf --print-rpath "$mod")" - - echo "Adding runtime dependencies to RPATH of Node module $mod" - patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" - done; - - # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue - # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning - substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' - ''; - meta = with lib; { description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; downloadPage = "https://teams.microsoft.com/downloads"; license = licenses.unfree; - maintainers = [ maintainers.liff ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ liff tricktron ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + + src = fetchurl { + url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; + sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf"; + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; + + unpackCmd = "dpkg -x $curSrc ."; + + buildInputs = atomEnv.packages ++ [ + libuuid + at-spi2-atk + ]; + + runtimeDependencies = [ + (lib.getLib systemd) + pulseaudio + libappindicator-gtk3 + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") + gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) + gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) + ''; + + + buildPhase = '' + runHook preBuild + + asar extract share/teams/resources/app.asar "$TMP/work" + substituteInPlace $TMP/work/main.bundle.js \ + --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ + --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ + --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. + asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar + + runHook postBuild + ''; + + preferLocalBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{opt,bin} + + mv share/teams $out/opt/ + mv share $out/share + + substituteInPlace $out/share/applications/teams.desktop \ + --replace /usr/bin/ "" + + ln -s $out/opt/teams/teams $out/bin/ + + ${lib.optionalString (!enableRectOverlay) '' + # Work-around screen sharing bug + # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html + rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay + ''} + + runHook postInstall + ''; + + dontAutoPatchelf = true; + + # Includes runtimeDependencies in the RPATH of the included Node modules + # so that dynamic loading works. We cannot use directly runtimeDependencies + # here, since the libraries from runtimeDependencies are not propagated + # to the dynamically loadable node modules because of a condition in + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # instead of EXEC or INTERP it expects. + # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 + postFixup = '' + autoPatchelf "$out" + + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + + for mod in $(find "$out/opt/teams" -name '*.node'); do + mod_rpath="$(patchelf --print-rpath "$mod")" + + echo "Adding runtime dependencies to RPATH of Node module $mod" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + + # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 + # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue + # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning + substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' + ''; + }; + + appName = "Teams.app"; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg"; + sha256 = "1mg6a3b3954w4xy5rlcrwxczymygl61dv2rxqp45sjcsh3hp39q0"; + }; + + buildInputs = [ xar cpio makeWrapper ]; + + unpackPhase = '' + xar -xf $src + zcat < Teams_osx_app.pkg/Payload | cpio -i + ''; + + sourceRoot = "Microsoft\ Teams.app"; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appName},bin} + cp -R . $out/Applications/${appName} + makeWrapper $out/Applications/${appName}/Contents/MacOS/Teams $out/bin/teams + runHook postInstall + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 614183b72d..aff74a174b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf +, libjpeg, openssl, libopus, ffmpeg_4, alsa-lib, libpulseaudio, protobuf , xorg, libXtst }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf + libjpeg openssl libopus ffmpeg_4 alsa-lib libpulseaudio protobuf xorg.libX11 libXtst ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c58ade82d3..9a34513aca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -189,6 +189,6 @@ env.mkDerivation rec { platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ oxalica vanilla ]; + maintainers = with maintainers; [ oxalica ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 7a4fc703dd..8dbd2cd73e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }: stdenv.mkDerivation rec { pname = "irssi"; version = "1.2.3"; - src = fetchurl { - url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "09cwz5ff1i5lp35qhhmw6kbw5dwcn9pl16gpzkc92xg5sx3bgjr9"; + + src = fetchFromGitHub { + "owner" = "irssi"; + "repo" = "irssi"; + "rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65"; + "sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg="; + "leaveDotGit" = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool git ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; + enableParallelBuilding = true; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--with-proxy" "--with-bot" diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix index df59ddec6a..a3ee4e4ab9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - tar xf ${irssi.src} + cp -a "${irssi.src}" "./${irssi.name}" configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}" ./regen.sh diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch deleted file mode 100644 index 6c40dc8dd8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ac9387271b2420a71f7d172f44354fc35adac504 Mon Sep 17 00:00:00 2001 -From: Manuel Nickschas -Date: Tue, 7 Jan 2020 18:34:54 +0100 -Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 - -Starting from version 5.14, Qt provides stream operators for enum -types, which collide with the ones we ship in types.h. Disable -Quassel's stream operators when compiling against Qt 5.14 or later. - -(cherry-picked from 579e559a6322209df7cd51c34801fecff5fe734b) ---- - src/common/types.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/common/types.h b/src/common/types.h -index 467d9fb2..c4b9f364 100644 ---- a/src/common/types.h -+++ b/src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList MsgIdList; - typedef QList BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast(v); - return in; - } -+#endif - - // Exceptions - --- -2.26.2 - diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix index 44e7fb8536..d218f11414 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , static ? false # link statically , lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, mkDerivation, qtbase, qtscript +, mkDerivation, qtbase, boost, zlib, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -33,27 +33,21 @@ let in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { pname = "quassel${tag}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "quassel"; repo = "quassel"; rev = version; - sha256 = "0z8p7iv90yrrjbh31cyxhpr6hsynfmi23rlayn7p2f6ki5az7yc3"; + sha256 = "sha256-eulhNcyCmy9ryietOhT2yVJeJH+MMZRbTUo2XuTy9qU="; }; - patches = [ - # fixes build with Qt 5.14 - # source: https://github.com/quassel/quassel/pull/518/commits/8a46d983fc99204711cdff1e4c542e272fef45b9 - ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch - ]; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ qtbase ] - ++ lib.optionals buildCore [qtscript qca-qt5] + buildInputs = [ qtbase boost zlib ] + ++ lib.optionals buildCore [qtscript qca-qt5 ] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ extra-cmake-modules kconfigwidgets kcoreaddons diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index 244e489393..172cea3d06 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-3BbKf2xSzXznCB5UU/cThVg329GSeJG9KwjaS+tN3Rs="; + vendorSha256 = "sha256-hpGd78PWk3tIwB+TPmPy0gKkU8+t5NTm9RzPuLae+Fk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix index b2ec2a743f..c039febb6d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; }; - vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7"; + vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci"; doCheck = false; 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 33c1cc63a7..d074a4c626 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BmV4kekl0QDbX/ueSrWM5jRvqr6WQeZIs7hiXhiHBSI="; + sha256 = "sha256-giEcVyhreD36SgW5rQsKRjgHHAE022Lffmo0QGy/EkI="; }; - cargoSha256 = "sha256-lu5xVuAw9yTeQr3gpiW5g5bdm7Alf0YXmlbSkPaXhk0="; + cargoSha256 = "sha256-Sf4Ze9T8A6n/iuFtQAfW+ORIw2atMt8MgEmpDllnZp8="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 893473ff15..494f371016 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.5.0"; + version = "91.5.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/af/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/af/thunderbird-91.5.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "20272a9fbf08651ca804f324aca1c0c7b6b04351b0a773790510a69d56ef19fb"; + sha256 = "90a7b62161c8e4bd0dfcb0c69995e80b1733b86513d5786559eefd0ee19ca6ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ar/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ar/thunderbird-91.5.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "208937e2b22db6a159b2c744d9ad6d9e96fddf21f753673d9006b2576e5ddd24"; + sha256 = "f7167cdff08c42f0a067e8631f8ae85ea12f301a7d49ba8919fa90cdf5ac1aaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ast/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ast/thunderbird-91.5.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a8b078c5699d174db89c4adbcce45c4add38d88561d1154dcaff56be4731b29d"; + sha256 = "74ffcdac8a170ba700d2c58066c66143129a7f21f8123c174dfd598240f2271d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/be/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/be/thunderbird-91.5.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "91be973a0658dc7a284cde429b537bc70db88143abe42fd6ce6c4a0a450353ca"; + sha256 = "aabe3dce7ddcfcaad6212549f7ce709c6832c01aa7cfaa15fad82d75259fa8ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/bg/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/bg/thunderbird-91.5.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "bdb25d9c1e3ed725d667b9b613a425a3f1c18bd6ff78417a32f04fc6257c7b66"; + sha256 = "f0fa8e63643e1a44ab6997caf148812e749004a450825b0b77f1ac0cc52c6ec3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/br/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/br/thunderbird-91.5.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b8cf6f6f490a3f7a06a036bf84d71cdcdfb21e4e253190d2c8c648df8f7af931"; + sha256 = "8391eb495214140878bba1f658cb1dbab4a93187f32bb99e65613b09db70269c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ca/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ca/thunderbird-91.5.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5a55055b5eb29e209e02b2980895719883bfc9929910d0f336e431ebea870856"; + sha256 = "82b1498ee1745b087b58f44ca57f1d355b61aa42ec2787302e6a59dfb5391a3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cak/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cak/thunderbird-91.5.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fe192c81dd6f04d37c4f603c3e0367d462c5dc6effe7c8a07a030d5584118c58"; + sha256 = "52761eec2ef3327ea5f435bfcb73dd4a5c378e78d57f9849283460ed39318af8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cs/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cs/thunderbird-91.5.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "bce9c7bd093631e2f0096ac3c8c2cdb19d9567d5233d912169c238e33372da1e"; + sha256 = "406bff52470379be7d6b8315909067e1a1f7623a7d4415a23b6f53ea4f896064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cy/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cy/thunderbird-91.5.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4128f704289b9267316eb373a3142305096897b37a2daa79a84f4448aea54b14"; + sha256 = "4fa869d8592709da2ddba8657424475377aea9617ad411abb25c8ae8e55612fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/da/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/da/thunderbird-91.5.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "39e5239860b450079cc10179e215bef63d77957c47bc3690c16c086a30e01317"; + sha256 = "1ed471dab670fe7ba58ccb4fe39bec2f3ee6625a6713c3b1f3fe9703e0a703cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/de/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/de/thunderbird-91.5.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0bc2cabac439734fdddfcfc1426696559ac1ee3e9a7bad1182329d83fb47d8cb"; + sha256 = "16b6e291489f37699587b62cafb3caa3e09ae21b160c9739afb35ae450dcffbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/dsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/dsb/thunderbird-91.5.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2c4d8fc6ae4c9a2adabe0a1593d7289596b97dd7b9e39b44da926f925f754ef2"; + sha256 = "3872f1263a7ba9f6a31f1fcd26440ab3ec231efca678cd75459bd71a4b0637f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/el/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/el/thunderbird-91.5.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "07e10b923d0829e6cddc35bd56fe51afd07b35664b4feb725dfedbd51e99029a"; + sha256 = "aaab178dc1f6d9f1818f63b98091113546bdf36e823efc0c252979b570406ef0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-CA/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-CA/thunderbird-91.5.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7f583ea36dc9d8a1a2136343773a8e7434d466f31ddf50f5f7da7675a08dbd03"; + sha256 = "d2e98a42a5de6793f34725f989b645a0531dfca95e014e58bcb951fd5a4f9681"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-GB/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-GB/thunderbird-91.5.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "46bd4e13d215bd9be875ebe3f999da3927a480401aa4a2e51f0388d3cf28a3a0"; + sha256 = "4459fb379c2299be6915a5a54ad6963dbd80dd5a9838baf1d2edcf63ef0354bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-US/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-US/thunderbird-91.5.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f6d62b3161d1b7cf665fdb965526632fc4eefcaf1727ece7986e956c7575cf0d"; + sha256 = "a88c57cb36623d18a53c1940ccfa5874c222b6a2e44aab7760ccd6c70518f748"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-AR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-AR/thunderbird-91.5.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4f190b4d64db8fe9accafe1941e3f949ba21488b4411a506f6f61d437f17d61e"; + sha256 = "979514cb958a4626d07379099c3fc77ed4208cecd3b0af9c059a04064e60df43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-ES/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-ES/thunderbird-91.5.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "61065d0c72451cebbf5d83c92e460e240e7f477322531a3f4d082b3c0e6c213e"; + sha256 = "745d0865606c238512e01e414305f83664b1395ff9d02b36f9df37b1bcca0e2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/et/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/et/thunderbird-91.5.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cba4afe259ccd7c6619f4ee0adf167659eb4f80e9355b25138d9f370ecbcf932"; + sha256 = "1a009c0ec4ad94819de0eb006c6f0919080271e8d5c6c5b324c6624657ef8440"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/eu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/eu/thunderbird-91.5.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4e8569190b2702ad6e10156b434100cdf879dfb3a5ee798c876fc46871e1abf3"; + sha256 = "3beab0dd08c2089dabf99d246d9a06bb0339b88945e012fadc53a9420b105eb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fi/thunderbird-91.5.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "93e3b7624d6de0b77f87bb192384437e006530abd03bdc5589dc0dc47e0af304"; + sha256 = "d0006d6b5a2fdeb69171452c9eee4f7e54d18cf0a42bbccc056144af127109c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fr/thunderbird-91.5.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a35c370b69a977160a83ffc4d24f5a9a9f1000e1012c71fcd1e7adc6c16c68b8"; + sha256 = "4345711b2199bd5f0cc89e34cd7a65bb22290268c872c990fb32ee49c174d58e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fy-NL/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fy-NL/thunderbird-91.5.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c392fb2f59d13f912e757be716a4bfc464a0cb2f69f8af780bbaec8e6bbcdf0f"; + sha256 = "7f90afe3e04e1a7db5236d12d2133c3552e0d6744262f5107522dc1b88b9d26d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ga-IE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ga-IE/thunderbird-91.5.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "210aeb0fe2c3214f82948ef39205416e4c50750be0226fa56b2c5548ed06a182"; + sha256 = "ecf987ec7a479fcd1aeec4a680fe7b785f3273914be7bc5ea34a1160024bca30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gd/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gd/thunderbird-91.5.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c02818558da950caa540cc73597bb2ba1cbfcf02240b085856776df5155b59eb"; + sha256 = "e688777e2ca5a0964bdb295c17de71f0b3e7ce8ed3a81a027cb58d65f0b13843"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gl/thunderbird-91.5.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5704fa5d4efb470e516c23a6f15d238ebaeaa7ad1ce14f49b7a5a3bd19524f92"; + sha256 = "b7e37320a6f29312851d814713522c0edaf3ad10bb6096e08e60ad9d6eae3c34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/he/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/he/thunderbird-91.5.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c366556e481757da8f48b89f1ef54492e5d5e41a45d9ec55f5e81081de4d8b58"; + sha256 = "9e317e22ca0e8e6d809437efee263fb3e0b6418696282f8670b7f8f92ec6c56a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hr/thunderbird-91.5.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "47a713172ea17582ec988fdef33cab24f3245274badefbefee7f665af7e9e917"; + sha256 = "51f6eec36a08b766bc9567ae7dbac5b015890c0792dd4a37f9654345bd34f9be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hsb/thunderbird-91.5.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "019271fd8d9343581783dcd6a59698de726fdeca39e4e71226b7361a42e7478b"; + sha256 = "1f91258f84978b313d2ced008ef0e760e5e425dde3116d1e6adfd7d87895a043"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hu/thunderbird-91.5.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bbdd56ba0a2f1079d2dfe63f2cbf56dc98f5f0675c73413880aba147d797d1c2"; + sha256 = "d5665c6b1415493f18085c1606b12e4ff52f02ac9d932f5e14c6794685b7c68e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hy-AM/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hy-AM/thunderbird-91.5.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8393fdba3c2d7024c1ad5d017853c1a13fec47a29e31db4ba0f38c5ee49843ec"; + sha256 = "2100b04070066d8ce65d7bb3bf25d4f3dcdec4c14dce3f9c5455923de84e6c84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/id/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/id/thunderbird-91.5.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "51ff83923eda81e69d5c74bd49878c17eb3552072b196e2fc933b3dbf89a7513"; + sha256 = "7e9e2f1d5ee6db5f72a46a5345c6d4bd4e6cfa76c2637609dab0e415b93e1975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/is/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/is/thunderbird-91.5.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9f6bdf8f9a97788137e698464e391f6942e3cbff5870e8b4f534597f0b582f5d"; + sha256 = "089acd20ab3894dc04ecec3cb85317d40ff9f86a2fef381429f06a70b92f4785"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/it/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/it/thunderbird-91.5.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "33b0169fec2ba8822c086837fce0ed59d77676f6fe804948dfd0ad0c328e1cc7"; + sha256 = "22efeb3bdf740d1b0dfe1850589403758fea11b443ad6099c630e7cab866fbe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ja/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ja/thunderbird-91.5.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "bf93f1e234aa13edb416912377a23ffb370de5a249cc66ec13587632493f0efc"; + sha256 = "5e950fb7dae9573d877b783eb12f36cb801f0299fe360e2538aab9a86ffb5911"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ka/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ka/thunderbird-91.5.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "dee6e5c984c0dafa66476bd4342385beedeb826a947991b2b4bc3a0e1d7bafd4"; + sha256 = "24cb7fb080728903c118a31e56a7d1e02e554b2a03ca272ee0e8f14d58e1b1cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kab/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kab/thunderbird-91.5.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fcf175d175327f8a6c76d0e81062a967813f486e8005aafa7998fa682542e5db"; + sha256 = "0bfd4b98c2659b7541cdaf2fe4be33f71463d6eaeb14b5722f2916abe82411d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kk/thunderbird-91.5.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "22e2bff84795a512eaa486acb11440afa51afddd5feb6828c025bfdd796cc5e8"; + sha256 = "62d530819b0bc304416db7e470a8856afb8d41813165a8b3ebc417957d5447fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ko/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ko/thunderbird-91.5.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a3c8fb1b1cfc7e68ad177fce78a8751c86cb4d95965d05abeff384c19f470bce"; + sha256 = "f081bbe2756b4ea78dbbe1a18377eb64ac729329a5bf2c97489dfb03ab1c2949"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lt/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lt/thunderbird-91.5.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "5aaa95d61662a69d3d92cad9d5cbf24a348a7c6d7db1440412a324799167bd7d"; + sha256 = "26f2cca527fee03e4b7747dceaa0ce1ee0c3f6efb2adc670ec6c1f19d2118d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lv/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lv/thunderbird-91.5.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec61d867216b50649e2900e8922603f38ebd4c67596b29984c60c1933f1f00a6"; + sha256 = "f39fb8ddd6e246643750c5f23fa1d5993437c78f4062acc4c3db22d8b1dc3b56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ms/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ms/thunderbird-91.5.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "27bf8b301dc1c05a22c413559f833d522fb42934c136be126de90d3519df7c1d"; + sha256 = "07835a7669f3595f20d7d41db4e799c968d30166f0db764d47b2fb1a8d8e6f0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nb-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nb-NO/thunderbird-91.5.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "587b27872162ac8e7580183b362192f7c2439a4a7a783aa4fc6ae81e87e7b4bd"; + sha256 = "2dda693d9dcd5602cdde27d54871cf5b2b06afceaa0133a77632637a81a4bd69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nl/thunderbird-91.5.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "be970367d664bcc2a5e6a0805d0b63fc991221c41497ccfa1a1ce5102b20450a"; + sha256 = "05a884da304dd5c8692ced6b5d974f14e1b0007ae683f3511285b7432828b71c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nn-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nn-NO/thunderbird-91.5.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "92e168f3db1bef0c2fd33dd8da8f2ba8732e63c1b36aeb0e01f3478e67dafba2"; + sha256 = "8250f8d18feb596ed758b07933d590d7f3de016c5ce08eedb6024a4d116acb63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pa-IN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pa-IN/thunderbird-91.5.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "485d231b5153fde23d9a35154c713b97dbcf96a8f1058399b09796210c831391"; + sha256 = "5a510109f30fed267a61d8586714e2554b74866de8b1948c80a39ad7db42e460"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pl/thunderbird-91.5.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "112240a352a3d833de9df127ab0118841b88e67c4496a17c8cc63abbd19f1166"; + sha256 = "d3fad496d1aac376fe9557ba039a916a7527a1a120e102724fd35c469adeb8eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-BR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-BR/thunderbird-91.5.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7388f54dc99de6498af19f0a6e7b80bf2c7465c68d94c4e04ca5038a2e087960"; + sha256 = "bfd0685dae994a75a284220358b1ebf4d0a71d151b2b674215b5d1c4566784de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-PT/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-PT/thunderbird-91.5.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1ca7c9a460e8603d0daadbc07fd12fe6d0d07ef288144ba5da389fdbb5ccf4e2"; + sha256 = "d4cded9e8e065c312573931b4e60a5a62a154763fdf859a5fc53d120209520f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/rm/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/rm/thunderbird-91.5.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "954516da6b44ad4dfc56f3b837e45bc0816498fe426ae3aa4d3363621cb2c289"; + sha256 = "5761e7778adc41e69351c49db232792096a3d69994f79ce556cd4dbb1a356530"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ro/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ro/thunderbird-91.5.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e5d83482c7381d89445d49b5c85b5645533dae173010f2ebfcf706c01337f4e2"; + sha256 = "63bd9a8c5035d8964e609159d301ca52e68fef0f136ad378a8016fd1dc7a1ea4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ru/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ru/thunderbird-91.5.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "51db5bfaca6c9404eddb71cc6559c7c83534fbe57bf27da14c35b4b268cdfc98"; + sha256 = "a0d3731c3a6f207e8549d3d5e2e143c0b4620eda6902e9636d8c37558a78d09e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sk/thunderbird-91.5.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5803d8547bddaffa6a9532eb6abd2f66f6936c6614a1c322a8065a01e6c831c9"; + sha256 = "22635dd9abad4690c52932afd8b9b8cdad03270ef87c18ae3061308c62932064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sl/thunderbird-91.5.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2837b957b89184978c0ead48e7a2d58a7ee140ed280be8d744fac929d66cfd0a"; + sha256 = "e2c395a8483115801b34c8de7a34bea1ce219e1cd0012c7d27af4b11e11577f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sq/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sq/thunderbird-91.5.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fd98ce5bb9bccfc8c9ae022cdf0416848e3564b59ccaf3ce8888eb7d4d02f0ce"; + sha256 = "aeb72ddfb97fa6fad9f4295f00bd01eccc78f919c34b899925383d7877d10454"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sr/thunderbird-91.5.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d9c1ec7df7e66e1b4e28a68c9ed74e8ea17a166dee2d2aaf7c9be616bfde97a0"; + sha256 = "ce9b6671b7d138bbad4ccb4a2dd660d8f2ba452f5f331dc8b630005e4a64ff91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sv-SE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sv-SE/thunderbird-91.5.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e9e8ea82bf5fdb900c36ef22afda90d518ac52a4fadff5a3f1afbb09b4d1ebe4"; + sha256 = "59bdd6acf2aecdddb2f31a0e6305ac5eb59d8d8c3ffd6fbaded92d97a8deff4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/th/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/th/thunderbird-91.5.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4a58f3d88283cbe83bc6f9ff26c5b621bde3a52a8e5cda283f9bac6fa329e2a1"; + sha256 = "62c76e4291580ec271f36737cb6dd621c6e30ddf02a070b008d312afed0cc727"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/tr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/tr/thunderbird-91.5.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "489e5d4448c25310ae14c6a74405d582b50113a73c394aa51776c2c3b37104ec"; + sha256 = "4c59cb186ea76ee79b123d29e3cc8a9c75e58a5f8c46e3b71a7a0b1937d99e42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uk/thunderbird-91.5.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cefeaf9df2e5fab13cf131d597393b83c1101d83b6dda04207c4428abbb62d15"; + sha256 = "19df95c2001aee2a6ed00df011caaa5be03062a559619971897640511848856f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uz/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uz/thunderbird-91.5.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a330fa612f09f1337c3c775d0c0447dd2878e79c2555c7e1a13f611e2712720"; + sha256 = "d773684ed49309e642436b40012b52980286fd07c508d8a9ee92c6210063fa13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/vi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/vi/thunderbird-91.5.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c1c11ce007f1e8cdfd039c8b9dbc73e879adafc40d6ef11dbf82134ff76c8d48"; + sha256 = "8bda4d3c6a9ceda51fcccfeadb9942c595acffb8a14823a59523468871332651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-CN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-CN/thunderbird-91.5.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "041aa19e78aad8be563bf4466572deb8bbd16f3a74c24f297da0667dfc65739f"; + sha256 = "4ffa3da9d6c9f45fa90527621af47e67e1c76f09c325a1176be2f14f52ea9362"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-TW/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-TW/thunderbird-91.5.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dee8d2dea78128f250054d5f8aaf948b19d3e43acc228a0c751df84d601ce76c"; + sha256 = "e3c053b3835566481e1207cc1da3922ce4949c0215553bc2dce5a62715a7a919"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/af/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/af/thunderbird-91.5.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6e19fa5338b63c3aa163cbb9d84953a0f1bc4bb593cbc685cf4e59249425f948"; + sha256 = "f131f7266ae90708a4f5a544d5b6b656488e676e79e91e998ac4dacd969effe4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ar/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ar/thunderbird-91.5.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2b35a83198c30bc9838849260477b4846dbd35b82607261534e05336911129c5"; + sha256 = "8dbb28b438d1f72d314b32ad8b884829a9bda3bb3a8d4a677e3abcb0f7edc005"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ast/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ast/thunderbird-91.5.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01712e869983cb089f9e98449ae215c95aa59e70ad2a7e61a17788f74c50c905"; + sha256 = "0c1dfbb7b8d001e28ba6fb5648af5d993b3a89e19381cb9bdee898ea7134ec64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/be/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/be/thunderbird-91.5.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7cfd5b52f0a809c514ac17f29bf30d2aa1959193020f742b8e907fc4772eb8b"; + sha256 = "dc4888c238652ff13e66ada3d21e129f3bc01f663dec38bed1f200426c5ec8af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/bg/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/bg/thunderbird-91.5.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e74a5073ec17e2ac75c81e9dbe418167932d53d47fb1449a919b7a6824f7ace3"; + sha256 = "77c370a1f1e9e0683baf5a6a6abe937f198be08cf6ed3a6f29c59c3be64080ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/br/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/br/thunderbird-91.5.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a8b13e933e1767d6f42fa4e02892d99ef5d8da14c9aad51e2089d16c2b935c6b"; + sha256 = "bce47698480a1c38d5b0d397c3e69c3c5ac99a0937885abbd633284614daea6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ca/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ca/thunderbird-91.5.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "047e158f5b81c5c5837c583e63f1852e94ab65365e7551dc14dee4e91711ee89"; + sha256 = "bf288be4f977ebaffcd2e16c691a3223924fec7f39ec3e7368fb9b88f9c1156b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cak/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cak/thunderbird-91.5.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1175e2c893f720fd128de26ff7832367e2e8792d1a0fb968c23cf0c2971d87a5"; + sha256 = "fcfb6268df5aba758dcefae6e6c0469648d56663789d32175a8e52068d48aaf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cs/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cs/thunderbird-91.5.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9c80c6afa31ed73ccb2e1c813acabc3be484e00f6c498dece19e095d5fc7e1ab"; + sha256 = "529b31c7cd03b0c199a8acab13dfb684db5c2bd9fa10f96e8da748bcaa5e0a04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cy/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cy/thunderbird-91.5.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "79418720066cdeca5abee231952b3b26f1209eaf59ceab0882f798ba86305aee"; + sha256 = "c4b22b81608421ff5c6ce74ea7b145a6ad09ae506ae25af9ad93ac0434ad1734"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/da/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/da/thunderbird-91.5.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4797af3b1d72199565fafe269d5514042420d3ffd276fb94b3bdda5cea2191f2"; + sha256 = "cf28d1a77ac2acf26fc314628fe21e5c9ddfcbe85a76d28070d15d78a6b73360"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/de/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/de/thunderbird-91.5.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c15470c0a61190749d88c857d1a4490e331fc0046cd7aa18fffa5d23b33c1460"; + sha256 = "a752cd04414a80ed92e42bf95b6460714b500e1d466d5663a64c9dcc7a678e66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/dsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/dsb/thunderbird-91.5.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "64c176f0c64d877a505006b03eb0d685042b7120293b733de029868a3ae562ec"; + sha256 = "31ef88cc4cc2892fd501df71a751aa3c3ee8acc61fdb437897172de8e75de9c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/el/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/el/thunderbird-91.5.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b220e7f82cbd674b5e98d082766b06a52bc69e18c7d1c91bb0a9dc6d2f129c99"; + sha256 = "5edf4e1008b3d8d19d623a8f3cf2d8fb1f7a1030de9db686bfb8c09c61e740d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-CA/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-CA/thunderbird-91.5.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0cc5344d19e62fc86843d71792a59b310be9604ba2bc1ea633d71d6f54ea7eae"; + sha256 = "60e91f33b0b5e75e4a18f1fac688e4c249be77874103d1a44ad2cbd1188afc6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-GB/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-GB/thunderbird-91.5.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "04285f839530ce6917a1918d557cc86448debbd8910d54ca051b9f1b63749b7d"; + sha256 = "b08d2650702304409b19967d5ff6883881d37577c8e3ed0d545e36e81306cc96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-US/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-US/thunderbird-91.5.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fa96eb80909cc7f485abda8fdc093f0ef1e2e5fe69f4919bdeeea27651fa264c"; + sha256 = "347dfd3d8bf993e2fdc7c844c8b1a94925ab637acad9e07a1616f8657e8574b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-AR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-AR/thunderbird-91.5.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5affd961efe6b8d6b7616ef1103095c068627f6d3c571aaf71924bc8f8bc58ec"; + sha256 = "e2c23ea75312f53201e02079063c946ae76fd11acb75cafed8d643ad49e5d484"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-ES/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-ES/thunderbird-91.5.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1dae610383b6dd35e4d6e7d0f8a757b98ab98c6b587940818c239c95f7829e24"; + sha256 = "205d541dc22a3961b1aaaafd617743d1a25b52ee5bdf8b9add6ca56fbcd6861e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/et/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/et/thunderbird-91.5.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3b2979496032f3f140460295fcae7ff6b08b7970c18eff6bd83df6f582c20651"; + sha256 = "4967717f2b6c21d9868e4fdb812e999f3002bb197b3a111a479d97fabc70d2c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/eu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/eu/thunderbird-91.5.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a10fddb7405cb311d0a8c69dafca4dce66084c64f68fc7dabbdd7292d265d528"; + sha256 = "ea5ad491a38b4fd3b78f0741b7545ea7a9d11c3cd82f992fe7b6f38acd4f1a36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fi/thunderbird-91.5.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "edc8f3c7368126e3678f8ea6c22e8e575cd34054a94e21b1eac0a44f44689790"; + sha256 = "45884d2b6d7af2a2f9f4195d5ddc9eadbd34a0d6cae039193b4eba4da49e3909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fr/thunderbird-91.5.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bae7f4e7cd6d72c3e8270f12483f382c939f3012df6597bb3233af9a3d0bab03"; + sha256 = "1d2153eb9e903a37e03596e11d2bc0a869260421ac07b3787d05a163c9c5b32d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fy-NL/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fy-NL/thunderbird-91.5.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "dd38566e30d30d1a15283ef1c4382d350cfd4afe8cdaeefc38b995cc82045964"; + sha256 = "6ad87450cbb8a98fbd55d7399ef73f5668c1f8e288cb6d36b426fc8c373837bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ga-IE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ga-IE/thunderbird-91.5.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "7b16826113f3c46601465dbc3b44a24b5e62d9a6a0639d4f74b6314250f24224"; + sha256 = "4b268107debcde5a45fc69c5ce4881b0bc8b9809a2cfcf877fe655339ec5890d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gd/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gd/thunderbird-91.5.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4287667e5ff7a6ff39c74066a7c22229736ce503fad749293710a25cf74b5836"; + sha256 = "3a6f0b431d5301a9cdf1499b186580bfbf468aad4e7123175a9defa04e68e6ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gl/thunderbird-91.5.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bcca84aaab4c48e8842f1c921ac398f56eaa569cda6ffa6b5aa3cd0ec709e42e"; + sha256 = "e79001ca8b96cc9c5cb1a9ada3362e5365b68c05b4324ff2d36e1421faee691a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/he/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/he/thunderbird-91.5.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fd9be0e774dde17d5c2b5d1887c9e9ab75fcb7c797f5b6d59c991679eeb870a7"; + sha256 = "d246a1b5a9d03e656392df6fdd4a6dda9e035551d0498519fbf53d44ec033a34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hr/thunderbird-91.5.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4dbc9d9a2d9409688c2f67f5c73fbb31fd1027ee787527f437f95582103c728a"; + sha256 = "f3d4604bea32362a4ee9ca41d3ef98e910ff448b32e37d0c59dc33d92366ab1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hsb/thunderbird-91.5.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5cf4fc68d7d9464d55686dbac2dba4a38ca50bb36e6661ed4d58b91726f0b312"; + sha256 = "8ca969121ab8fc69dc598415a7d5ece9fd86e51c3b90f48f9c51d01157a3a14e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hu/thunderbird-91.5.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "dd1b4a5f2498eb2e3a3956fdf6379cdde04f0eb60efc201c86237f07dfc01a2f"; + sha256 = "8b76452c8aa27409237d592fa386f8fa257bf44151e77f5cbf990b1c7580689f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hy-AM/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hy-AM/thunderbird-91.5.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4e717d157784d865f4de4dd8b14718d39103ce24be1d72c5720629c74d74ae94"; + sha256 = "7855e8b013d16365fcbf883646ac83f8c094b3efc4ab9c6ada1eccf211c53d2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/id/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/id/thunderbird-91.5.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a705929998084e28016cc60df3b7ae6a1f70929270be16307e9be89f1324de2c"; + sha256 = "b41b74af5f85a56e0ffe6345f78f39190b22a867110ef043f24300f68e845324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/is/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/is/thunderbird-91.5.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "48d7eb8c949e9590699031c45bcdd746d1e86ed8dd893bb3afa7025f7bc4c247"; + sha256 = "963c23e640536d88fc486b654e69584587cdc39d2acff9f64372faf7fd73f8db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/it/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/it/thunderbird-91.5.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0278a174914da7f874a974847a30bc52851496e79690a8ccde2c3a0a24e9aa39"; + sha256 = "4835f22538eaf2da8913d79ae575c7401fcc7fb3b7c0d21d386906c055ed7912"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ja/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ja/thunderbird-91.5.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "243e610020c892cf44de3d76b27539e57c5c9eeaef6c5d8298af59ee4be8b448"; + sha256 = "edd3a047d63172f5f42fa31b4b89a8d07c6d9eccb3d53d19f4f7ad8cc1cea539"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ka/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ka/thunderbird-91.5.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c641e2f92c87a7454603d059dc34dd2719aefe9b10548dba9e4b95e728583181"; + sha256 = "06b55cb6215cece0d95827eeb196bd5f1255d348a7d906a0515667a71050ef85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kab/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kab/thunderbird-91.5.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a47675e0ec44e8bb94dd950e5282f26f0ee878be90a87c0cffe50fe74adc754a"; + sha256 = "36de72132e0311c4428182c5795249e37042f1eb05d1c05aeff9f1e46b602656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kk/thunderbird-91.5.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1a4cc1087fd9fd0f9cb303c1a0de438d95ec9a665360d9c9915af4269af6f5e9"; + sha256 = "e3462a463f867b4645bc77739e275deae77bf64068a6ddd1522ac281cfbfbd3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ko/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ko/thunderbird-91.5.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f45540f54fab28b107c2938b91191a65f2051fbf435e00530d343f076cb84373"; + sha256 = "e90f011e920958ea853dd426f57a1e5cb0593ce117d5a9e19a90c6df69d729c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lt/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lt/thunderbird-91.5.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be4d02c3b07aab05e82de8d167ae22269ca5c5ee020a6d8cad0e53a433135160"; + sha256 = "4e3eaffa505b5f8a37b0534a754ab89c2f7b4dc65ead78ca266d4fa8cb5aa841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lv/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lv/thunderbird-91.5.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "76e3c3c943d4f3598f6f49b51ab9c8625322ad78b6809418905e8d0c7d586ee7"; + sha256 = "0dd8c818bd60cd6e67df751933c0aeb89bf10fa64235edc639955c86a0e51168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ms/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ms/thunderbird-91.5.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e125a89ea9d9f013ddd2f816ab10c6916b514ff329011f54e517e2d6e5edb865"; + sha256 = "b0b9f303014a1b90a52ec39f36f2e2029562ef70fcc9b77c0f7048558f1ad7bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nb-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nb-NO/thunderbird-91.5.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1645ab9430323efefff6751696e1fe601063eef5c5ac70b90889620f6bd9680"; + sha256 = "89f787643d5d2451a0f7095f69805d4c0d0e05c62fbe0468c78b6bcc9dfc0dcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nl/thunderbird-91.5.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2c1cc1a8ed006e45d4649fa89d5446a9df2e95e2656e9a18130556c42ee0db78"; + sha256 = "9ebf8a5cd8df953078dc634ac17325c8e0fdd01cce3dbb8561fb29e8b8a4e6cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nn-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nn-NO/thunderbird-91.5.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "089e6cb230da93b30aac8a81d22f6ac97233d20f6a0e50e96ef8675acfcc407c"; + sha256 = "ec702407e9dfd14de776a5409413b8ddf3c32cf6aa17e8a37ba349e8fa7ba1db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pa-IN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pa-IN/thunderbird-91.5.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6ca6b68ac5ab40966b8bc13d6a8f1ef26730d8065cad27f93bd3139295b5fcbc"; + sha256 = "f26de0a71646669f07ba23c8e181700b1569ce41049f62215c19ca746a4ca38d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pl/thunderbird-91.5.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "93f94b83a17569b5b626277af71651a607d74c32fa17fc35896ac42556075d2d"; + sha256 = "d497057a71cfe867f53a5dadf3b1b8fdf30db8470cbfedd416b39acef3d61163"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-BR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-BR/thunderbird-91.5.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9c7e02da587136eebf6111fe4e25687f904b8db7629be251c84ab25b6adfd2e5"; + sha256 = "90367905fe8dd83f9c6acb093e9ba6583124171037755ef2f3a6771c94e1cb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-PT/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-PT/thunderbird-91.5.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8666b71ac2fa83da6175c8c26ab73a957f19dcc6b36cca7f980407aa7a42111d"; + sha256 = "b611af59f7f88efa10aef43f8ac464b5c514412b534cff39eb2844ae1ca18077"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/rm/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/rm/thunderbird-91.5.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f278f045fe7c941b4545ea452152859960d952704f2d666d39bb6a91175c7027"; + sha256 = "5d75ac9e6c0c27b0faf436d69305f206e09867c306264a4de30cd3b1f879c1d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ro/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ro/thunderbird-91.5.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2c43f39a8fcd557efde852eb7f859eff048672806ec23620037a28d4d98da99a"; + sha256 = "aa64e96ad2d1a361c8cd96b5b0e88cdd51eba2c3c036ac453ff9225320d08f6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ru/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ru/thunderbird-91.5.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "63041d68d0072699dfc7e3fa448ac9a3bf065795c455dd3f5671cae97d5d121a"; + sha256 = "6d293d0ee9eebd01c6e36e085333c4da15f0ce2ece73dc99015545255a435538"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sk/thunderbird-91.5.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "be1cdf0cd47f788d736c9bfae340b6cf9edd661293e5ce5b5bca6b2aa169438c"; + sha256 = "37436cda08659abd49108f7e9a8ee5645d2ee1ed0086a7b4158279342d0cbdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sl/thunderbird-91.5.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "128a46d7df356375536a432d7bd13bdea8d4932b105cdf4b8288af3dfa878b7d"; + sha256 = "fc8e6fed968e6312f69545479b5b3230390d41490a2a5b6385f046a2a3709018"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sq/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sq/thunderbird-91.5.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6a8fa0c4806240a886393c51f63992e567524264c821ccf4f12e202f4f30e7ce"; + sha256 = "ce68e8f855d6d366b1490cc3b7e044a84fba63bcfa11453afc4b98ec665450c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sr/thunderbird-91.5.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "e2639022166d0be0d30846a269c08940652475e77ef114089e22c9d5ddf61f98"; + sha256 = "128843650ddfa57493c8691e7c591685cca4b1ab6c118949ef1580318954f110"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sv-SE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sv-SE/thunderbird-91.5.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d8a419a6c8105fbf6ee29a38cba3e40729ef8f12743d87ce2a623e8707ba0414"; + sha256 = "7180055d5184c38f3fb893538b0c270d3d125da4434debe6fffdcd3288d8ea53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/th/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/th/thunderbird-91.5.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ac2926a73937c0789ba63d6ecce8a17dcf5a65a7fca5dd439618384588c0dce5"; + sha256 = "4b964b7517b941622f18328f73813aca740a4da1799805a0a267b510704308e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/tr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/tr/thunderbird-91.5.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "efcf840a32ab0264484c7f1fa2b3a0961cdd1e8ff37f4f83126ab0626c19834b"; + sha256 = "71d551988a6ff2bd96900bf4ce72e05ac47bcb36af9a25af4e3b76d16da37d50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uk/thunderbird-91.5.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e1fabb41564ebd683cf298bb3bc13e3478dfef6522f6524a7c2ab69c64d59251"; + sha256 = "e62b6fce0bb1175c9c6acb37ff9454509766d4953fb0d4494023143fd70650a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uz/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uz/thunderbird-91.5.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2dac221764006b5db352416159311849cfa62c67894ec40a2914caf3191c79d9"; + sha256 = "c5c9e10e82ab793d9a82d95bcb20eb288395e32c27dcf5ca2a91fc937e479aba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/vi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/vi/thunderbird-91.5.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fb482c3579b6bde18214ca68fa731d50ac254152dc51c5d13e283f16559f0886"; + sha256 = "081895dc1684360c0859d5084ece871c7539e91b858392dbaa3ddf8ee0f38ea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-CN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-CN/thunderbird-91.5.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4e596742711f72eae50621fbc0b329bdf736267c753c51ab8dd1713cc0860285"; + sha256 = "b5fadde23bd94f3ab2fbe6b8070040d9e89a506a399d9c1348b80a8639b8220b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-TW/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-TW/thunderbird-91.5.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c97873b840540297f08ad866479789f2f7cc8baa48de6bdf9eb4b945a5c135c4"; + sha256 = "4d31d6a8d4f94486e4ebec3c98d2d535fd5485b3b73dfa0a52760300608c7eac"; } ]; } 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 c9cc9f901a..033e555758 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.5.0"; + version = "91.6.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e1cafbd99e67e8fef346e936890a22aeadded4aa8be604607535ae933251bc1b2a3b56c2b62045b3d37ecb09999adb746157df188d1a32dfe75685f3af959b7d"; + sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749"; }; patches = [ # 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 c44b5f7272..9b70d143e1 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.89.25"; + version = "3.91.6"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-0j0vL45kpZeBBdW7NY8lvseYUhXGPoCbOdUtT97fMiI="; + sha256 = "sha256-REoYLxU9p0lECKNwcDHidO+jTCKS1yQSzed9GSHSNGI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix index d882134473..e7e1be095a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix @@ -12,6 +12,8 @@ nodePackages.n8n.override { node-pre-gyp ]; + passthru.updateScript = ./generate-dependencies.sh; + meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; maintainers = with maintainers; [ freezeboy k900 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh b/third_party/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh index 26926deefb..f7412bc5e5 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -10,6 +10,7 @@ # -> cpu-features # -> node-gyp@3.8.0 -> python2 # -> cmake +cd "$(dirname $(readlink -f $0))" node2nix \ --14 \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index e78448933b..6a9c521cd2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; }; }; - "@azure/core-http-2.2.3" = { + "@azure/core-http-2.2.4" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.3.tgz"; - sha512 = "xr8AeszxP418rI//W38NfJDDr0kbVAPZkURZnZ+Fle+lLWeURjDE5zNIuocA1wUPoKSP8iXc0ApW6nPtbLGswA=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz"; + sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; }; }; "@azure/core-lro-2.2.3" = { @@ -112,13 +112,13 @@ let sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A=="; }; }; - "@babel/runtime-7.16.7" = { + "@babel/runtime-7.17.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; - sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.0.tgz"; + sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; }; }; "@dabh/diagnostics-2.0.2" = { @@ -130,13 +130,13 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@fontsource/open-sans-4.5.2" = { + "@fontsource/open-sans-4.5.4" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.2.tgz"; - sha512 = "aDQrW8s0KslG2aKb9nM5R6fiQR9iPomqWXf6iZCC30qv/UFlSY14SppodA3rE//+w37EqsJjyUq3BSEYzLdisg=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.4.tgz"; + sha512 = "iaEuU7l3VGA/bqWW9UsBD2bgFwCwDFwKlmOUft4Jps3pD3Zc9POMNYV0+mNyKbA4OIcIice32l+BMif8vY6pdg=="; }; }; "@icetee/ftp-0.3.15" = { @@ -220,6 +220,15 @@ let sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; + "@oclif/config-1.18.3" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; + sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + }; + }; "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -256,13 +265,13 @@ let sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; }; }; - "@opentelemetry/api-1.0.4" = { + "@opentelemetry/api-1.1.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.4.tgz"; - sha512 = "BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz"; + sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -454,22 +463,22 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.42" = { + "@types/node-12.20.43" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.42"; + version = "12.20.43"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.42.tgz"; - sha512 = "aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.43.tgz"; + sha512 = "HCfJdaYqJX3BCzeihgZrD7b85Cu05OC/GVJ4kEYIflwUs4jbnUlLLWoq7hw1LBcdvUyehO+gr6P5JQ895/2ZfA=="; }; }; - "@types/node-17.0.10" = { + "@types/node-17.0.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.10"; + version = "17.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz"; + sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; "@types/node-fetch-2.5.12" = { @@ -589,13 +598,13 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "access-control-1.0.1" = { @@ -940,13 +949,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1062.0" = { + "aws-sdk-2.1069.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1062.0"; + version = "2.1069.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1062.0.tgz"; - sha512 = "QIU8jwi7Uqyvw2HjsXXXUZv3V/6TinUzLewrdl2EdvonqZCXhwMgnZx2F9I2x62IKH1RqnINwFWdoK+OTgcAjA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1069.0.tgz"; + sha512 = "AF7/5JotrVd8g/D3WWHgQto+IryB1V7iudIYm+H+qxmkGOU3xvL63ChhEoLTY/CxuK/diayg0oWILEsXUn3dfw=="; }; }; "aws-sign2-0.7.0" = { @@ -1768,13 +1777,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "core-js-3.20.3" = { + "core-js-3.21.0" = { name = "core-js"; packageName = "core-js"; - version = "3.20.3"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; - sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz"; + sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; }; }; "core-util-is-1.0.2" = { @@ -1786,13 +1795,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-32-1.2.0" = { + "crc-32-1.2.1" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; - sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; + sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; }; }; "cron-1.7.2" = { @@ -2542,22 +2551,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "flatted-2.0.2" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "2.0.2"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; - sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; - }; - }; - "flatted-3.2.4" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "fn.name-1.1.0" = { @@ -3235,13 +3235,13 @@ let sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; }; - "ioredis-4.28.3" = { + "ioredis-4.28.5" = { name = "ioredis"; packageName = "ioredis"; - version = "4.28.3"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.3.tgz"; - sha512 = "9JOWVgBnuSxpIgfpjc1OeY1OLmA4t2KOWWURTDRXky+eWO0LZhI33pQNT9gYxANUXfh5p/zYephYni6GPRsksQ=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz"; + sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; "ip-regex-2.1.0" = { @@ -3577,13 +3577,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isbot-3.4.0" = { + "isbot-3.4.1" = { name = "isbot"; packageName = "isbot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.0.tgz"; - sha512 = "0WOb6bbJ6gtpWVHQ30r5MzqvSrCNbZ70wFXAJWdXt/0LulF59uvBQnPgA7IelbOXEpV+CtLWkDxLB4TU7f0+VA=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.1.tgz"; + sha512 = "CyapceDROQ9dp9uGUh2d0D7q/MDGDt2B3rl/da+BZ0maCBI9bNlZMk3fr4dEO+LEsRY7ur3mfYNQPavCRDRJxg=="; }; }; "isexe-2.0.0" = { @@ -3820,13 +3820,13 @@ let sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; }; }; - "libphonenumber-js-1.9.44" = { + "libphonenumber-js-1.9.48" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.44"; + version = "1.9.48"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz"; - sha512 = "zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.48.tgz"; + sha512 = "2aiDGkr5Ty7LZRhKhnMeV9tfRbzd2zahgF12I0v11AFwEelSdiu5t8/Npf3UejKcuoO4anqTdjnIW3dEtj1xYQ=="; }; }; "libqp-1.1.0" = { @@ -3991,6 +3991,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "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.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -4144,13 +4153,13 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.36.3" = { + "mappersmith-2.37.1" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.36.3"; + version = "2.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.36.3.tgz"; - sha512 = "izy4Gc7+VafMR/fDQukiEEBAfFoPGRYLBzFxXqXMR1IwAHqlQgSPRX+g/uIkaVqGRh+eb5c7sy8HNaBq9opwkA=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.37.1.tgz"; + sha512 = "3QiXhRADHTK/it1riJMJm/sHmLlGdw3pfLgZJQu9MfT1CNeiO93keNY0BVLlRmpPBsMER/P7kj3mtcAK2V331Q=="; }; }; "md5-2.3.0" = { @@ -4450,49 +4459,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.102.0" = { + "n8n-core-0.104.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.102.0"; + version = "0.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.102.0.tgz"; - sha512 = "9/suLELO/HBoEZ06bEv3cN7HZoR43qZlubM0BDXDhXJHBasfKcfegXYYacSfBxtTVX71cLffVgshJoJt8OtDcw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.104.0.tgz"; + sha512 = "rh8ooCF0zeVjic6JWByuCzcltpeV/OJjUmLcChXU3S6peggCvazvxlU6GOF/+YT69CeQdHwhTmOXSEevu0uzVQ=="; }; }; - "n8n-design-system-0.9.0" = { + "n8n-design-system-0.11.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.9.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.9.0.tgz"; - sha512 = "E1DoUDIvPTLAQ72mkg+MVS72QxDxa5UPxVqX4QeF/xAhUrXKfTWHveG5OxugW+mrEF5nO8IG08MEDOQCOzJZpQ=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz"; + sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg=="; }; }; - "n8n-editor-ui-0.127.0" = { + "n8n-editor-ui-0.129.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.127.0"; + version = "0.129.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.127.0.tgz"; - sha512 = "XCiLwXing2nSidUfrEqcYxG7Zc7TBbJDxmUjSwv2fdH4SK4vMPcUINJbEQOHPIhc6GNEjSt1J/tbCEJJC/acbg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.129.0.tgz"; + sha512 = "LEYqSL04FWh9dPM/YhL1yySOYCN7IB5uP7uLjfiDR+B7BQcmpq1Do6NzuKqdzfoN8MwMZy6avQrw691rq266nQ=="; }; }; - "n8n-nodes-base-0.158.0" = { + "n8n-nodes-base-0.160.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.158.0"; + version = "0.160.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.158.0.tgz"; - sha512 = "qs/T0S2BHrovOFh6mnCRpuY9qhKZxub160+qtvXMVsiUWCpKEW1eIA4owYHLH3DLYqW0izQJap0sGlZEzV3xTg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.160.0.tgz"; + sha512 = "q1eJBZSRgafVZBoCgmqxP0vnGDbgUpru0SOgtPgvvZxceo02PiBn8X8N8UjZ5ZeqIekO25tWvbJjGZpyIQ5/sg=="; }; }; - "n8n-workflow-0.84.0" = { + "n8n-workflow-0.86.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.84.0"; + version = "0.86.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.84.0.tgz"; - sha512 = "ibZ/oCWd81DMhjUQcAMC5GNs2C/dm+4boKTIjRuFHmbGzF2elwpb5s2nlkRn5REj9aZseZ0N9bfJ6slcLbw/Sw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.86.0.tgz"; + sha512 = "+Kdo5RMEsh7QJ8AkWNTSpyxYRtjpxPmPfifVAFg4HVguW7g5e7f74xlmqD2xnxQybC9B3f6jxvx6WMKbNcT/+A=="; }; }; "named-placeholders-1.1.2" = { @@ -4549,13 +4558,13 @@ let sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "neo-async-2.6.2" = { @@ -5107,13 +5116,13 @@ let sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; }; }; - "peek-readable-4.0.2" = { + "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.2.tgz"; - sha512 = "9fMaz6zoxw9ypO1KZy5RDJgSupEtu0Q+g/OqqsVHX3rKGR8qehRLYzsFARZ4bVvdvfknKiXvuDbkMnO1g6cRpQ=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"; + sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; }; }; "performance-now-2.1.0" = { @@ -5134,6 +5143,15 @@ let sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA=="; }; }; + "pg-8.7.3" = { + name = "pg"; + packageName = "pg"; + version = "8.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz"; + sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw=="; + }; + }; "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; @@ -5161,13 +5179,13 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.4.1" = { + "pg-pool-3.5.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz"; - sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; + sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; }; }; "pg-promise-10.11.1" = { @@ -5332,13 +5350,13 @@ let sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="; }; }; - "printj-1.3.0" = { + "printj-1.3.1" = { name = "printj"; packageName = "printj"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz"; - sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="; + url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; + sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; }; }; "process-0.11.10" = { @@ -5971,6 +5989,15 @@ let sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; }; }; + "safe-stable-stringify-2.3.1" = { + name = "safe-stable-stringify"; + packageName = "safe-stable-stringify"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -6169,13 +6196,13 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "signal-exit-3.0.6" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "simple-git-2.48.0" = { @@ -6322,22 +6349,22 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.5.0" = { + "ssh2-1.6.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.5.0.tgz"; - sha512 = "iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz"; + sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; }; }; - "ssh2-sftp-client-7.2.1" = { + "ssh2-sftp-client-7.2.2" = { name = "ssh2-sftp-client"; packageName = "ssh2-sftp-client"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.1.tgz"; - sha512 = "kr5QFL+d8Ta28wGhlRqkHo812PjMhKrBK7oTaYGNHqTvXAUjxZR6SeWRXbwKASE3dh2xeDz5aXHcg01bzfAeCA=="; + url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.2.tgz"; + sha512 = "qZYivU1zezyRomCf+TtsCYVAsc0TDQWzxJMMUN8NknEPonm2TYGxJAzrW8acUh2ILYgA0ZPOJElLV/qp9nRVYQ=="; }; }; "sshpk-1.17.0" = { @@ -6493,13 +6520,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strtok3-6.2.4" = { + "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.4"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz"; - sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz"; + sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; "supports-color-2.0.0" = { @@ -7186,22 +7213,22 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "winston-3.4.0" = { + "winston-3.5.1" = { name = "winston"; packageName = "winston"; - version = "3.4.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz"; - sha512 = "FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.5.1.tgz"; + sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA=="; }; }; - "winston-transport-4.4.2" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; - sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "wmf-1.0.2" = { @@ -7426,10 +7453,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.160.0"; + version = "0.162.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.160.0.tgz"; - sha512 = "mdjD4tKohZP8kMbFa+gGWx5rYXLz9HprXr2tPHUpAvZ6x7JGb06uY2ieNifSAH9Ap3CR+qfg6HkPgSKe183CIA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.162.0.tgz"; + sha512 = "76fcq99iZXy+j+BiuZMrR1rgeBgWRGOVwNeqlEqWCJ3u8kg6iDsGRuo9nSdx11OzP17hAJJKLtYHxLfTBV3kUw=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7443,7 +7470,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@azure/core-http-2.2.3" // { + (sources."@azure/core-http-2.2.4" // { dependencies = [ sources."tough-cookie-4.0.0" sources."tslib-2.3.1" @@ -7481,14 +7508,14 @@ in sources."tslib-2.3.1" ]; }) - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" (sources."@dabh/diagnostics-2.0.2" // { dependencies = [ sources."enabled-2.0.0" sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.2" + sources."@fontsource/open-sans-4.5.4" sources."@icetee/ftp-0.3.15" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -7497,7 +7524,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.16" - (sources."@oclif/config-1.18.2" // { + (sources."@oclif/config-1.18.3" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7507,14 +7534,19 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.1" + (sources."@oclif/help-1.0.1" // { + dependencies = [ + sources."@oclif/config-1.18.2" + sources."tslib-2.3.1" + ]; + }) sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.6" // { dependencies = [ sources."tslib-2.3.1" ]; }) - sources."@opentelemetry/api-1.0.4" + sources."@opentelemetry/api-1.1.0" sources."@rudderstack/rudder-sdk-node-1.0.6" sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" @@ -7535,7 +7567,7 @@ in sources."@types/lodash-4.14.178" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" (sources."@types/node-fetch-2.5.12" // { dependencies = [ sources."form-data-3.0.1" @@ -7553,7 +7585,7 @@ in sources."@xmldom/xmldom-0.7.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."access-control-1.0.1" (sources."adal-node-0.2.3" // { dependencies = [ @@ -7602,7 +7634,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1069.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7697,7 +7729,7 @@ in sources."printj-1.2.3" ]; }) - sources."printj-1.3.0" + sources."printj-1.3.1" ]; }) sources."chalk-4.1.2" @@ -7776,9 +7808,13 @@ in sources."convict-6.2.1" sources."cookie-0.4.1" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" - sources."crc-32-1.2.0" + (sources."crc-32-1.2.1" // { + dependencies = [ + sources."printj-1.3.1" + ]; + }) sources."cron-1.7.2" sources."cron-parser-2.18.0" (sources."cross-spawn-4.0.2" // { @@ -7884,7 +7920,7 @@ in sources."ms-2.0.0" ]; }) - sources."flatted-2.0.2" + sources."flatted-3.2.5" sources."fn.name-1.1.0" sources."follow-redirects-1.14.7" sources."for-each-0.3.3" @@ -7977,7 +8013,7 @@ in sources."ini-1.3.8" sources."inquirer-7.3.3" sources."internal-slot-1.0.3" - sources."ioredis-4.28.3" + sources."ioredis-4.28.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" @@ -8012,7 +8048,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" - sources."isbot-3.4.0" + sources."isbot-3.4.1" sources."isexe-2.0.0" sources."iso-639-1-2.1.12" sources."isstream-0.1.2" @@ -8045,7 +8081,7 @@ in sources."iconv-lite-0.6.2" ]; }) - sources."libphonenumber-js-1.9.44" + sources."libphonenumber-js-1.9.48" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-3.0.3" @@ -8068,11 +8104,16 @@ in sources."lodash.isnumber-3.0.3" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" + sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" - sources."logform-2.3.2" + (sources."logform-2.3.2" // { + dependencies = [ + sources."safe-stable-stringify-1.1.1" + ]; + }) sources."long-4.0.0" sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { @@ -8101,7 +8142,7 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.36.3" + sources."mappersmith-2.37.1" sources."md5-2.3.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -8157,20 +8198,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.102.0" // { + (sources."n8n-core-0.104.0" // { dependencies = [ - sources."flatted-3.2.4" sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.9.0" - sources."n8n-editor-ui-0.127.0" - (sources."n8n-nodes-base-0.158.0" // { + sources."n8n-design-system-0.11.0" + sources."n8n-editor-ui-0.129.0" + (sources."n8n-nodes-base-0.160.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.84.0" + sources."n8n-workflow-0.86.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8190,7 +8230,7 @@ in sources."debug-3.2.7" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."no-case-3.0.4" // { dependencies = [ @@ -8289,14 +8329,18 @@ in sources."debug-3.2.7" ]; }) - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.7.1" + sources."pg-8.7.3" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" - sources."pg-pool-3.4.1" - sources."pg-promise-10.11.1" + sources."pg-pool-3.5.1" + (sources."pg-promise-10.11.1" // { + dependencies = [ + sources."pg-8.7.1" + ]; + }) sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { @@ -8401,7 +8445,7 @@ in sources."run-parallel-1.2.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" @@ -8433,7 +8477,7 @@ in sources."sha.js-2.4.11" sources."shell-escape-0.2.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-git-2.48.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" @@ -8467,8 +8511,8 @@ in sources."sqlstring-2.3.2" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.5.0" - sources."ssh2-sftp-client-7.2.1" + sources."ssh2-1.6.0" + sources."ssh2-sftp-client-7.2.2" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" @@ -8482,7 +8526,7 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ @@ -8494,7 +8538,7 @@ in sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.42" + sources."@types/node-12.20.43" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" @@ -8601,14 +8645,14 @@ in sources."which-boxed-primitive-1.0.2" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."winston-3.4.0" // { + (sources."winston-3.5.1" // { dependencies = [ sources."async-3.2.3" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) - (sources."winston-transport-4.4.2" // { + (sources."winston-transport-4.5.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" 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 bbdddbf606..874c0f8a17 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-1fUk4PUFkWcLOvrYvM+K+ZarUSeq/JtDU2bHHPoAoC8="; + sha256 = "sha256-cqpdn2STxJtUTBRFrUh1lRIDaFZfrRkJMxcJuTKxgk8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index 9d9e1a7c8d..00289e5c62 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.25.5"; + version = "15.26.4"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-LtITPS0bLy85dv/zdOo8JcsEZ0ZgtVmM+CcggaYJxXA="; + sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8="; }; unpackPhase = '' 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 033386afd1..ee9467467c 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 @@ -1,57 +1,40 @@ { stdenv , lib -, at-spi2-atk -, atk , buildFHSUserEnv -, cairo -, dbus , fetchurl -, fontconfig -, freetype -, gdk-pixbuf -, glib , gsettings-desktop-schemas -, gtk2 -, gtk3-x11 -, harfbuzz -, liberation_ttf -, libjpeg -, libtiff -, libudev0-shim -, libuuid -, libX11 -, libXcursor -, libXext -, libXi -, libXinerama -, libxkbfile -, libxml2 -, libXrandr -, libXrender -, libXScrnSaver -, libxslt -, libXtst , makeDesktopItem , makeWrapper -, pango -, pcsclite -, pixman -, zlib +, writeTextDir +, configText ? "" }: let - version = "2106.1"; + version = "2111"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; # The downloaded archive also contains ARM binaries, but these have not been tested. + # For USB support, ensure that /var/run/vmware/ + # exists and is owned by you. Then run vmware-usbarbitrator as root. + bins = [ "vmware-view" "vmware-usbarbitrator" ]; + + # This forces the default GTK theme (Adwaita) because Horizon is prone to + # UI usability issues when using non-default themes, such as Adwaita-dark. + wrapBinCommands = name: '' + makeWrapper "$out/bin/${name}" "$out/bin/${name}_wrapper" \ + --set GTK_THEME Adwaita \ + --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ + --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" + ''; + vmwareHorizonClientFiles = stdenv.mkDerivation { name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/view/viewclients/CART22FQ2/VMware-Horizon-Client-Linux-2106.1-8.3.1-18435609.tar.gz"; - sha256 = "b42ddb9d7e9c8d0f8b86b69344fcfca45251c5a5f1e06a18a3334d5a04e18c39"; + url = "https://download3.vmware.com/software/view/viewclients/CART22FH2/VMware-Horizon-Client-Linux-2111-8.4.0-18957622.tar.gz"; + sha256 = "2f79d2d8d34e6f85a5d21a3350618c4763d60455e7d68647ea40715eaff486f7"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -65,27 +48,19 @@ 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 libjpeg library interferes with Chromium, so we will be using ours instead. - rm $out/lib/vmware/libjpeg.* - # This library causes the program to core-dump occasionally. Use ours instead. rm $out/lib/vmware/view/crtbora/libcairo.* - # Force the default GTK theme (Adwaita) because Horizon is prone to - # UI usability issues when using non-default themes, such as Adwaita-dark. - makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \ - --set GTK_THEME Adwaita \ - --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ - --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" + ${lib.concatMapStrings wrapBinCommands bins} ''; }; - vmwareFHSUserEnv = buildFHSUserEnv { - name = "vmware-view"; + vmwareFHSUserEnv = name: buildFHSUserEnv { + inherit name; - runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper"; + runScript = "${vmwareHorizonClientFiles}/bin/${name}_wrapper"; - targetPkgs = pkgs: [ + targetPkgs = pkgs: with pkgs; [ at-spi2-atk atk cairo @@ -99,25 +74,29 @@ let harfbuzz liberation_ttf libjpeg + libpulseaudio libtiff libudev0-shim libuuid - libX11 - libXcursor - libXext - libXi - libXinerama - libxkbfile + libv4l libxml2 - libXrandr - libXrender - libXScrnSaver - libXtst pango pcsclite pixman vmwareHorizonClientFiles + xorg.libX11 + xorg.libXcursor + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libxkbfile + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst zlib + + (writeTextDir "etc/vmware/config" configText) ]; }; @@ -125,20 +104,25 @@ let name = "vmware-view"; desktopName = "VMware Horizon Client"; icon = "${vmwareHorizonClientFiles}/share/icons/vmware-view.png"; - exec = "${vmwareFHSUserEnv}/bin/vmware-view %u"; + exec = "${vmwareFHSUserEnv "vmware-view"}/bin/vmware-view %u"; mimeType = "x-scheme-handler/vmware-view"; }; + binLinkCommands = lib.concatMapStringsSep + "\n" + (bin: "ln -s ${vmwareFHSUserEnv bin}/bin/${bin} $out/bin/") + bins; + in stdenv.mkDerivation { - name = "vmware-view"; + name = "vmware-horizon-client"; dontUnpack = true; installPhase = '' mkdir -p $out/bin $out/share/applications - cp "${desktopItem}"/share/applications/* $out/share/applications/ - ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/" + cp ${desktopItem}/share/applications/* $out/share/applications/ + ${binLinkCommands} ''; unwrapped = vmwareHorizonClientFiles; @@ -146,10 +130,11 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; meta = with lib; { + mainProgram = "vmware-view"; description = "Allows you to connect to your VMware Horizon virtual desktop"; homepage = "https://www.vmware.com/go/viewclients"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ buckley310 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix new file mode 100644 index 0000000000..8c26b72908 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix @@ -0,0 +1,74 @@ +{ lib, fetchFromGitHub, python3, makeWrapper }: +let + # Seahub 8.x.x does not support django-webpack-loader >=1.x.x + python = python3.override { + packageOverrides = self: super: { + django-webpack-loader = super.django-webpack-loader.overridePythonAttrs (old: rec { + version = "0.7.0"; + src = old.src.override { + inherit version; + sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "seahub"; + version = "8.0.8"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seahub"; + rev = "c51346155b2f31e038c3a2a12e69dcc6665502e2"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "0dagiifxllfk73xdzfw2g378jccpzplhdrmkwbaakbhgbvvkg92k"; + }; + + dontBuild = true; + doCheck = false; # disabled because it requires a ccnet environment + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with python.pkgs; [ + django + future + django-statici18n + django-webpack-loader + django-simple-captcha + django-picklefield + django-formtools + mysqlclient + pillow + python-dateutil + django_compressor + djangorestframework + openpyxl + requests + requests_oauthlib + pyjwt + pycryptodome + qrcode + pysearpc + seaserv + gunicorn + ]; + + installPhase = '' + cp -dr --no-preserve='ownership' . $out/ + wrapProgram $out/manage.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" + ''; + + passthru = { + inherit python; + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + }; + + meta = with lib; { + homepage = "https://github.com/haiwen/seahub"; + description = "The web end of seafile server"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 2254b4f341..f98b1c28eb 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 = "2.85"; + version = "2.88"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-MsPvda+VaqO3tXH26nVukNWcJ1n+/n5Qk7BMr/DAVUk="; + sha256 = "sha256-B/gcuga82lZSLPKjYWAiLyvqf1FRQmHJsH2jqLkusjA="; }; - vendorSha256 = "sha256-TYVBfjwaoEBKJmIHdwvj/5g4jYmnmJPE1mCL/yET1GQ="; + vendorSha256 = "sha256-N7zOrSMrCR/eOH+08TImI1q2AFGUuWN7xIt3CUVB9rM="; subPackages = [ "weed" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index fe8f22b4d4..76bddac6c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.6"; + version = "1.19.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-fkIHHyhwZV0/aB/JFwz3XrYVOaCn5ZK3ihY3GVoOAHg="; + sha256 = "sha256-jQoY0mA/vAOCaCMR8Aapt49AF7HAmjPsr3MKLoaa24g="; }; - vendorSha256 = "sha256-D16jlzP1amkiHW+/BqQV/DISf/H9MlZgvMJmlGtvrhg="; + vendorSha256 = "sha256-hZcMt3LlK5FuhhlwCmYtlDAJv1QNK+YY7NvZaWMBuys="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/office/foliate/default.nix b/third_party/nixpkgs/pkgs/applications/office/foliate/default.nix index bcd42b361b..7eff0ac909 100644 --- a/third_party/nixpkgs/pkgs/applications/office/foliate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/foliate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "foliate"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "johnfactotum"; repo = pname; rev = version; - sha256 = "0ribqaxl8g1i83fxbn288afwbzzls48ni57xqi07d19p9ka892mr"; + sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc="; }; nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix index 5ab9be9fa7..13b0c84cfa 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.50"; + version = "1.12.51"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dYgZuhvWmDgp+efG1xp/ogzXWjZSonHluwA9XYvMFLg="; + sha256 = "oA5sbk7N2tq9mwrhgBPXsFk3/cuPmq1ac7lZI8eusd0="; }; configureFlags = [ "--disable-component" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/impressive/default.nix b/third_party/nixpkgs/pkgs/applications/office/impressive/default.nix deleted file mode 100644 index f46d893d89..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/impressive/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ fetchurl, stdenv, python2, makeWrapper, lib -, SDL, ghostscript, pdftk, dejavu_fonts }: - -let - version = "0.12.1"; - pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); -in stdenv.mkDerivation { - # This project was formerly known as KeyJNote. - # See http://keyj.emphy.de/apple-lawsuit/ for details. - - pname = "impressive"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pythonEnv ]; - - configurePhase = '' - # Let's fail at build time if the library we're substituting in doesn't - # exist/isn't marked as executable - test -x ${SDL}/lib/libSDL.so - sed -i "impressive.py" \ - -e '/^__website__/a SDL_LIBRARY = "${SDL}/lib/libSDL.so"' \ - -e 's/sdl = CDLL.*/sdl = CDLL(SDL_LIBRARY)/' \ - -e 's^FontPath =.*/usr/.*$^FontPath = ["${dejavu_fonts}/share/fonts", ""]^' - ''; - - installPhase = '' - mkdir -p "$out/bin" "$out/share/doc/impressive" "$out/share/man/man1" - mv impressive.py "$out/bin/impressive" - mv impressive.1 "$out/share/man/man1" - mv changelog.txt impressive.html license.txt "$out/share/doc/impressive" - - wrapProgram "$out/bin/impressive" \ - --prefix PATH ":" "${ghostscript}/bin:${pdftk}/bin" - ''; - - meta = { - description = "Impressive, an effect-rich presentation tool for PDFs"; - - longDescription = '' - Impressive is a program that displays presentation slides. - But unlike OpenOffice.org Impress or other similar - applications, it does so with style. Smooth alpha-blended - slide transitions are provided for the sake of eye candy, but - in addition to this, Impressive offers some unique tools that - are really useful for presentations. Read below if you want - to know more about these features. - - Creating presentations for Impressive is very simple: You just - need to export a PDF file from your presentation software. - This means that you can create slides in the application of - your choice and use Impressive for displaying them. If your - application does not support PDF output, you can alternatively - use a set of pre-rendered image files – or you use Impressive - to make a slideshow with your favorite photos. - ''; - - homepage = "http://impressive.sourceforge.net/"; - - license = lib.licenses.gpl2; - - maintainers = with lib.maintainers; [ lheckemann ]; - platforms = lib.platforms.mesaPlatforms; - }; - } diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index 0b4ce74cdf..964d17587a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -2,12 +2,12 @@ , zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { - version = "5.1"; + version = "5.5"; pname = "jabref"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz"; - sha256 = "04f612byrq3agzy26byg1sgrjyhcpa8xfj0ssh8dl8d8vnhx9742"; + sha256 = "sha256-9MHNehyAmu7CiBp1rgb4zTkSqmjXm2tcmiGKFBFapKI="; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix index c983787d23..678c3bb357 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.10.0"; - _build = "480"; + _version = "2.10.1"; + _build = "482"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "0rzhbskzzvr9aan6fwxd2kmzg79ranx7aym5yn1i37z3ra67d1nz"; + sha256 = "0pzcfqsf7flzipwivpinpkfb2xisand1sfjm00wif4pyj3f4qfh1"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli r3dl3g ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/darwin.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/darwin.nix new file mode 100644 index 0000000000..765cbcd430 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/darwin.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchurl +, undmg +}: + +let + appName = "LibreOffice.app"; + version = "7.2.5"; + dist = { + aarch64-darwin = { + arch = "aarch64"; + sha256 = "bdbcb9a98211f866ca089d440aebcd1d313aa99e8ab4104aae4e65ea3cee74ca"; + }; + + x86_64-darwin = { + arch = "x86_64"; + sha256 = "0b7ef18ed08341ac6c15339fe9a161ad17f6b469009d987cfc7d50c628d12a4e"; + }; + }."${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation { + inherit version; + pname = "libreoffice"; + src = fetchurl { + url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${dist.arch}/LibreOffice_${version}_MacOS_${dist.arch}.dmg"; + inherit (dist) sha256; + }; + + nativeBuildInputs = [ undmg ]; + sourceRoot = "${appName}"; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstallPhase + mkdir -p $out/{Applications/${appName},bin} + cp -R . $out/Applications/${appName} + ln -s $out/Applications/${appName}/Contents/MacOS/soffice $out/bin + runHook postInstallPhase + ''; + + meta = with lib; { + description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; + homepage = "https://libreoffice.org/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ tricktron ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix new file mode 100644 index 0000000000..bfe72a7115 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: + +stdenv.mkDerivation rec { + pname = "morgen"; + version = "2.4.3"; + + src = fetchurl { + url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; + sha256 = "sha256-IWGeb0+IiFNYJ+jQAzGYfQ5FnrbR6HIpynS9jgd5/mY="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + nodePackages.asar + ]; + + buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + + dontBuild = true; + dontConfigure = true; + + unpackCmd = '' + dpkg-deb -x ${src} ./morgen-${pname} + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + asar extract $out/opt/Morgen/resources/app.asar "$TMP/work" + # 1. Fixes path for todesktop-runtime-config.json + # 2. Fixes startup script + substituteInPlace $TMP/work/dist/main.js \ + --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \ + --replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen" + asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar + + substituteInPlace $out/share/applications/morgen.desktop \ + --replace '/opt/Morgen' $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/morgen \ + --add-flags $out/opt/Morgen/resources/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "All-in-one Calendars, Tasks and Scheduler"; + homepage = "https://morgen.so/download"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index c6ee045dfb..7cac4baefa 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.1.9"; + version = "22.2.2"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "sha256-vUYfZpqOe7cZJxrNPXN2gCyNRNqC2/NA83+UCL9+mq0="; + sha256 = "sha256-b2yoy1WhnPTE2fNeHVvkwKLzjeaSBhHiQgSZ9VHwkGY="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix b/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix index 6aed41d7f9..21adb90cab 100644 --- a/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix +++ b/third_party/nixpkgs/pkgs/applications/office/scribus/unstable.nix @@ -83,6 +83,11 @@ mkDerivation rec { qttools ]; + cmakeFlags = [ + # poppler uses std::optional + "-DWANT_CPP17=ON" + ]; + meta = with lib; { maintainers = with maintainers; [ erictapen diff --git a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix index 506a2f99f6..3958d28709 100644 --- a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.26.1"; + version = "2.27.0"; src = fetchurl { url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "sha256-66hoA+FDTeMbNAInr9TlTSnwUywJQjTRz87MkdNYn5Q="; + sha256 = "sha256-xkl0UyJEDOeYOqqXf3woCDMb8ZyC2c5ChQdDFFERZxE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix index d9f77cb560..ccb4cea95e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.10.0"; + version = "7.10.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-Aa0orJpsin7XntUVpW6VLcbGiTSeyySDCGNFOERtgvg="; + sha256 = "sha256-jhCsC5G8epyclp2+DYpot1UMjo5mkMa0UO0bQZ1T0Ug="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/timekeeper/default.nix b/third_party/nixpkgs/pkgs/applications/office/timekeeper/default.nix deleted file mode 100644 index ba9390251f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/timekeeper/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, fetchFromGitHub -, poco -, pkg-config -, gnome2 -, gtkmm2 -, lib -}: - -stdenv.mkDerivation rec { - pname = "timekeeper"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "bburdette"; - repo = "TimeKeeper"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "03rvzkygnn7igcindbb5bcmfy0l83n0awkzprsnhlb6ndxax3k9w"; - }; - - nativeBuildInputs = [ - poco - pkg-config - ]; - - buildInputs = [ - gtkmm2 - gnome2.libglademm - gnome2.libglade - ]; - - installPhase = '' - install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper - ''; - - meta = with lib; { - description = "Log hours worked and make reports"; - homepage = "https://github.com/bburdette/TimeKeeper"; - maintainers = with maintainers; [ bburdette ]; - platforms = [ "x86_64-linux" ]; - license = licenses.bsd3; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 0cb26afe82..7b2635cfe1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -1,13 +1,14 @@ diff --git a/src/services/log.js b/src/services/log.js -index 4f29994..1e89e0a 100644 +index 0fcd9812..dcbff070 100644 --- a/src/services/log.js +++ b/src/services/log.js -@@ -1,14 +1,5 @@ +@@ -1,15 +1,7 @@ "use strict"; -const fs = require('fs'); -const dataDir = require('./data_dir'); -- + const cls = require('./cls'); + -if (!fs.existsSync(dataDir.LOG_DIR)) { - fs.mkdirSync(dataDir.LOG_DIR, 0o700); -} @@ -17,7 +18,7 @@ index 4f29994..1e89e0a 100644 const SECOND = 1000; const MINUTE = 60 * SECOND; const HOUR = 60 * MINUTE; -@@ -16,45 +7,7 @@ const DAY = 24 * HOUR; +@@ -17,38 +9,6 @@ const DAY = 24 * HOUR; const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n'; @@ -54,6 +55,12 @@ index 4f29994..1e89e0a 100644 -} - function log(str) { + const bundleNoteId = cls.get("bundleNoteId"); + +@@ -56,12 +16,6 @@ function log(str) { + str = `[Script ${bundleNoteId}] ${str}`; + } + - let millisSinceMidnight = Date.now() - todaysMidnight.getTime(); - - millisSinceMidnight = checkDate(millisSinceMidnight); @@ -63,41 +70,3 @@ index 4f29994..1e89e0a 100644 console.log(str); } -@@ -83,37 +36,6 @@ function request(req, res, timeMs, responseLength = "?") { - `${res.statusCode} ${req.method} ${req.url} with ${responseLength} bytes took ${timeMs}ms`); - } - --function pad(num) { -- num = Math.floor(num); -- -- return num < 10 ? ("0" + num) : num.toString(); --} -- --function padMilli(num) { -- if (num < 10) { -- return "00" + num; -- } -- else if (num < 100) { -- return "0" + num; -- } -- else { -- return num.toString(); -- } --} -- --function formatTime(millisSinceMidnight) { -- return pad(millisSinceMidnight / HOUR) -- + ":" + pad((millisSinceMidnight % HOUR) / MINUTE) -- + ":" + pad((millisSinceMidnight % MINUTE) / SECOND) -- + "." + padMilli(millisSinceMidnight % SECOND); --} -- --function formatDate() { -- return pad(todaysMidnight.getFullYear()) -- + "-" + pad(todaysMidnight.getMonth() + 1) -- + "-" + pad(todaysMidnight.getDate()); --} -- - module.exports = { - info, - error, diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index 39bb5d1bf1..fd317b8481 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.49.5"; + version = "0.50.1"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0bis0xkpcr8rvhm9364v0np5cnvkscv2fgl90f455lcwy7kk9m12"; + sha256 = "1fb491ld3z6b2cndy8nl7zhpdsbb2v6kkrrc0hv92zm9qnfp7a99"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1wv9xz1asjadz1jzgpaxf6lzbj5azgsq0qpawp3y257h488r1z9k"; + sha256 = "1yfj1i5hsphp1y52rgsapqmmv7cvl4imf6dkv8fp3qx5i7j4y5j9"; }; in { diff --git a/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix b/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix index 435474fbdc..f548cf01fc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix @@ -8,14 +8,14 @@ mkDerivation rec { pname = "vnote"; - version = "3.12.0"; + version = "3.12.888"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-hlB/G7qFYbkdIk9f2N+q1Do3V1ON8UUQZ6AUmBfK8x0="; + sha256 = "sha256-l9oFixyEM0aAfvrC5rrQMzv7n8rUHECRzhuIQJ/szjc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix b/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix index 57947e23ba..047d64c411 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "zanshin"; - version = "21.12.0"; + version = "21.12.1"; src = fetchurl { url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz"; - sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0="; + sha256 = "sha256-hYbJwmnD9i/SL5ET2t9YgPxJHJUpAbMZ4a62WljhpHw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix index b369a5475e..43cf58db25 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix @@ -7,6 +7,7 @@ , libsndfile , lpcnetfreedv , portaudio +, pulseaudio , speexdsp , hamlib , wxGTK31-gtk3 @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - sha256 = "1dzhf944vgla9a5ilcgwivhzgdbfaknqnwbpb071a0rz8rajnv0q"; + hash = "sha256-0E7r/7+AQRPIFAcE6O1WE0NYiKzAlBR0jKbssqWvRMU="; }; nativeBuildInputs = [ cmake ]; @@ -29,16 +30,15 @@ stdenv.mkDerivation rec { libsamplerate libsndfile lpcnetfreedv - portaudio speexdsp hamlib wxGTK31-gtk3 - ]; + ] ++ (if stdenv.isLinux then [ pulseaudio ] else [ portaudio ]); cmakeFlags = [ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" - ]; + ] ++ lib.optionals stdenv.isLinux [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; meta = with lib; { homepage = "https://freedv.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index 3e1366547e..2865e8b70a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "0"; + minor = "1"; patch = "0"; } }: let - sourceSha256 = "sha256-1K8nlNiirks3MJ+9cH9bkILVFtu5OxhKkNhetGqojn4="; + sourceSha256 = "sha256-bU6z7H08G8QIToogAMI2P5tHBtVZezlBDqSbnEsqAjE="; featuresInfo = { # Needed always basic = { diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index 2ba3794003..2f66de6342 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "6.17.2"; + version = "6.18.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-sMD2JTJJlssMdXCUHdFYjEqGknhGGuG4szfnvFFN7t4="; + sha256 = "sha256-gf+RUOcki0pi3UH4NHFsmbTV04HUG16UC4jcUjyeip4="; fetchSubmodules = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix index d557f32bb6..fb5cce02bd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { pname = "gravit"; version = "0.5.1"; - src = fetchurl { - url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz"; - sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; + src = fetchFromGitHub { + owner = "gak"; + repo = pname; + rev = version; + hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM="; }; buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; @@ -23,9 +25,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "https://gravit.slowchop.com"; + homepage = "https://github.com/gak/gravit"; description = "Beautiful OpenGL-based gravity simulator"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix index 818d0fe14b..1702079e01 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2B6w6c/qztyBb1jNA0zg+udQm41ouT1DyB6Ygpi5nC8="; + sha256 = "sha256-xCsTkQXrZS+Njn0YfidhPln+OwVfTXOqbtB0dCfTP2U="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix index ab8e26f92a..67c39031b7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graph based aligner"; - license = licenses.gpl3; - homepage = "https://ccb.jhu.edu/software/hisat2/index.shtml"; + license = licenses.gpl3Plus; + homepage = "https://daehwankimlab.github.io/hisat2/"; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix index 203d052066..156f551612 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kallisto"; - version = "0.46.2"; + version = "0.48.0"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "0m0r2820ca3rch99md1zzbgkilmlfkhdkpys2lfnb87qxmf1jnmb"; + sha256 = "sha256-r0cdR0jTRa1wu/LDKW6NdxI3XaKj6wcIVbIlct0fFvI="; }; nativeBuildInputs = [ autoconf cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix new file mode 100644 index 0000000000..5966c83b7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/repseek/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "repseek"; + version = "9Sep2014"; + src = fetchurl { + url = "https://bioinfo.mnhn.fr/abi/public/RepSeek/RepSeek.${version}.tgz"; + sha256 = "1jiknji3ivrv7zmrfbf2mccfpdwhin3lfxfsciaqwf69b3sda8nf"; + }; + + preConfigure = '' + mkdir -p $out/bin + substituteInPlace Makefile \ + --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \ + --replace "CC= gcc" "CC = $CC" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX" + ''; + + meta = { + description = "Tool to retrieve approximate repeats from large DNA sequences"; + homepage = "https://bioinfo.mnhn.fr/abi/public/RepSeek"; + maintainers = [ lib.maintainers.bzizou ]; + license = lib.licenses.lgpl21; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix index 909a3ec767..cf135b9469 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf flex ]; buildInputs = [ xorgproto motif libX11 libXt libXpm bison ]; + # Disable parallel build, errors: + # ./pat_decl_y.y:736:5: error: expected '=', ... + enableParallelBuilding = false; + ALLIANCE_TOP = placeholder "out"; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix index 8ea75a3ec4..94457c81ce 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Schematic editor and PCB layout tool from CadSoft"; - homepage = "http://www.cadsoftusa.com/"; + homepage = "https://www.autodesk.com/products/eagle/overview"; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; 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 159e15cf24..5ee89dfa8c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -1,25 +1,31 @@ -{ lib, stdenv, fetchurl -, perl, flex, bison, python3 +{ lib, stdenv, fetchFromGitHub +, perl, flex, bison, python3, autoconf }: stdenv.mkDerivation rec { pname = "verilator"; - version = "4.210"; + version = "4.218"; - src = fetchurl { - url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "sha256-KoIfJeV2aITnwiB2eQgQo4ZyXfMe6erFiGKXezR+IBg="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FukC60z7Y3bb3I/dgzqCh6kFP6DDBOGi0M8IIZ50P3g="; }; enableParallelBuilding = true; buildInputs = [ perl ]; - nativeBuildInputs = [ flex bison python3 ]; + nativeBuildInputs = [ flex bison python3 autoconf ]; # these tests need some interpreter paths patched early on... # see https://github.com/NixOS/nix/issues/1205 doCheck = false; checkTarget = "test"; + preConfigure = '' + autoconf + ''; + postPatch = '' patchShebangs \ src/flexfix \ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix new file mode 100644 index 0000000000..72e412fc3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, ocamlPackages }: + +ocamlPackages.buildDunePackage rec { + pname = "anders"; + version = "1.1.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "groupoid"; + repo = "anders"; + rev = "${version}"; + sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4="; + }; + + buildInputs = with ocamlPackages; [ zarith menhir ]; + + meta = with lib; { + description = "Modal Homotopy Type System"; + homepage = "https://homotopy.dev/"; + license = licenses.isc; + maintainers = [ maintainers.suhr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 6d38d2a650..fe99b04551 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -204,5 +204,6 @@ self = stdenv.mkDerivation { branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; platforms = platforms.unix; + mainProgram = "coqide"; }; }; in self diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix index e9b0cc7540..769fe6aff2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix @@ -1,62 +1,105 @@ { lib, stdenv , fetchurl -, unzip , jdk -, ant +, gradle_7 +, perl , jre , makeWrapper +, makeDesktopItem +, copyDesktopItems , testVersion , key }: -# get this from the download URL when changing version -let gitRevision = "7d3deab0763c88edee4f7a08e604661e0dbdd450"; - -in stdenv.mkDerivation rec { +let pname = "key"; - version = "2.6.3"; - + version = "2.10.0"; src = fetchurl { - url = "https://formal.iti.kit.edu/key/releases/${version}/key-src-${version}_${gitRevision}.zip"; - sha256 = "1dr5jmrqs0iy76wdsfiv5hx929i24yzm1xypzqqvx7afc7apyawy"; + url = "https://www.key-project.org/dist/${version}/key-${version}-sources.tgz"; + sha256 = "1f201cbcflqd1z6ysrkh3mff5agspw3v74ybdc3s2lfdyz3b858w"; }; + sourceRoot = "key-${version}/key"; - sourceRoot = "key"; + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src sourceRoot; + nativeBuildInputs = [ gradle_7 perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + gradle --no-daemon classes testClasses + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashMode = "recursive"; + outputHash = "sha256-1TWySkS8w7L6Q+V946kcLOnM4hL3fieFvLrF5BZAlh4="; + }; +in stdenv.mkDerivation rec { + inherit pname version src sourceRoot; nativeBuildInputs = [ - unzip jdk - ant + gradle_7 makeWrapper + copyDesktopItems ]; - buildPhase = '' - ant -buildfile scripts/build.xml \ - -Dgit.revision=${gitRevision} \ - compileAll deployAll - ''; + executable-name = "KeY"; - postCheck = '' - ant -buildfile scripts/build.xml \ - -Dgit.revision=${gitRevision} \ - compileAllTests runAllTests test-deploy-all + desktopItems = [ + (makeDesktopItem { + name = "KeY"; + exec = executable-name; + icon = "key"; + comment = meta.description; + desktopName = "KeY"; + genericName = "KeY"; + categories = "Science;"; + }) + ]; + + # disable tests (broken on darwin) + gradleAction = if stdenv.isDarwin then "assemble" else "build"; + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + # point to offline repo + sed -ie "s#repositories {#repositories { maven { url '${deps}' }#g" build.gradle + cat <(echo "pluginManagement { repositories { maven { url '${deps}' } } }") settings.gradle > settings_new.gradle + mv settings_new.gradle settings.gradle + gradle --offline --no-daemon ${gradleAction} + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/java - # Wrong version in the code. On next version change 2.5 to ${version}: - unzip deployment/key-2.5_${gitRevision}.zip -d $out/share/java + cp key.ui/build/libs/key-*-exe.jar $out/share/java/KeY.jar mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/256x256/apps + cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png makeWrapper ${jre}/bin/java $out/bin/KeY \ --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" + + runHook postInstall ''; passthru.tests.version = testVersion { package = key; command = "KeY --help"; - # Wrong '2.5' version in the code. On next version change to ${version} - version = "2.5"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index c9ba47eca1..806a3c34df 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.38.0"; + version = "3.39.1"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a8cf8a0c9ea19a633baeb3aa7e8d706b86c2c0f9"; - sha256 = "14dam91pnn266fgii5c2j5p9p2i31bghx0s2h3qnnqyvxi4s5isx"; + rev = "1781ded0d0062f40a7eaf3ead8dcbef4429c6321"; + sha256 = "0xdpbfjfa1q4cnf87nl7l760ivr4agpqmy3i1f2b132sgbjzm1xx"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 7e9b322b41..8dd55efaeb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "8.11.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; rev = version; - sha256 = "sha256-F3la4n1ULMN2nktr+PVWFPl3V2RfCowR0ozL+dnbhgA="; + sha256 = "sha256-ZUurY2bmTKKIW4GR4oiIpLxb6DSRUNJI/EyNSOu9D9c="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix deleted file mode 100644 index 1078be99c3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, pkg-config -, autoreconfHook -, gnome2 -, gtk2 -, glib -, libtifiles2 -, libticables2 -, libticalcs2 -, libticonv -}: - -stdenv.mkDerivation rec { - pname = "gfm"; - version = "1.08"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9"; - }; - - patches = fetchpatch { - name = "remove-broken-kde-support.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm"; - sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - gtk2 - gnome2.libglade - glib - libtifiles2 - libticables2 - libticalcs2 - libticonv - ]; - - NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2"; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files"; - homepage = "http://lpg.ticalc.org/prj_gfm/index.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix index 22d1c92e1e..78943457d3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "NbWXMash0pK7Y9gOEBbL7zXjFytoeZBN9/wIbRTvQ8g="; + sha256 = "sha256-sfUcBSUYf/+neBAhEd5LAtMOfIbdXM/ieUOztjk8Pwg="; }; 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 e9dae55fba..2066087692 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix @@ -14,13 +14,17 @@ let # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; - inherit sage-src env-locations pynac singular; + inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; - sage_docbuild = self.callPackage ./sage_docbuild.nix { + sage-docbuild = self.callPackage ./python-modules/sage-docbuild.nix { + inherit sage-src; + }; + + sage-setup = self.callPackage ./python-modules/sage-setup.nix { inherit sage-src; }; }; @@ -58,9 +62,9 @@ let # the env-locations file. sage-env = callPackage ./sage-env.nix { sagelib = python3.pkgs.sagelib; - sage_docbuild = python3.pkgs.sage_docbuild; + sage-docbuild = python3.pkgs.sage-docbuild; inherit env-locations; - inherit python3 singular palp flint pynac pythonEnv maxima; + inherit python3 singular palp flint pythonEnv maxima; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -74,7 +78,7 @@ let sage-with-env = callPackage ./sage-with-env.nix { inherit python3 pythonEnv; inherit sage-env; - inherit pynac singular maxima; + inherit singular maxima; inherit three; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -91,7 +95,7 @@ let pythonRuntimeDeps = with python3.pkgs; [ sagelib - sage_docbuild + sage-docbuild cvxopt networkx service-identity @@ -132,9 +136,6 @@ let }; }; - # *not* to confuse with the python package "pynac" - pynac = pkgs.pynac.override { inherit singular flint; }; - # With openblas (64 bit), the tests fail the same way as when sage is build with # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch new file mode 100644 index 0000000000..a478f50d92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch @@ -0,0 +1,46 @@ +diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py +index 01f32fb8e4..4d83dc7b47 100644 +--- a/src/sage/doctest/control.py ++++ b/src/sage/doctest/control.py +@@ -1253,6 +1253,7 @@ class DocTestController(SageObject): + + self.log("Using --optional=" + self._optional_tags_string()) + available_software._allow_external = self.options.optional is True or 'external' in self.options.optional ++ available_software._autodetect_safe = self.options.optional is True or 'sage' in self.options.optional + self.log("Features to be detected: " + ','.join(available_software.detectable())) + self.add_files() + self.expand_files_into_sources() +diff --git a/src/sage/doctest/external.py b/src/sage/doctest/external.py +index 84dae19ea5..badc61466e 100644 +--- a/src/sage/doctest/external.py ++++ b/src/sage/doctest/external.py +@@ -409,6 +409,7 @@ class AvailableSoftware(object): + [] + """ + self._allow_external = True ++ self._autodetect_safe = True + # For multiprocessing of doctests, the data self._seen should be + # shared among subprocesses. Thus we use Array class from the + # multiprocessing module. +@@ -430,6 +431,8 @@ class AvailableSoftware(object): + sage: 'internet' in available_software # random, optional - internet + True + """ ++ if not self._autodetect_safe: ++ return False + try: + idx = self._indices[item] + except KeyError: +diff --git a/src/sage/features/sagemath.py b/src/sage/features/sagemath.py +index 433338766d..233623b14a 100644 +--- a/src/sage/features/sagemath.py ++++ b/src/sage/features/sagemath.py +@@ -12,7 +12,7 @@ class sagemath_doc_html(StaticFile): + + EXAMPLES:: + +- sage: from sage.features.sagemath import sagemath_doc_html ++ sage: from sage.features.sagemath import sagemath_doc_html # optional - sagemath_doc_html + sage: sagemath_doc_html().is_present() # optional - sagemath_doc_html + FeatureTestResult('sagemath_doc_html', True) + """ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch deleted file mode 100644 index d5c19a54fd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f5ea42a7aaed7611fb55b65897b9fcf2b7bcf97e Mon Sep 17 00:00:00 2001 -From: Timo Kaufmann -Date: Sun, 21 Oct 2018 17:52:40 +0200 -Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested - ---- - src/sage/doctest/control.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index 2d93841e50..6d156e29a1 100644 ---- a/src/sage/doctest/control.py -+++ b/src/sage/doctest/control.py -@@ -375,7 +375,8 @@ class DocTestController(SageObject): - if not optionaltag_regex.search(o): - raise ValueError('invalid optional tag {!r}'.format(o)) - -- options.optional |= auto_optional_tags -+ if "sage" in options.optional: -+ options.optional |= auto_optional_tags - - self.options = options - --- -2.28.0 - diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch index 178cef3e54..90a23f94cb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch @@ -1,8 +1,8 @@ diff --git a/src/sage/env.py b/src/sage/env.py -index 95980cc2df..37107a30e1 100644 +index c4953cfa65..47b880f9ad 100644 --- a/src/sage/env.py +++ b/src/sage/env.py -@@ -227,93 +227,12 @@ OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "") +@@ -244,81 +244,8 @@ os.environ['MPMATH_SAGE'] = '1' SAGE_BANNER = var("SAGE_BANNER", "") SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes") @@ -29,20 +29,12 @@ index 95980cc2df..37107a30e1 100644 - - EXAMPLES:: - -- sage: import sys -- sage: from fnmatch import fnmatch - sage: from sage.env import _get_shared_lib_path -- sage: lib_filename = _get_shared_lib_path("Singular", "singular-Singular") -- sage: if sys.platform == 'cygwin': -- ....: pattern = "*/cygSingular-*.dll" -- ....: elif sys.platform == 'darwin': -- ....: pattern = "*/libSingular-*.dylib" -- ....: else: -- ....: pattern = "*/lib*Singular-*.so" -- sage: fnmatch(str(lib_filename), pattern) +- sage: "gap" in _get_shared_lib_path("gap") - True - sage: _get_shared_lib_path("an_absurd_lib") is None - True +- - """ - - for libname in libnames: @@ -87,11 +79,6 @@ index 95980cc2df..37107a30e1 100644 - # Just return None if no files were found - return None - - # locate singular shared object - # On Debian it's libsingular-Singular so try that as well --SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular")) -+SINGULAR_SO = var("SINGULAR_SO", '/default') - # locate libgap shared object -GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", "")) +GAP_SO = var("GAP_SO", '/default') diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch deleted file mode 100644 index 93c03a04dd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst -index 337457afef..f7c76f4b56 100644 ---- a/src/doc/en/prep/Advanced-2DPlotting.rst -+++ b/src/doc/en/prep/Advanced-2DPlotting.rst -@@ -695,6 +695,8 @@ by the cells. - - sage: pdf_savename = name+'.pdf' - sage: p.save(pdf_savename) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Notably, we can export in formats ready for inclusion in web pages. - -diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py -index 8680a1c9b1..e83763b678 100644 ---- a/src/sage/plot/disk.py -+++ b/src/sage/plot/disk.py -@@ -156,6 +156,8 @@ class Disk(GraphicPrimitive): - sage: f = tmp_filename(ext='.pdf') - sage: p = disk((0,0), 5, (0, pi/4), alpha=0.5) - sage: p.save(f) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - """ - import matplotlib.patches as patches -diff --git a/src/sage/plot/text.py b/src/sage/plot/text.py -index 04cbdedf76..a970f97b79 100644 ---- a/src/sage/plot/text.py -+++ b/src/sage/plot/text.py -@@ -325,6 +325,8 @@ def text(string, xy, **options): - You can save text as part of PDF output:: - - sage: text("sage", (0,0), rgbcolor=(0,0,0)).save(os.path.join(SAGE_TMP, 'a.pdf')) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Some examples of bounding box:: - diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch new file mode 100644 index 0000000000..91e080aa29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch @@ -0,0 +1,58 @@ +diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd +index 7794c9edc3..1753277b1f 100644 +--- a/src/sage/libs/linbox/conversion.pxd ++++ b/src/sage/libs/linbox/conversion.pxd +@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in + - v -- linbox vector + """ + cdef Vector_integer_dense res = P() +- cdef cppvector[Integer] * vec = &v.refRep() + cdef size_t i + for i in range( res._degree): +- mpz_set(res._entries[i], vec[0][i].get_mpz_const()) ++ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const()) + + return res +diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd +index 9112d151f8..dcc482960c 100644 +--- a/src/sage/libs/linbox/linbox.pxd ++++ b/src/sage/libs/linbox/linbox.pxd +@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": + ctypedef Modular_double Field + ctypedef double Element + DenseMatrix_Modular_double(Field F, size_t m, size_t n) +- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n) ++ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*) + void setEntry(size_t i, size_t j, Element& a) + Element &getEntry(size_t i, size_t j) + +@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": + ctypedef Modular_float Field + ctypedef float Element + DenseMatrix_Modular_float(Field F, size_t m, size_t n) +- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n) ++ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*) + void setEntry(size_t i, size_t j, Element& a) + Element &getEntry(size_t i, size_t j) + +@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h": + DenseVector_integer (Field &F) + DenseVector_integer (Field &F, long& m) + DenseVector_integer (Field &F, cppvector[Integer]&) +- cppvector[Element]& refRep() + size_t size() + void resize(size_t) + void resize(size_t n, const Element&) +diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi +index 010365d76f..3d60726ff9 100644 +--- a/src/sage/matrix/matrix_modn_dense_template.pxi ++++ b/src/sage/matrix/matrix_modn_dense_template.pxi +@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_ + return 0,[] + + cdef ModField *F = new ModField(modulus) +- cdef DenseMatrix *A = new DenseMatrix(F[0], entries,nrows, ncols) ++ cdef DenseMatrix *A = new DenseMatrix(F[0], nrows, ncols, entries) + cdef Py_ssize_t r = reducedRowEchelonize(A[0]) + cdef Py_ssize_t i,j + for i in range(nrows): diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 3c64be100d..1ff081b25e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,8 +1,8 @@ diff --git a/src/sage_docbuild/__init__.py b/src/sage_docbuild/__init__.py -index 79005b903a..fbe6fe2595 100644 +index 8a5c1a19d2..21fd192642 100644 --- a/src/sage_docbuild/__init__.py +++ b/src/sage_docbuild/__init__.py -@@ -85,27 +85,6 @@ def builder_helper(type): +@@ -89,27 +89,6 @@ def builder_helper(type): """ Returns a function which builds the documentation for output type ``type``. @@ -12,7 +12,7 @@ index 79005b903a..fbe6fe2595 100644 - Check that :trac:`25161` has been resolved:: - - sage: from sage_docbuild import DocBuilder, setup_parser -- sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set +- sage: DocBuilder._options = setup_parser().parse_args([]) # builder_helper needs _options to be set - - sage: import sage_docbuild.sphinxbuild - sage: def raiseBaseException(): @@ -30,7 +30,7 @@ index 79005b903a..fbe6fe2595 100644 """ def f(self, *args, **kwds): output_dir = self._output_dir(type) -@@ -127,10 +106,9 @@ def builder_helper(type): +@@ -131,10 +110,9 @@ def builder_helper(type): logger.debug(build_command) # Run Sphinx with Sage's special logger @@ -44,10 +44,10 @@ index 79005b903a..fbe6fe2595 100644 if ABORT_ON_ERROR: raise diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py -index f58f6c61d7..ef51a55411 100644 +index d917c3e9d4..551cc8028a 100644 --- a/src/sage_docbuild/sphinxbuild.py +++ b/src/sage_docbuild/sphinxbuild.py -@@ -326,3 +326,8 @@ def runsphinx(): +@@ -327,3 +327,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix new file mode 100644 index 0000000000..1766cec3e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, sage-src +, sphinx +}: + +buildPythonPackage rec { + version = src.version; + pname = "sage-docbuild"; + src = sage-src; + + propagatedBuildInputs = [ + sphinx + ]; + + preBuild = '' + cd pkgs/sage-docbuild + ''; + + doCheck = false; # we will run tests in sagedoc.nix + + meta = with lib; { + description = "Build system of the Sage documentation"; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-setup.nix new file mode 100644 index 0000000000..5034615312 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/python-modules/sage-setup.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, sage-src +, pkgconfig # the python module, not the pkg-config alias +}: + +buildPythonPackage rec { + version = src.version; + pname = "sage-setup"; + src = sage-src; + + buildInputs = [ + pkgconfig + ]; + + preBuild = '' + cd pkgs/sage-setup + ''; + + doCheck = false; # sagelib depends on sage-setup, but sage-setup's tests depend on sagelib + + meta = with lib; { + description = "Build system of the Sage library"; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix index ae0b9f7453..e680c0c3b2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix @@ -2,7 +2,7 @@ , lib , writeTextFile , sagelib -, sage_docbuild +, sage-docbuild , env-locations , gfortran , bash @@ -45,11 +45,10 @@ , flint , gmp , mpfr -, pynac , zlib , gsl , ntl -, jdk8 +, jdk , less }: @@ -60,8 +59,6 @@ assert (!blas.isILP64) && (!lapack.isILP64); # dependencies. let - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - runtimepath = (lib.makeBinPath ([ "@sage-local@" "@sage-local@/build" @@ -163,7 +160,6 @@ writeTextFile rec { gmp mpfr pari - pynac zlib eclib gsl @@ -179,7 +175,6 @@ writeTextFile rec { glpk flint gap - pynac mpfr.dev ]) }' @@ -193,5 +188,5 @@ writeTextFile rec { ''; } // { # equivalent of `passthru`, which `writeTextFile` doesn't support lib = sagelib; - docbuild = sage_docbuild; + docbuild = sage-docbuild; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index eb07434b4c..95b01d9f3f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -57,24 +57,29 @@ let ); in stdenv.mkDerivation rec { - version = "9.4"; + version = "9.5"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-jqkr4meG02KbTCMsGvyr1UbosS4ZuUJhPXU/InuS+9A="; + sha256 = "sha256-uOsLpsGpcIGs8Xr82X82MElnTB2E908gytyNJ8WVD5w="; }; # Patches needed because of particularities of nix or the way this is packaged. # The goal is to upstream all of them and get rid of this list. nixPatches = [ - # Make sure py2/py3 tests are only run when their expected context (all "sage" - # tests) are also run. That is necessary to test dochtml individually. See - # https://trac.sagemath.org/ticket/26110 for an upstream discussion. - # TODO: Determine if it is still necessary. - ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch + # Since https://trac.sagemath.org/ticket/32174, some external features are + # marked as "safe" and get auto-detected, in which case the corresponding + # optional tests are executed. We disable auto-detection of safe features if + # we are doctesting with an "--optional" argument which does not include + # "sage", because tests from autodetected features expect context provided + # by running basic sage tests. This is necessary to test sagemath_doc_html + # separately. See https://trac.sagemath.org/ticket/26110 for a related + # upstream discussion (from the time when Sage still had optional py2/py3 + # tags). + ./patches/Only-test-external-software-when-all-of-sage-is.patch # Fixes a potential race condition which can lead to transient doctest failures. ./patches/fix-ecl-race.patch @@ -109,54 +114,6 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch - # fonttools 4.26.2, used by matplotlib, uses deprecated methods internally. - # This is fixed in fonttools 4.27.0, but since fonttools is a dependency of - # 2000+ packages and DeprecationWarnings are hidden almost everywhere by - # default (not on Sage's doctest harness, though), it doesn't make sense to - # backport the fix (see https://github.com/NixOS/nixpkgs/pull/151415). - # Let's just assume warnings are expected until we update to 4.27.0. - ./patches/fonttools-deprecation-warnings.patch - - # https://trac.sagemath.org/ticket/32305 - (fetchSageDiff { - base = "9.4"; - name = "networkx-2.6-upgrade.patch"; - rev = "9808325853ba9eb035115e5b056305a1c9d362a0"; - sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE="; - }) - - # https://trac.sagemath.org/ticket/32420 - (fetchSageDiff { - base = "9.5.beta2"; - name = "sympy-1.9-update.patch"; - rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8"; - sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE="; - }) - - # https://trac.sagemath.org/ticket/32567 - (fetchSageDiff { - base = "9.5.beta2"; - name = "arb-2.21.0-update.patch"; - rev = "eb3304dd521a3d5a9334e747a08e234bbf16b4eb"; - sha256 = "sha256-XDkaY4VQGyESXI6zuD7nCNzyQOl/fmBFvAESH9+RRvk="; - }) - - # https://trac.sagemath.org/ticket/32797 - (fetchSageDiff { - base = "9.5.beta7"; - name = "pari-2.13.3-update.patch"; - rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732"; - sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw="; - }) - - # https://trac.sagemath.org/ticket/32909 - (fetchSageDiff { - base = "9.5.beta7"; - name = "matplotlib-3.5-deprecation-warnings.patch"; - rev = "a5127dc56fdf5c2e82f6bc781cfe78dbd04e97b7"; - sha256 = "sha256-p23qUu9mgEUbdbX6cy7ArxZAtpcFjCKbgyxN4jWvj1o="; - }) - # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { base = "9.5.beta8"; @@ -164,6 +121,11 @@ stdenv.mkDerivation rec { rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841"; sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q="; }) + + # Upstream has not upgraded to linbox 1.7 yet because it conflicts with + # pre-4.2.1p3 versions of Singular, but we don't have this problem. + # https://trac.sagemath.org/ticket/32959 + ./patches/linbox-1.7-upgrade.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix index b74ec4007e..df3a1467d5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix @@ -18,7 +18,6 @@ , eclib , ntl , ecm -, pynac , pythonEnv }: @@ -36,7 +35,6 @@ let blas lapack singular three - pynac giac gap pari @@ -126,6 +124,10 @@ stdenv.mkDerivation rec { cp -r src/bin "$out/bin" cp -r build/bin "$out/build/bin" + # sage assumes the existence of sage-src-env-config.in means it's being executed in-tree. in this case, it + # adds SAGE_SRC/bin to PATH, breaking our wrappers + rm "$out/bin"/*.in "$out/build/bin"/*.in + cp -f '${sage-env}/sage-env' "$out/bin/sage-env" substituteInPlace "$out/bin/sage-env" \ --subst-var-by sage-local "$out" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix index 106f9eea30..5805a5c7b0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; - license = licenses.gpl2; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; maintainers = teams.sage.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage_docbuild.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage_docbuild.nix deleted file mode 100644 index ed78d46b44..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage_docbuild.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ buildPythonPackage -, sage-src -, sphinx -}: - -buildPythonPackage rec { - version = src.version; - pname = "sage_docbuild"; - src = sage-src; - - propagatedBuildInputs = [ - sphinx - ]; - - preBuild = '' - cd build/pkgs/sage_docbuild/src - ''; - - doCheck = false; # we will run tests in sagedoc.nix -} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix index 6016b3baeb..489fc2edfe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { jmol cddlib ] ++ (with python3.pkgs; [ - sage_docbuild + sage-docbuild psutil future sphinx @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - ${sage-with-env}/bin/sage -t --optional=dochtml --all + ${sage-with-env}/bin/sage -t --optional=sagemath_doc_html --all ''; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix index a884ad8899..8d685c8da6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix @@ -2,6 +2,7 @@ , env-locations , perl , buildPythonPackage +, m4 , arb , blas , lapack @@ -37,7 +38,7 @@ , pkg-config , planarity , ppl -, pynac +, primecountpy , python , ratpoints , readline @@ -49,11 +50,24 @@ , singular , pip , jupyter_core +, sage-setup , libhomfly , libbraiding , gmpy2 , pplpy , sqlite +, jupyter-client +, ipywidgets +, mpmath +, rpy2 +, fpylll +, scipy +, sympy +, matplotlib +, pillow +, ipykernel +, networkx +, sphinx # TODO: this is in setup.cfg, bug should we override it? }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -73,8 +87,10 @@ buildPythonPackage rec { perl jupyter_core pkg-config + sage-setup pip # needed to query installed packages lisp-compiler + m4 ]; buildInputs = [ @@ -116,7 +132,7 @@ buildPythonPackage rec { pari planarity ppl - pynac + primecountpy rankwidth ratpoints singular @@ -130,6 +146,18 @@ buildPythonPackage rec { gmpy2 pplpy sqlite + mpmath + rpy2 + scipy + sympy + matplotlib + pillow + ipykernel + fpylll + networkx + jupyter-client + ipywidgets + sphinx ]; preBuild = '' @@ -148,8 +176,24 @@ buildPythonPackage rec { mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "var/lib/sage/installed" - # src/setup.py should not be used, see https://trac.sagemath.org/ticket/31377#comment:124 - cd build/pkgs/sagelib/src + cd build/pkgs/sagelib + + # some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg + # are generated by the bootstrap script using m4. these can fetch data from + # build/pkgs, either directly or via sage-get-system-packages. + sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt + sed -i 's/, <3.4//' ../rpy2/install-requires.txt + sed -i 's/, <4.3//' ../sphinx/install-requires.txt + sed -i '/sage_conf/d' src/setup.cfg.m4 + sed -i '/sage_conf/d' src/requirements.txt.m4 + for infile in src/*.m4; do + if [ -f "$infile" ]; then + outfile="src/$(basename $infile .m4)" + m4 "$infile" > "$outfile" + fi + done + + cd src ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix index 5dea2c7653..18dba2952c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/scilab-bin/default.nix @@ -3,7 +3,7 @@ let name = "scilab-bin-${ver}"; - ver = "6.0.2"; + ver = "6.1.1"; badArch = throw "${name} requires i686-linux or x86_64-linux"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { if stdenv.hostPlatform.system == "i686-linux" then "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" else if stdenv.hostPlatform.system == "x86_64-linux" then - "05clcdgry90drirl3swbxn5q36fmgknnhs6h5pr7mmrzfr6r818w" + "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk=" else badArch; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix index b543252e87..2371206116 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib -, fetchpatch , autoreconfHook +, buildPackages , sharutils , file , flint @@ -11,6 +11,7 @@ , lrcalc , doxygen , graphviz +, latex2html # upstream generates docs with texinfo 4. later versions of texinfo # use letters instead of numbers for post-appendix chapters, and we # want it to match the upstream format because sage depends on it. @@ -22,66 +23,25 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.2.0p2"; + version = "4.3.0"; - # since the tarball does not contain tests or documentation (and - # there is no separate tests tarball for 4.2.0), we fetch from - # GitHub. + # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { owner = "Singular"; repo = "Singular"; - # 4.2.0p2 is not tagged, but the tarball matches the commit below. - rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8"; - sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8="; - - # if a release is tagged it will be in the format below. - # rev = "Release${lib.replaceStrings ["."] ["-"] version}"; + # if a release is tagged (which sometimes does not happen), it will + # be in the format below. + # rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; + rev = "d895b0f1f543c61eb03adddad20f08655a419d4e"; + sha256 = "sha256-c5Qr6VUuPKjfw8fowjJJz3oGAyUwo/K0WeMvU5djzVA="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are - # not included in the tarball downloaded by fetchzip. setting - # fetchSubmodules works around this by using fetchgit instead of - # fetchzip. - fetchSubmodules = true; + # not included in the tarball downloaded by fetchzip. + forceFetchGit = true; }; - patches = [ - # fix timeouts when docbuilding with >= 64 cpus - # https://github.com/Singular/Singular/issues/1117 - ./vspace-MAX_PROCESS.patch - - # add aarch64 support to cpu-check.m4. copied from redhat. - ./redhat-aarch64.patch - - # the newest version of ax-prog-cc-for-build.m4 seems to trigger - # linker errors. see - # https://github.com/alsa-project/alsa-firmware/issues/3 for a - # related issue. - ./use-older-ax-prog-cc-for-build.patch - - # https://github.com/Singular/Singular/issues/1086 - (fetchpatch { - name = "schubert-lib-fails-with-too-many-cpus.patch"; - url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch"; - sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA="; - }) - ] ++ lib.optionals enableDocs [ - # singular supports building without 4ti2, bertini, normaliz or - # topcom just fine, but the docbuilding does not skip manual pages - # tagged as depending on those binaries (probably a bug in - # doc2tex.pl::HandleLib, since it seems to ignore "-exclude" - # argumens). skip them manually. - ./disable-docs-for-optional-unpackaged-deps.patch - - # fix some non-ascii characters in doc/decodegb.doc - (fetchpatch { - name = "decodegb-ascii.patch"; - url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch"; - sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw="; - }) - ]; - configureFlags = [ "--with-ntl=${ntl}" "--disable-pyobject-module" @@ -114,6 +74,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableGfanlib [ cddlib ]; + nativeBuildInputs = [ bison perl @@ -123,9 +84,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableDocs [ doxygen graphviz + latex2html texinfo4 texlive.combined.scheme-small ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' find . -type f -readable -writable -exec sed \ @@ -137,21 +100,14 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; - # The Makefile actually defaults to `make install` anyway - buildPhase = '' - # do nothing - ''; - doCheck = true; # very basic checks, does not test any libraries installPhase = '' - mkdir -p "$out" - cp -r Singular/LIB "$out/lib" make install '' + lib.optionalString enableDocs '' - # Sage uses singular.hlp (which is not in the tarball) + # Sage uses singular.info, which is not installed by default mkdir -p $out/share/info - cp doc/singular.hlp $out/share/info + cp doc/singular.info $out/share/info '' + '' # Make sure patchelf picks up the right libraries rm -rf libpolys factory resources omalloc Singular @@ -211,5 +167,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; + mainProgram = "Singular"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch b/third_party/nixpkgs/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch deleted file mode 100644 index 46d92922f3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch +++ /dev/null @@ -1,112 +0,0 @@ -commit 9e8b044d982e132cf35a106a1cc0cf7e77b27f7c -Author: Mauricio Collares -Date: Thu Apr 15 20:33:21 2021 -0300 - - Disable manual sections using optional packages not yet in Nixpkgs - - * normaliz.lib depends on normaliz. - * polymake.lib depends on topcom. - * recover.lib depends on bertini. - * sing4ti2.lib depends on 4ti2. - * tateProdCplxNegGrad.lib uses multigrading.lib, which depends on 4ti2. - -diff --git a/doc/singular.doc b/doc/singular.doc -index 64b969d39..e704f95f0 100644 ---- a/doc/singular.doc -+++ b/doc/singular.doc -@@ -407,7 +407,6 @@ LIB "all.lib"; - * nfmodsyz_lib:: Syzygy modules of submodules of free modules over algebraic number fields - * noether_lib:: Noether normalization of an ideal - * normal_lib:: procedure for normalization --* normaliz_lib:: integral closure, normalization for monomial ideals, toric ideals - * pointid_lib:: factorized lex GB of the vanishing ideal of a set of points - * primdec_lib:: procedures for primary decomposition - * primdecint_lib:: primary decomposition over the integers -@@ -416,7 +415,6 @@ LIB "all.lib"; - * reesclos_lib:: Rees Algebra and integral closure of an ideal - * rstandard_lib:: Janet bases and border bases for ideals - * sagbi_lib:: Subalgebras bases Analogous to Groebner bases for ideals --* sing4ti2_lib:: interface to program 4ti2 - * symodstd_lib:: Groebner bases for symmetric ideals - * toric_lib:: toric ideals - @end menu -@@ -521,10 +519,6 @@ LIB "all.lib"; - @node normal_lib - @subsection normal_lib - @c lib normal.lib --@c --------------------------------------------------------- --@node normaliz_lib --@subsection normaliz_lib --@c lib normaliz.lib tag:normaliz - @c ---------------------------------------------------------- - @node pointid_lib - @subsection pointid_lib -@@ -558,10 +552,6 @@ LIB "all.lib"; - @subsection sagbi_lib - @c lib sagbi.lib - @c --------------------------------------------------------- --@node sing4ti2_lib --@subsection sing4ti2_lib --@c lib sing4ti2.lib tag:sing4ti2 --@c ---------------------------------------------------------- - @node symodstd_lib - @subsection symodstd_lib - @c lib symodstd.lib -@@ -873,7 +863,6 @@ iniD, reslist, sumlist, dividelist, createlist - * solve_lib:: procedures to solve polynomial systems - * triang_lib:: procedures for decomposing zero-dimensional ideals - * ntsolve_lib:: one real solution of polynomial systems (Newton iteration) --* recover_lib:: Hybrid numerical/symbolical algorithms - * rootisolation_lib:: real root isolation with intervals - * signcond_lib:: computing realizable sign conditions - * zeroset_lib:: procedures for roots and factorization -@@ -904,10 +893,6 @@ iniD, reslist, sumlist, dividelist, createlist - @subsection ntsolve_lib - @c lib ntsolve.lib - @c --------------------------------------------------------- --@node recover_lib --@subsection recover_lib --@c lib recover.lib tag:bertini --@c ---------------------------------------------------------- - @node rootisolation_lib - @subsection rootisolation_lib - @c lib rootisolation.lib -@@ -1108,7 +1093,6 @@ but not for serious computations. - * cimonom_lib:: complete intersection for toric ideals - * gfan_lib:: A gfanlib interface for Singular - * gitfan_lib:: Compute GIT-fans --* polymake_lib:: interface to TOPCOM - * realizationMatroids_lib:: Realizability for Tropical Fan Curves - * tropical_lib:: interface to gfan - * tropicalNewton_lib:: Newton polygons in tropical geometry -@@ -1125,10 +1109,7 @@ but not for serious computations. - @node gitfan_lib - @subsection gitfan_lib - @c lib gitfan.lib --@c ---------------------------------------------------------- --@node polymake_lib --@subsection polymake_lib --@c lib polymake.lib tag:topcom -+ - @c ---------------------------------------------------------- - @node realizationMatroids_lib - @subsection realizationMatroids_lib -@@ -1219,7 +1200,6 @@ Comments should be send to the author of the library directly. - * stanleyreisner_lib:: T1 and T2 for a general Stanley-Reiser ring - * swalk_lib:: Sagbi Walk Conversion Algorithm - * systhreads_lib:: multi-threaded objects --* tateProdCplxNegGrad_lib:: sheaf cohomology on product of projective spaces - * VecField_lib:: vector fields - @end menu - @c ---------------------------------------------------------- -@@ -1310,10 +1290,6 @@ Todos/Issues: - @subsection systhreads_lib - @c lib systhreads.lib - @c --------------------------------------------------------- --@node tateProdCplxNegGrad_lib --@subsection tateProdCplxNegGrad_lib --@c lib tateProdCplxNegGrad.lib --@c --------------------------------------------------------- - @node VecField_lib - @subsection VecField_lib - @c lib VecField.lib diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/redhat-aarch64.patch b/third_party/nixpkgs/pkgs/applications/science/math/singular/redhat-aarch64.patch deleted file mode 100644 index e0db6e87f9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/redhat-aarch64.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/m4/cpu-check.m4 b/m4/cpu-check.m4 -index 3cf0a7f08..12bb926ac 100644 ---- a/m4/cpu-check.m4 -+++ b/m4/cpu-check.m4 -@@ -37,6 +37,18 @@ if test "$ac_cv_singcpuname" = ppc; then - AC_DEFINE(SI_CPU_PPC,1,"PPC") - AC_SUBST(SI_CPU_PPC) - fi -+if test "$ac_cv_singcpuname" = arm -o "$ac_cv_singcpuname" = armel; then -+ AC_DEFINE(SI_CPU_ARM,1,"ARM") -+ AC_SUBST(SI_CPU_ARM) -+fi -+if test "$ac_cv_singcpuname" = aarch64; then -+ AC_DEFINE(SI_CPU_AARCH64,1,"AARCH64") -+ AC_SUBST(SI_CPU_AARCH64) -+fi -+if test "$ac_cv_singcpuname" = s390; then -+ AC_DEFINE(SI_CPU_S390,1,"S390") -+ AC_SUBST(SI_CPU_S390) -+fi - - # UNAME and PATH - AC_MSG_CHECKING(uname for Singular) -@@ -65,6 +77,14 @@ dnl testet on: ppc_Linux, 740/750 PowerMac G3, 512k L2 cache - [powerpc*|ppc*], [AC_DEFINE(HAVE_GENERIC_MULT,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)], - dnl the following settings seems to be better on arm processors - [arm*], [], -+dnl FIXME: need to run some tests -+ [aarch64*], [ -+ AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms) -+ AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add) -+ AC_DEFINE(HAVE_DIV_MOD,1,division using extend euclidian algorithm otherwise using tables of logartihms) -+ ], -+dnl FIXME: need to run some tests -+ [s390*], [AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add)], - [] - ) - diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch b/third_party/nixpkgs/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch deleted file mode 100644 index f664378617..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 -index f7410d74b..12cb005a5 100644 ---- a/m4/ax_prog_cc_for_build.m4 -+++ b/m4/ax_prog_cc_for_build.m4 -@@ -32,35 +32,31 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 18 -+#serial 9 - - AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) - AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_CPP])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl - - dnl Use the standard macros, but make them use other variable names - dnl - pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl --pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl - pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl - pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl - pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl - pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl --pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl - pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl - pushdef([ac_cv_objext], ac_cv_build_objext)dnl - pushdef([ac_exeext], ac_build_exeext)dnl - pushdef([ac_objext], ac_build_objext)dnl - pushdef([CC], CC_FOR_BUILD)dnl - pushdef([CPP], CPP_FOR_BUILD)dnl --pushdef([GCC], GCC_FOR_BUILD)dnl - pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl - pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl --pushdef([EXEEXT], BUILD_EXEEXT)dnl - pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl --pushdef([OBJEXT], BUILD_OBJEXT)dnl - pushdef([host], build)dnl - pushdef([host_alias], build_alias)dnl - pushdef([host_cpu], build_cpu)dnl -@@ -71,29 +67,27 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl - pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl - pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl - pushdef([ac_cv_host_os], ac_cv_build_os)dnl --pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl --pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl --pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl --pushdef([cross_compiling], cross_compiling_build)dnl -+pushdef([ac_cpp], ac_build_cpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl - --cross_compiling_build=no -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= - --ac_build_tool_prefix= --AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], -- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) -- --AC_LANG_PUSH([C]) - AC_PROG_CC --_AC_COMPILER_EXEEXT --_AC_COMPILER_OBJEXT - AC_PROG_CPP -+AC_EXEEXT -+ -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling - - dnl Restore the old definitions - dnl --popdef([cross_compiling])dnl --popdef([am_cv_prog_cc_c_o])dnl --popdef([am_cv_CC_dependencies_compiler_type])dnl --popdef([ac_tool_prefix])dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cpp])dnl - popdef([ac_cv_host_os])dnl - popdef([ac_cv_host_vendor])dnl - popdef([ac_cv_host_cpu])dnl -@@ -104,33 +98,25 @@ popdef([host_vendor])dnl - popdef([host_cpu])dnl - popdef([host_alias])dnl - popdef([host])dnl --popdef([OBJEXT])dnl - popdef([LDFLAGS])dnl --popdef([EXEEXT])dnl - popdef([CPPFLAGS])dnl - popdef([CFLAGS])dnl --popdef([GCC])dnl - popdef([CPP])dnl - popdef([CC])dnl - popdef([ac_objext])dnl - popdef([ac_exeext])dnl - popdef([ac_cv_objext])dnl - popdef([ac_cv_exeext])dnl --popdef([ac_cv_c_compiler_gnu])dnl - popdef([ac_cv_prog_cc_g])dnl - popdef([ac_cv_prog_cc_cross])dnl - popdef([ac_cv_prog_cc_works])dnl --popdef([ac_cv_prog_cc_c89])dnl - popdef([ac_cv_prog_gcc])dnl - popdef([ac_cv_prog_CPP])dnl - --dnl restore global variables ac_ext, ac_cpp, ac_compile, --dnl ac_link, ac_compiler_gnu (dependant on the current --dnl language after popping): --AC_LANG_POP([C]) -- - dnl Finally, set Makefile variables - dnl -+BUILD_EXEEXT=$ac_build_exeext -+BUILD_OBJEXT=$ac_build_objext - AC_SUBST(BUILD_EXEEXT)dnl - AC_SUBST(BUILD_OBJEXT)dnl - AC_SUBST([CFLAGS_FOR_BUILD])dnl -diff --git a/m4/ax_prog_cxx_for_build.m4 b/m4/ax_prog_cxx_for_build.m4 -index 4d976769f..17c19a89f 100644 ---- a/m4/ax_prog_cxx_for_build.m4 -+++ b/m4/ax_prog_cxx_for_build.m4 -@@ -31,7 +31,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 4 -+#serial 3 - - AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD]) - AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl -@@ -49,7 +49,6 @@ pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl - pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl - pushdef([CXX], CXX_FOR_BUILD)dnl - pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl --pushdef([GXX], GXX_FOR_BUILD)dnl - pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl - pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl - pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl -@@ -63,25 +62,26 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl - pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl - pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl - pushdef([ac_cv_host_os], ac_cv_build_os)dnl --pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl --pushdef([am_cv_CXX_dependencies_compiler_type], am_cv_build_CXX_dependencies_compiler_type)dnl --pushdef([cross_compiling], cross_compiling_build)dnl -+pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl - --cross_compiling_build=no -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= - --ac_build_tool_prefix= --AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], -- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) -- --AC_LANG_PUSH([C++]) - AC_PROG_CXX - AC_PROG_CXXCPP - -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling -+ - dnl Restore the old definitions - dnl --popdef([cross_compiling])dnl --popdef([am_cv_CXX_dependencies_compiler_type])dnl --popdef([ac_tool_prefix])dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cxxcpp])dnl - popdef([ac_cv_host_os])dnl - popdef([ac_cv_host_vendor])dnl - popdef([ac_cv_host_cpu])dnl -@@ -103,10 +103,6 @@ popdef([ac_cv_prog_cxx_works])dnl - popdef([ac_cv_prog_gxx])dnl - popdef([ac_cv_prog_CXXCPP])dnl - --dnl restore global variables (dependant on the current --dnl language after popping): --AC_LANG_POP([C++]) -- - dnl Finally, set Makefile variables - dnl - AC_SUBST([CXXFLAGS_FOR_BUILD])dnl diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch b/third_party/nixpkgs/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch deleted file mode 100644 index 78d658f926..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/kernel/GBEngine/kChinese.cc b/kernel/GBEngine/kChinese.cc -index 829a66609..84655caf2 100644 ---- a/kernel/GBEngine/kChinese.cc -+++ b/kernel/GBEngine/kChinese.cc -@@ -209,6 +209,8 @@ ideal id_ChineseRemainder_0(ideal *xx, number *q, int rl, const ring r) - return NULL; - } - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - if ((cpus==1) || (2*cpus>=cnt)) - /* at least 2 polys for each process, or switch to seriell version */ - return id_ChineseRemainder(xx,q,rl,r); -@@ -295,6 +297,8 @@ ideal id_Farey_0(ideal x, number N, const ring r) - { - int cnt=IDELEMS(x)*x->nrows; - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - if (2*cpus>=cnt) /* at least 2 polys for each process, - or switch to seriell version */ - return id_Farey(x,N,r); -diff --git a/kernel/GBEngine/kverify.cc b/kernel/GBEngine/kverify.cc -index 909d84994..aa06d6624 100644 ---- a/kernel/GBEngine/kverify.cc -+++ b/kernel/GBEngine/kverify.cc -@@ -176,6 +176,8 @@ BOOLEAN kVerify2(ideal F, ideal Q) - /*---------------------------------------------------------------------*/ - BOOLEAN all_okay=TRUE; - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - int parent_pid=getpid(); - using namespace vspace; - vmem_init(); diff --git a/third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix deleted file mode 100644 index ebcca69f09..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, autoreconfHook -, pkg-config -, intltool -, glib -, gnome2 -, gtk2 -, gfm -, libticables2 -, libticalcs2 -, libticonv -, libtifiles2 -}: - -stdenv.mkDerivation rec { - pname = "tilp2"; - version = "1.18"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv"; - }; - - patches = fetchpatch { - name = "remove-broken-kde-support.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp"; - sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - intltool - ]; - - buildInputs = [ - glib - gtk2 - gnome2.libglade - gfm - libticables2 - libticalcs2 - libticonv - libtifiles2 - ]; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "Transfer data between Texas Instruments graphing calculators and a computer"; - homepage = "http://lpg.ticalc.org/prj_tilp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix new file mode 100644 index 0000000000..e57a01fb17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/misc/bada-bib/default.nix @@ -0,0 +1,78 @@ +{ lib +, meson +, ninja +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gdk-pixbuf +, gettext +, glib +, gnome +, gobject-introspection +, gtk3 +, libxml2 +, pkg-config +, python3Packages +, wrapGAppsHook }: + +python3Packages.buildPythonApplication rec { + pname = "bada-bib"; + version = "0.3.0"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 + + src = fetchFromGitHub { + owner = "RogerCrocker"; + repo = "BadaBib"; + rev = "v${version}"; + sha256 = "0rclkkf5kd9ab049lizliiqawx5c5y2qmq40lkxnx09sa0283vg8"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + libxml2 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gdk-pixbuf + glib + gtk3 + ]; + + checkInputs = [ + appstream-glib + desktop-file-utils + ]; + + pythonPath = with python3Packages; [ + bibtexparser + pygobject3 + watchgod + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + dontWrapGApps = true; # Needs python wrapper + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + ''; + + meta = with lib; { + homepage = "https://github.com/RogerCrocker/BadaBib"; + description = "A simple BibTeX Viewer and Editor"; + maintainers = [ maintainers.Cogitri ]; + license = licenses.gpl3Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix index 190ba1af23..c00172dfc5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220124184855"; + version = "3.1.20220204090313"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = version; - sha256 = "0b0mxminfijbi3d9sslhwhs8awnagdsx8d2wh9x9ipdpwipihpmb"; + sha256 = "sha256-2+2xTUBzQFaS99Xd3jwWuMrg2pNKCb6ZsMKKdOBRo74="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix index 1430881a3f..e5cc02edcf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { installPhase = "cp -ar usr $out"; postFixup = '' - sed -e 's|/usr/bin|$out/bin|g' -i $out/share/applications/FAHControl.desktop + sed -e "s|/usr/bin|$out/bin|g" -i $out/share/applications/FAHControl.desktop wrapProgram "$out/bin/FAHControl" \ --suffix PATH : "${fahviewer.outPath}/bin" \ --set PYTHONPATH "$out/lib/python2.7/dist-packages" diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix index 52ca9c9e62..75e900a0a7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { unpackPhase = '' dpkg-deb -x ${src} ./ - sed -e 's|/usr/bin|$out/bin|g' -i usr/share/applications/FAHViewer.desktop + sed -e "s|/usr/bin|$out/bin|g" -i usr/share/applications/FAHViewer.desktop ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix index d12f9454ce..51dea27557 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix @@ -1,70 +1,57 @@ -{ lib, fetchFromGitHub, gcc, python2 }: +{ lib +, python3 +, fetchFromGitHub +, which +, wrapQtAppsHook +}: -let - xhtml2pdf = import ./xhtml2pdf.nix { - inherit lib; - fetchPypi = python2.pkgs.fetchPypi; - buildPythonPackage = python2.pkgs.buildPythonPackage; - html5lib = python2.pkgs.html5lib; - httplib2 = python2.pkgs.httplib2; - nose = python2.pkgs.nose; - pillow = python2.pkgs.pillow; - pypdf2 = python2.pkgs.pypdf2; - reportlab = python2.pkgs.reportlab; - }; - -in - -python2.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "sasview"; - version = "4.2.0"; - - checkInputs = with python2.pkgs; [ - pytest - unittest-xml-reporting - ]; - - checkPhase = '' - # fix the following error: - # imported module 'sas.sascalc.data_util.uncertainty' has this __file__ attribute: - # /build/source/build/lib.linux-x86_64-2.7/sas/sascalc/data_util/uncertainty.py - # which is not the same as the test file we want to collect: - # /build/source/dist/tmpbuild/sasview/sas/sascalc/data_util/uncertainty.py - rm -r dist/tmpbuild - - HOME=$(mktemp -d) py.test - ''; - - propagatedBuildInputs = with python2.pkgs; [ - bumps - gcc - h5py - libxslt - lxml - matplotlib - numpy - pyparsing - periodictable - pillow - pylint - pyopencl - reportlab - sasmodels - scipy - six - sphinx - wxPython - xhtml2pdf - ]; + version = "5.0.4"; src = fetchFromGitHub { owner = "SasView"; repo = "sasview"; rev = "v${version}"; - sha256 = "0k3486h46k6406h0vla8h68fd78wh3dcaq5w6f12jh6g4cjxv9qa"; + hash = "sha256-TjcchqA6GCvkr59ZgDuGglan2RxLp+aMjJk28XhvoiY="; }; - patches = [ ./pyparsing-fix.patch ./local_config.patch ]; + nativeBuildInputs = [ + python3.pkgs.pyqt5 + wrapQtAppsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + bumps + h5py + lxml + periodictable + pillow + pyparsing + pyqt5 + qt5reactor + sasmodels + scipy + setuptools + xhtml2pdf + ]; + + postBuild = '' + ${python3.interpreter} src/sas/qtgui/convertUI.py + ''; + + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + unittest-xml-reporting + ]; + + pytestFlagsArray = [ "test" ]; meta = with lib; { homepage = "https://www.sasview.org"; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/local_config.patch b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/local_config.patch deleted file mode 100644 index 5b6c343649..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/local_config.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/sas/_config.py b/src/sas/_config.py -index ece08fd4c..926768593 100644 ---- a/src/sas/_config.py -+++ b/src/sas/_config.py -@@ -67,8 +67,8 @@ def load_local_config(app_dir): - logger.info("GuiManager loaded %s", path) - return module - except Exception as exc: -- logger.critical("Error loading %s: %s", path, exc) -- sys.exit() -+ import sas.sasview.local_config -+ return sas.sasview.local_config - - def make_custom_config_path(user_dir): - """ -@@ -116,4 +116,4 @@ def load_custom_config(path): - - from sas.sasview import custom_config - logger.info("GuiManager custom_config defaults to sas.sasview.custom_config") -- return custom_config -\ No newline at end of file -+ return custom_config diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/pyparsing-fix.patch deleted file mode 100644 index c3cd164a89..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/pyparsing-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 866ab7e36..78727b276 100755 ---- a/setup.py -+++ b/setup.py -@@ -401,7 +401,7 @@ package_data['sas.sasview'] = ['images/*', - packages.append("sas.sasview") - - required = [ -- 'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0', -+ 'bumps>=0.7.5.9', 'periodictable>=1.5.0', - - # 'lxml>=2.2.2', - 'lxml', 'h5py', diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/shtns/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/shtns/default.nix new file mode 100644 index 0000000000..a720213b39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/physics/shtns/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchgit, fftw }: + +stdenv.mkDerivation rec { + pname = "shtns"; + version = "3.5.1"; + + src = fetchgit { + url = "https://bitbucket.org/nschaeff/shtns"; + rev = "v${version}"; + sha256 = "1ajrplhv7a2dvb3cn3n638281w0bzdcydvvwbg64awbjg622mdpd"; + }; + + buildInputs = [ fftw ]; + + meta = with lib; { + description = "High performance library for Spherical Harmonic Transform"; + homepage = "https://nschaeff.bitbucket.io/shtns/"; + license = licenses.cecill21; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix index b5ca8b8895..328e61f1fe 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.eterm.org"; + homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone description = "Terminal emulator"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; 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 591b16ee82..41154cc103 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.10.3"; + version = "1.11.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "13v6xqaw3xn1x84dn4gnkiimcsllb19mrbvcdj2fnm8klnrys3gs"; + sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn"; }; depsBuildBuild = [ @@ -163,6 +163,7 @@ stdenv.mkDerivation rec { # make sure there is _some_ profiling data on all binaries ./footclient --version ./foot --version + ./tests/test-config # generate pgo data of wayland independent code ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} meson configure -Db_pgo=use diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix index 0b8ca7f40d..a2b3d13b36 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.1.5"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-Pgu09QvP1PnZ13omQlQLVHr3NayhFaQndmsQdLM+W90="; + sha256 = "1ryw3315x0lb60j8nzz78h7zd36r2l1j39hnlfav0p7nq8dhqbpm"; }; nativeBuildInputs = [ dpkg ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A terminal built on web technologies"; homepage = "https://hyper.is/"; - maintainers = with maintainers; [ puffnfresh ]; + maintainers = with maintainers; [ puffnfresh fabiangd ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kermit-terminal/default.nix new file mode 100644 index 0000000000..8a5a785641 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kermit-terminal/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtk3 +, pcre +, pkg-config +, vte +}: + +stdenv.mkDerivation rec { + pname = "kermit"; + version = "3.7"; + + src = fetchFromGitHub { + name = "${pname}-${version}-src"; + owner = "orhun"; + repo = pname; + rev = version; + hash = "sha256-O5jpiQ+aaOTPst4/Z+H5e7ylA8CNBevqNoH50p4uEA4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + gtk3 + pcre + vte + ]; + + meta = with lib; { + homepage = "https://github.com/orhun/kermit"; + description = "A VTE-based, simple and froggy terminal emulator"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} 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 d79ce43bdf..cca7e7eb9b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -23,14 +23,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.24.1"; + version = "0.24.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-WPkyub7CwNXRksUmqiZeznnSqEPFpyHTeFLQ+D4Fb5c="; + sha256 = "sha256-nGBdoOueX8tcxXRDqKQ/Q+woT6rNQeLXwy1MJbwizKs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 70ff4a4555..0e9402cf49 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem +{ lib, stdenv, fetchurl, fetchpatch, makeDesktopItem , libX11, libXt, libXft, libXrender , ncurses, fontconfig, freetype , pkg-config, gdk-pixbuf, perl @@ -6,6 +6,7 @@ , perlSupport ? true , gdkPixbufSupport ? true , unicode3Support ? true +, emojiSupport ? false }: let @@ -22,6 +23,13 @@ let genericName = pname; categories = "System;TerminalEmulator;"; }; + + fetchPatchFromAUR = { package, name, rev, sha256 }: + fetchpatch rec { + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=${package}&id=${rev}"; + extraPrefix = ""; + inherit name sha256; + }; in with lib; @@ -44,18 +52,33 @@ stdenv.mkDerivation { outputs = [ "out" "terminfo" ]; - patches = [ + patches = (if emojiSupport then [ + # the required patches to libXft are in nixpkgs by default, see + # ../../../servers/x11/xorg/overrides.nix + (fetchPatchFromAUR { + name = "enable-wide-glyphs.patch"; + package = "rxvt-unicode-truecolor-wide-glyphs"; + rev = "69701a09c2c206233952b84bc966407f6774f1dc"; + sha256 = "0jfcj0ahky4dxdfrhqvh1v83mblhf5nak56dk1vq3bhyifdg7ffq"; + }) + (fetchPatchFromAUR { + name = "improve-font-rendering.patch"; + package = "rxvt-unicode-truecolor-wide-glyphs"; + rev = "69701a09c2c206233952b84bc966407f6774f1dc"; + sha256 = "1jj5ai2182nq912279adihi4zph1w4dvbdqa1pwacy4na6y0fz9y"; + }) + ] else [ ./patches/9.06-font-width.patch + ]) ++ [ ./patches/256-color-resources.patch - ] ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; - + ]++ optional stdenv.isDarwin ./patches/makefile-phony.patch; configureFlags = [ "--with-terminfo=${placeholder "terminfo"}/share/terminfo" "--enable-256-color" (enableFeature perlSupport "perl") (enableFeature unicode3Support "unicode3") - ]; + ] ++ optional emojiSupport "--enable-wide-glyphs"; LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix index f8d84f4e93..9f1df695a1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix @@ -8,7 +8,7 @@ pypy2Packages.buildPythonApplication rec { version = "2.5.0"; src = fetchurl { - url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz"; + url = "https://github.com/mhagger/cvs2svn/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; @@ -29,7 +29,7 @@ pypy2Packages.buildPythonApplication rec { meta = with lib; { description = "A tool to convert CVS repositories to Subversion repositories"; - homepage = "http://cvs2svn.tigris.org/"; + homepage = "https://github.com/mhagger/cvs2svn"; maintainers = [ maintainers.makefu ]; platforms = platforms.unix; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 59aba526c3..21781c423b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RFKS6fHh+rX5S31MvAQpJUNgaI6loiUw0FNkdsMFqlQ="; + sha256 = "sha256-zQHFLXcsIFMqMCJp7+3Abc0WbSWKJyfAAE+TTJGRRmY="; }; - vendorSha256 = "sha256-6owFzn+NAhlHjTJEur1H5oZY87ZoptvAnF2w6kafix8="; + vendorSha256 = "sha256-yMc3Czo7gTb2ZSWjj0yyId+qyro4mU1C+FOgEjZEhBY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 9a4d3878e8..8cedd24be0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-eDVC1tvAkCioV0Mi5f/Qkc0MMTNaoFXuvWXpllZ7PgE="; + sha256 = "sha256-SEmIZy8ql1MxcFR6zeif03DVha/SRZHajVwt3QOBBYU="; }; - cargoSha256 = "sha256-wtG/WTmZ13jxIawI9j9QKQm7jPx5TUs7MjqX+lq/Vf0="; + cargoSha256 = "sha256-mKfPxU1JoN/xLdPdwy3vo1M0qF9ag0T4Ls4dfvHn6Pc="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 073b50c4bd..13da857b79 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.34.1"; + version = "2.35.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs"; + sha256 = "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 24ba62a690..e5058ad48e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,18 +1,30 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +, openssl +, pkg-config +, xclip +, AppKit +, Security +}: + rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PNyXmXHS8StJhx6Qko7zbXrX1CX3owC1HmyX9VV7tEg="; + sha256 = "sha256-zYM0JVhgFnp8JDBx9iEOt029sr8azIPX5jrtvUE/Pn0="; }; - cargoSha256 = "sha256-Q6QUxIe5bkoEcxZZwhJbihaHhSsX8SLqWzmjp8hFsS4="; + cargoSha256 = "sha256-kbLI95GzCwm2OKzzpk7jvgtm8vArf29u5BiPRTh2OmE="; + + nativeBuildInputs = [ pkg-config ]; - nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isLinux xclip ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; @@ -21,7 +33,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; meta = with lib; { - description = "Blazing fast terminal-ui for git written in rust"; + description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne yanganto ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix index 7cefd485d1..69e9508676 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE="; }; - vendorSha256 = "sha256-P7gHCyFafjWOYLEtK9Eh2S2KA0e2hzc1G/ZqVaEWWB0="; + vendorSha256 = "sha256-hGpJXCs5lZ6QQHr6LW1fCT+CVtOaUpYXJPchDPDdbaM="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 626e3db5ca..30516aca4f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.12"; + version = "1.5.13"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XQ3HLmT3sWjoHTxnOU9FSHbnCwitFH0tOOpT7WwTEPE="; + sha256 = "sha256-arHwIQXZYxwnFbyLoKQiv3gYHEN80DxbdaO4dM9ZBs8="; }; - cargoSha256 = "sha256-V54Itj7/zUO1bp0y30TjV1mSo/oNJOxEofpSqrYz6xk="; + cargoSha256 = "sha256-d+DERHE8Nzre1MXNj4Cp9fcRkLPEC8hzh0SeTpS2C5A="; # tests require it to be in a git repository preCheck = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 1c3fdf90aa..0a6251548b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "0yx81d61kp33h7n0c14wvcrh8vvjjjq4xjh1qwq2sdbmqc43p3hg"; + sha256 = "sha256-TsJr2Riygz/DZrn6UZMPvq1tTfvl3dFEZZNq2wVj1Nw="; }; nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; 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 1337c18692..513fdd67cd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.10"; + version = "1.16.1"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "1rrxkpahgzxgs4mckdsrss19mdjdicjgskw689hvhc063slb9vlx"; + sha256 = "sha256-CaJ6Br8Sy+8GuoI8UWxsn3oGEp6R3X5kvl9vDKZB1bc="; }; unpackPhase = '' 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 7a00d41df0..c948a4450f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.7.0", - "repo_hash": "0jam4krhwkbri99642vz4gjlnr7zfgd6mq7pgjyf00f6pggvhq79", - "yarn_hash": "1cv3lxfw4i9snlw5x6bcip1n97wg72v5zpz9mjxdpzd2i1bwp6da", + "version": "14.7.1", + "repo_hash": "1zph7a2mqwbmgc6isd0vl6w8j9lrlcnxyhabzpcms4v3q3agr4f3", + "yarn_hash": "12k2r1y7kw95kfsmy0s8rbsf0vldr8c2liah0rkc7pihr19gq3w7", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.7.0-ee", + "rev": "v14.7.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.7.0", + "GITALY_SERVER_VERSION": "14.7.1", "GITLAB_PAGES_VERSION": "1.51.0", "GITLAB_SHELL_VERSION": "13.22.2", - "GITLAB_WORKHORSE_VERSION": "14.7.0" + "GITLAB_WORKHORSE_VERSION": "14.7.1" } } 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 e2c5a8757f..52c61d594c 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 @@ -23,7 +23,7 @@ let gemdir = ./.; }; - version = "14.7.0"; + version = "14.7.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -35,7 +35,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-hOtdeJSjZLGcPCZpu42lGtCtQoLE0/AQqfQWLUJ6Hf8="; + sha256 = "sha256-MGcqYbHHeYwjfnvrJG/ZtOnyxsj+w1kPHOkVHf2AeMQ="; }; vendorSha256 = "sha256-eapqtSstc7d3R7A/5krKV0uVr9GhGkHHMrmsBOpWAbo="; 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 3b1bc8cb1b..0b2e24e9d8 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 = "14.7.0"; + version = "14.7.1"; src = fetchFromGitLab { owner = data.owner; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 666a1e7d02..2312918df5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1661,4 +1661,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.2.24 + 2.3.6 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix index f7b7305b10..3f9d8442ea 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -8,16 +8,16 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "0ix3mxy8cpqbx24qffbzyf5z88x7605icm7rk5n54r8bdsr7cckd"; + sha256 = "sha256-t2aXRYCr54sqXwv6cJHDf1z1z94SqJM0WQRd2ejc7XY="; }; - vendorSha256 = "0m0g4dsiq8p2ngsbjxfi3wff7x4xpm67qlhgcgf8b48mqai4d2gc"; + vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix index 61e938b093..7464dcfb73 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.64"; + version = "0.66"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "1qigv8fnmiynrx6qrg28n2981a30n56nh3xbhmlpihl7fqxmg1sq"; + sha256 = "13xrwndj80jix210fxkadivxyd1f5qavdrhxyl32n68xyv5xmkgg"; }; nativeBuildInputs = [ pkg-config ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gameoftrees.org"; license = licenses.isc; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbe ]; }; } 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 405b939455..5f28580c7d 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"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI="; + sha256 = "sha256-X7TDbThWKS6/WEBR1ZMG2WrYqjK1U3RSsdnEdvlasRo="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs="; + sha256 = "sha256-rIG57oPCTUz4HNJyuMBPlKTSh02ecF5052Q1P9wGq1s="; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix index d814e0ca0a..d46a67a860 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed, lzip }: stdenv.mkDerivation rec { pname = "rcs"; - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "mirror://gnu/rcs/${pname}-${version}.tar.xz"; - sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU"; + url = "mirror://gnu/rcs/${pname}-${version}.tar.lz"; + sha256 = "sha256-Q93+EHJKi4XiRo9kA7YABzcYbwHmDgvWL95p2EIjTMU="; }; ac_cv_path_ED = "${ed}/bin/ed"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.cc.isClang "format"; + nativeBuildInputs = [ lzip ]; + meta = { homepage = "https://www.gnu.org/software/rcs/"; description = "Revision control system"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix index 18e105aea4..a2da28404a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dispatchsrht" ]; meta = with lib; { - homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; + homepage = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; license = licenses.agpl3Only; maintainers = with maintainers; [ eadwu ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix index 3e1b6e4cd8..66f3b9a0aa 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,45 +1,59 @@ -{ lib, fetchurl, python3Packages -, mercurial, qt5 +{ lib +, fetchurl +, python3Packages +, mercurial +, qt5 }: python3Packages.buildPythonApplication rec { - pname = "tortoisehg"; - version = "5.9"; + pname = "tortoisehg"; + version = "6.0"; - src = fetchurl { - url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a"; - }; + src = fetchurl { + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; + sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; + }; - # Extension point for when thg's mercurial is lagging behind mainline. - tortoiseMercurial = mercurial; + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; - propagatedBuildInputs = with python3Packages; [ - tortoiseMercurial qscintilla-qt5 iniparse - ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ + tortoiseMercurial + qscintilla-qt5 + iniparse + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - doCheck = false; # tests fail with "thg: cannot connect to X server" - postInstall = '' - mkdir -p $out/share/doc/tortoisehg - cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt - # convenient alias - ln -s $out/bin/thg $out/bin/tortoisehg - wrapQtApp $out/bin/thg - ''; + doCheck = true; + postInstall = '' + mkdir -p $out/share/doc/tortoisehg + cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt + # convenient alias + ln -s $out/bin/thg $out/bin/tortoisehg + wrapQtApp $out/bin/thg + ''; - checkPhase = '' - echo "test: thg version" - $out/bin/thg version - ''; + checkPhase = '' + export QT_QPA_PLATFORM=offscreen + echo "test: thg smoke test" + $out/bin/thg -h > help.txt & + sleep 1s + if grep "list of commands" help.txt; then + echo "thg help output was captured. Seems like package in a working state." + exit 0 + else + echo "thg help output was not captured. Seems like package is broken." + exit 1 + fi + ''; - passthru.mercurial = tortoiseMercurial; + passthru.mercurial = tortoiseMercurial; - meta = { - description = "Qt based graphical tool for working with Mercurial"; - homepage = "https://tortoisehg.bitbucket.io/"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ danbst ]; - }; + meta = { + description = "Qt based graphical tool for working with Mercurial"; + homepage = "https://tortoisehg.bitbucket.io/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danbst ]; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix index e0e26b804f..ffd5fdaab7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix @@ -1,18 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, git, gnupg, installShellFiles }: +{ lib +, stdenv +, resholvePackage +, fetchFromGitHub +, git +, bash +, openssl +, gawk +/* +TODO: yadm can use git-crypt and transcrypt +but it does so in a way that resholve 0.6.0 +can't yet do anything smart about. It looks +like these are for interactive use, so the +main impact should just be that users still +need both of these packages in their profile +to support their use in yadm. +*/ +# , git-crypt +# , transcrypt +, j2cli +, esh +, gnupg +, coreutils +, gnutar +, installShellFiles +, runCommand +, yadm +}: -stdenv.mkDerivation rec { +resholvePackage rec { pname = "yadm"; version = "3.1.1"; - buildInputs = [ git gnupg ]; - nativeBuildInputs = [ installShellFiles ]; src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; + hash = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; }; dontConfigure = true; @@ -31,6 +56,72 @@ stdenv.mkDerivation rec { --bash completion/bash/yadm ''; + solutions = { + yadm = { + scripts = [ "bin/yadm" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + git + gnupg + openssl + gawk + # see head comment + # git-crypt + # transcrypt + j2cli + esh + bash + coreutils + gnutar + ]; + fake = { + external = if stdenv.isCygwin then [ ] else [ "cygpath" ]; + }; + fix = { + "$GPG_PROGRAM" = [ "gpg" ]; + "$OPENSSL_PROGRAM" = [ "openssl" ]; + "$GIT_PROGRAM" = [ "git" ]; + "$AWK_PROGRAM" = [ "awk" ]; + # see head comment + # "$GIT_CRYPT_PROGRAM" = [ "git-crypt" ]; + # "$TRANSCRYPT_PROGRAM" = [ "transcrypt" ]; + "$J2CLI_PROGRAM" = [ "j2" ]; + "$ESH_PROGRAM" = [ "esh" ]; + # not in nixpkgs (yet) + # "$ENVTPL_PROGRAM" = [ "envtpl" ]; + # "$LSB_RELEASE_PROGRAM" = [ "lsb_release" ]; + }; + keep = { + "$YADM_COMMAND" = true; # internal cmds + "$template_cmd" = true; # dynamic, template-engine + "$SHELL" = true; # probably user env? unsure + "$hook_command" = true; # ~git hooks? + "exec" = [ "$YADM_BOOTSTRAP" ]; # yadm bootstrap script + + # not in nixpkgs + "$ENVTPL_PROGRAM" = true; + "$LSB_RELEASE_PROGRAM" = true; + }; + /* + TODO: these should be dropped as fast as they can be dealt + with properly in binlore and/or resholve. + */ + execer = [ + "cannot:${j2cli}/bin/j2" + "cannot:${esh}/bin/esh" + "cannot:${git}/bin/git" + "cannot:${gnupg}/bin/gpg" + ]; + }; + }; + + passthru.tests = { + minimal = runCommand "${pname}-test" {} '' + export HOME=$out + ${yadm}/bin/yadm init + ''; + }; + meta = { homepage = "https://github.com/TheLocehiliosan/yadm"; description = "Yet Another Dotfiles Manager"; @@ -40,6 +131,7 @@ stdenv.mkDerivation rec { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; + changelog = "https://github.com/TheLocehiliosan/yadm/blob/${version}/CHANGES"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ abathur ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix index 41c035350d..5e725ec01e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.4"; + version = "1.22.5"; src = fetchPypi { inherit pname version; - sha256 = "a20978538ae9a51bdbe5ef5aa0f87ede0f8efd2817ab240980de56eac36982e3"; + sha256 = "20250fc28ce04636580577b2864e54e6bea9daf68e2d8afaeb78e131b182cd28"; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix new file mode 100644 index 0000000000..2607ee64f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, toKodiAddon, addonDir }: +let + drv = stdenv.mkDerivation { + pname = "controller-topology-project"; + version = "unstable-2022-01-22"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "controller-topology-project"; + rev = "e2a9bac903f21b2acfeee374070cfc97d03aba2d"; + sha256 = "sha256-o6uKxOjEYNAK27drvNOokOFPdjkOEnr49mBre9ycM0w="; + }; + + postPatch = '' + # remove addons already included in the base kodi package + rm -r addons/game.controller.default + rm -r addons/game.controller.snes + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out${addonDir} + cp -r addons/* $out${addonDir} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/kodi-game/controller-topology-project"; + description = "Models how controllers connect to and map to each other for all gaming history"; + license = with licenses; [ odbl ]; + maintainers = teams.kodi.members; + }; + }; +in + toKodiAddon drv diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/controllers/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/controllers/default.nix deleted file mode 100644 index 825ad5d53f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/controllers/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildKodiAddon, fetchFromGitHub, controller }: -buildKodiAddon rec { - pname = "game-controller-${controller}"; - namespace = "game.controller.${controller}"; - version = "1.0.3"; - - sourceDir = "addons/" + namespace; - - src = fetchFromGitHub { - owner = "kodi-game"; - repo = "kodi-game-controllers"; - rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18"; - sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; - }; - - meta = with lib; { - description = "Add support for different gaming controllers."; - platforms = platforms.all; - license = licenses.odbl; - maintainers = teams.kodi.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 04911562a3..0928c7617f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "64.0.0"; + version = "65.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-tg9rjTbprcVkzUUVWCKqF1dzIjFKjzIqrVADtuUU9Fk="; + sha256 = "1zphcpfrzic9ialx3xxi2ywzxnllys667vy140bgdshzr798sg2p"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix index 1715ce4a6a..0c435bfbe1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -93,11 +93,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "1.4"; + version = "unstable-2022-02-03"; - src = fetchurl { - url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"; - sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2"; + src = fetchsvn { + url = "svn://svn.mplayerhq.hu/mplayer/trunk"; + rev = "38331"; + sha256 = "1vpic8i6zvg0zsy50vhm45ysqag561bpn9jycfbvvwl9ji7l55zi"; }; prePatch = '' @@ -106,8 +107,6 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; - patches = [ ./svn-r38199-ffmpeg44fix.patch ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; @@ -163,7 +162,6 @@ stdenv.mkDerivation rec { (if pulseSupport then "--enable-pulse" else "--disable-pulse") (if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2") "--disable-xanim" - "--disable-ivtv" "--disable-xvid --disable-xvid-lavc" "--disable-ossaudio" "--disable-ffmpeg_a" diff --git a/third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch b/third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch deleted file mode 100644 index 4137989fcb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: libmpcodecs/ad_spdif.c -=================================================================== -diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c ---- a/libmpcodecs/ad_spdif.c (revision 38198) -+++ b/libmpcodecs/ad_spdif.c (revision 38199) -@@ -298,14 +298,8 @@ - if (spdif_ctx->header_written) - av_write_trailer(lavf_ctx); - av_freep(&lavf_ctx->pb); -- if (lavf_ctx->streams) { -- av_freep(&lavf_ctx->streams[0]->codec); -- av_freep(&lavf_ctx->streams[0]->info); -- av_freep(&lavf_ctx->streams[0]); -- } -- av_freep(&lavf_ctx->streams); -- av_freep(&lavf_ctx->priv_data); -+ avformat_free_context(lavf_ctx); -+ lavf_ctx = NULL; - } -- av_freep(&lavf_ctx); - av_freep(&spdif_ctx); - } 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 31f478c47c..f8bed23656 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -6,7 +6,7 @@ , addOpenGLRunpath , cmake , fdk_aac -, ffmpeg +, ffmpeg_4 , jansson , libjack2 , libxkbcommon @@ -73,7 +73,7 @@ mkDerivation rec { buildInputs = [ curl fdk_aac - ffmpeg + ffmpeg_4 jansson libcef libjack2 diff --git a/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index 81b354fe1f..34b6eb9c28 100644 --- a/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -36,12 +36,16 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + # plexmediaplayer currently segfaults under wayland + qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ]; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ b4dm4n ]; homepage = "https://plex.tv"; + mainProgram = "plexmediaplayer"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix index fd5b2888d6..1603bdcbb9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sub-batch"; - version = "0.4.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "kl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WUW+lOGbZ82NJxmW+Ogxslf3COOp62aZ/08Yn26l4T0="; + sha256 = "sha256-N+3KyBlLG90C3D5ivgj6qedtKsUBoBHr89gmxyAIfVI="; }; - cargoSha256 = "sha256-m9nBubmuuOcJyegmYGJizY/2b7oamBHKFNIaxOtikcA="; + cargoSha256 = "sha256-rjhSosiLIgcSw6OHpFmGNHXGUdf2QsiIXFVgtO9qNY0="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix index 6dc8aa56b5..f2753affa5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "4.9"; + version = "4.11"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-dYwR+D2g4PxYyhsH9mGwgzTQ2Vw5UpMSomTl828gFvM="; + sha256 = "sha256-MTzlhnnDVZzS3lnYe3P/Hi6pi6f4B0+ejmDwV0f9juI="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix index 51984cf5f1..5584e63ab4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - sha256 = "sha256-TZm9pN9xtqkKhETsUhIIalK+4xQpFV3TXyWychSoyRk="; + sha256 = "sha256-jKuvh1OruPXTBlgLwlwcJdqC8u0WBDr/Un5JUL3U0hw="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index 7aa780f8a7..a5e65480b2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -10,7 +10,7 @@ , avahi , dbus , faad2 -, ffmpeg +, ffmpeg_4 , flac , fluidsynth , freefont_ttf @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { avahi dbus faad2 - ffmpeg + ffmpeg_4 flac fluidsynth fribidi diff --git a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix index a4b03e9150..9d6a5e18ad 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # the gstreamer toolsdir points to the wrong derivation output postPatch = '' substituteInPlace configure.ac \ - --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer.dev}/bin/gst-inspect-1.0' \ + --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer}/bin/gst-inspect-1.0' \ ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix index cbd7d8e551..2889d09183 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper ]; buildInputs = [ docker - (python3.withPackages (ps: [ ps.lark-parser ps.requests ])) + (python3.withPackages (ps: [ ps.lark ps.requests ])) ]; configureFlags = let - pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]); + pythonEnv = python3.withPackages (ps: [ ps.lark ps.requests ]); in [ "--with-python=${pythonEnv}/bin/python3" ]; 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 4c2a21fd4c..955d609d7a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "20.2"; + version = "21.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yIp1p8GyBojWKmvFRZ/OeyF2bjlqYsuXUrYTVunYV8Y="; + sha256 = "00b0ij9sfv7zsrgwrcj2rzpy1z8bp0m0lmzjp433xzpcgcnzw3w5"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-s2u6e2JbukPo3pXYzQJXP5d2G213u1+1ke9gZFnB+5g="; + cargoSha256 = "0lf7bb468s2ic9vabx954i46605gf7c6064vvwqvz7djk30z0y0d"; + + # Integration tests require root. + cargoTestFlags = [ "--bins" ]; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; 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 75a3dbf374..36ce5c3ade 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.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-x1bnDksmEjKuzjwPBENP9xpQbzo8HAW+0i2l2Ra/48Y="; + sha256 = "sha256-F6eWC1GhPJRyra7U80tBxfokY1PIJmsuF3H9536tPxA="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix index ad9955cc47..0f56526f68 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vOoRwV4BO40cUWNxmWubgbN1q7WPKe2vifg8F1duaVA="; + sha256 = "sha256-kz+gyl7BuC0G97Lj3T1a859TYhwfAGB1hTiYXq66wwY="; }; - vendorSha256 = "sha256-118TYmpGUNMZgFKsOzqOy71SabG9tN6IeOkpgwVSXTY="; + vendorSha256 = "sha256-x0VmidGV9TsGOyL+OTUHXOxJ2cgvIqph56MrwfR2SP4="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix index 974aa712d6..a05ff32e39 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 059057bc49..2ae0aca584 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -33,24 +33,16 @@ , nixosTestRunner ? false }: -let - audio = lib.optionalString alsaSupport "alsa," - + lib.optionalString pulseSupport "pa," - + lib.optionalString sdlSupport "sdl," - + lib.optionalString jackSupport "jack,"; - -in - stdenv.mkDerivation rec { pname = "qemu" + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f"; + sha256 = "0iavlsy9hin8k38230j8lfmyipx3965zljls1dp34mmc8n75vqb8"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -101,55 +93,7 @@ stdenv.mkDerivation rec { sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) - (fetchpatch { - name = "CVE-2021-3713.patch"; # remove with next release - url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch"; - sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf"; - }) - # Fixes a crash that frequently happens in some setups that share /nix/store over 9p like nixos tests - # on some systems. Remove with next release. - (fetchpatch { - name = "fix-crash-in-v9fs_walk.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/f83df00900816476cca41bb536e4d532b297d76e.patch"; - sha256 = "sha256-LYGbBLS5YVgq8Bf7NVk7HBFxXq34NmZRPCEG79JPwk8="; - }) - # Fixes an io error on discard/unmap operation for aio/file backend. Remove with next release. - (fetchpatch { - name = "fix-aio-discard-return-value.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; - sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; - }) - # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release. - (fetchpatch { - name = "qxl-fix-pre-save-logic.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; - sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; - }) - # Fixes socket_sockaddr_to_address_unix assertion errors in some setups. Remove with next release. - (fetchpatch { - name = "fix-unix-socket-path-copy-again.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/118d527f2e4baec5fe8060b22a6212468b8e4d3f.patch"; - sha256 = "sha256-ox+JSpc0pqd3bMi5Ot7ljQyk70SX8g+BLufR06mZPps="; - }) - ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch - ++ lib.optionals stdenv.hostPlatform.isMusl [ - ./sigrtminmax.patch - (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; - sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; - }) - ] ++ lib.optionals stdenv.isDarwin [ - # The Hypervisor.framework support patch converted something that can be applied: - # * https://patchwork.kernel.org/project/qemu-devel/list/?series=548227 - # The base revision is whatever commit there is before the series starts: - # * https://github.com/patchew-project/qemu/commits/patchew/20210916155404.86958-1-agraf%40csgraf.de - # The target revision is what patchew has as the series tag from patchwork: - # * https://github.com/patchew-project/qemu/releases/tag/patchew%2F20210916155404.86958-1-agraf%40csgraf.de - (fetchpatch { - url = "https://github.com/patchew-project/qemu/compare/7adb961995a3744f51396502b33ad04a56a317c3..d2603c06d9c4a28e714b9b70fe5a9d0c7b0f934d.diff"; - sha256 = "sha256-nSi5pFf9+EefUmyJzSEKeuxOt39ztgkXQyUB8fTHlcY="; - }) - ]; + ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists. @@ -180,12 +124,9 @@ stdenv.mkDerivation rec { --replace '$source_path/VERSION' '$source_path/QEMU_VERSION' substituteInPlace meson.build \ --replace "'VERSION'" "'QEMU_VERSION'" - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; configureFlags = [ - "--audio-drv-list=${audio}" "--disable-strip" # We'll strip ourselves after separating debug info. "--enable-docs" "--enable-tools" @@ -243,13 +184,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' - install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings - if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then - makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ - $out/bin/qemu-kvm \ - --run $out/libexec/emit-kvm-warnings \ - --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" - fi + ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; passthru = { @@ -259,26 +194,6 @@ stdenv.mkDerivation rec { # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; - emitKvmWarnings = '' - #!${runtimeShell} - WARNCOL='\033[1;35m' - NEUTRALCOL='\033[0m' - WARNING="''${WARNCOL}warning:''${NEUTRALCOL}" - if [ ! -e /dev/kvm ]; then - echo -e "''${WARNING} KVM is not available - execution will be slow" >&2 - echo "Consider installing KVM for hardware-accelerated execution." >&2 - echo "If KVM is already installed make sure the kernel module is loaded." >&2 - elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then - echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2 - echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2 - echo "" >&2 - echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2 - echo "must be world-read-/writable (rw-rw-rw-)." >&2 - fi - ''; - - passAsFile = [ "emitKvmWarnings" ]; - meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/sigrtminmax.patch deleted file mode 100644 index 41050447ac..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/sigrtminmax.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Fri, 17 Aug 2018 00:22:35 -0500 -Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0 - ---- - linux-user/signal.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/linux-user/signal.c b/linux-user/signal.c -index 602b631b92..87f9240134 100644 ---- a/linux-user/signal.c -+++ b/linux-user/signal.c -@@ -26,6 +26,13 @@ - #include "trace.h" - #include "signal-common.h" - -+#ifndef __SIGRTMIN -+#define __SIGRTMIN 32 -+#endif -+#ifndef __SIGRTMAX -+#define __SIGRTMAX (NSIG-1) -+#endif -+ - struct target_sigaltstack target_sigaltstack_used = { - .ss_sp = 0, - .ss_size = 0, --- -2.18.0 - diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 4d6fb0ef4a..6589cccfe2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-f/94tcB7XU0IJpvSZ6xemUOQ+TMyHlTv1rfIZoMVPOQ="; + sha256 = "sha256-u1o7dnCsnHpLPOWyyfPWtb5g4hsI0zjJ39q7eyqZ9Sg="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index f60e203d7f..9424628d28 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -229,5 +229,6 @@ in stdenv.mkDerivation { homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; platforms = [ "x86_64-linux" ]; + mainProgram = "VirtualBox"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index 7e79d963fc..07b7a55783 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.10.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-cPCtxfLzg1RDh3vKFfxAkcCMytu0mDsGp9CLJQmXATA="; + sha256 = "sha256-ojKloMFbpBsr8fykMbLIBAzrlVaJDv+4BL0lozXsgC4="; }; nativeBuildInputs = [ makeWrapper ]; 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 04944a1e90..bfc360e81b 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -1,19 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, pkg-config , libinput , libxcb , libxkbcommon , pixman +, pkg-config , wayland , wayland-protocols , wlroots -, enable-xwayland ? true, xwayland, libX11 -, patches ? [ ] -, conf ? null , writeText -, fetchpatch +, enable-xwayland ? true, xwayland, libX11 +, conf ? null +, patches ? [ ] }: let @@ -22,16 +21,17 @@ in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; + hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libinput libxcb @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + NIX_CFLAGS_COMPILE = [ + # https://github.com/djpohly/dwl/issues/186 + "-Wno-error=unused-result" + ]; + dontConfigure = true; installPhase = '' @@ -85,8 +90,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + inherit (wayland.meta) platforms; }; } # TODO: custom patches from upstream website -# TODO: investigate the modifications in the upstream unstable version 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 4168a7f341..a194a13266 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 @@ -8,24 +8,27 @@ , notmuch , openssl , ethtool +, lm_sensors +, iw +, iproute2 }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m0Yq6uxo4FAmwvUK/b3zTb79AT9h/fgdm4Q9sf1DYe0="; + sha256 = "sha256-D/+SDKkrYfdzFw+cNBJrCshpDuFSLbr70jvFMbX3B0w="; }; - cargoSha256 = "sha256-J+829GzZ4lKrn3MSip/weaI8pExBt3uex86bKZOofg4="; + cargoSha256 = "sha256-tNwf2ShnzoSrb1R/g0hOGwQMulWYXyVCILU3Jb+Sfpg="; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ dbus libpulseaudio notmuch openssl ]; + buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]; buildFeatures = [ "notmuch" @@ -44,7 +47,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" + wrapProgram $out/bin/i3status-rs --prefix PATH : ${lib.makeBinPath [ iproute2 ethtool iw ]} ''; # Currently no tests are implemented, so we avoid building the package twice diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 25966fb936..deac4bed60 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.ice-wm.org/"; + homepage = "https://ice-wm.org/"; description = "A simple, lightweight X window manager"; longDescription = '' IceWM is a window manager for the X Window System. The goal of IceWM is diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix index 3bbe081646..580fd29faa 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix @@ -1,41 +1,47 @@ { lib , stdenv , fetchFromGitHub -, pkg-config -, meson -, ninja , cairo , glib +, libdrm , libinput +, libxcb +, libxkbcommon , libxml2 +, meson +, ninja , pango +, pkg-config +, scdoc , wayland , wayland-protocols , wlroots -, libxcb -, libxkbcommon , xwayland -, libdrm -, scdoc }: stdenv.mkDerivation rec { pname = "labwc"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { - owner = "johanmalm"; + owner = "labwc"; repo = pname; rev = version; - sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM="; + hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM="; }; + patches = [ + # Required to fix the build with wlroots 0.15.1: + ./relax-the-version-constraint-for-wlroots.patch + ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + buildInputs = [ cairo glib @@ -54,8 +60,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland=enabled" ]; meta = with lib; { - homepage = "https://github.com/johanmalm/labwc"; - description = "Openbox alternative for Wayland"; + homepage = "https://github.com/labwc/labwc"; + description = "A Wayland stacking compositor, similar to Openbox"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch new file mode 100644 index 0000000000..9a790f2851 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/relax-the-version-constraint-for-wlroots.patch @@ -0,0 +1,29 @@ +From 21d8bfcf7899f5ec50b29f523ace4c19cbfbe919 Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Fri, 4 Feb 2022 21:17:05 +0100 +Subject: [PATCH] build: Relax the version constraint for wlroots to accept + patch releases + +Patch releases only contain backwards compatible changes (mainly bug +fixes) so we want to allow them. This fixes the build with the recently +released wlroots 0.15.1 and uses the same version constraints as other +projects that depend on wlroots (e.g., Sway). +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f950b8e..1905dda 100644 +--- a/meson.build ++++ b/meson.build +@@ -37,7 +37,7 @@ if git.found() + endif + add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c') + +-wlroots_version = ['=0.15.0'] ++wlroots_version = ['>=0.15.0', '<0.16.0'] + wlroots_proj = subproject( + 'wlroots', + default_options: ['default_library=static', 'examples=false'], +-- +2.34.1 diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index e1f805662c..2c01a37aa4 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0="; + sha256 = "sha256-ZEfYjgSaj4vVdfgdIcg0PWwlFX90PIm5wvdn9P/8tvo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix index 32eee9df0d..20e29938d0 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8.2"; + version = "9"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; + sha256 = "sha256-ym4fWOcZFlHkLUQEanC+thQLbPial7ZNzxfCWSlweWg="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-next.nix b/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-next.nix index 88b00c2731..d20d7a5ecc 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-next.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-next.nix @@ -2,12 +2,12 @@ picom.overrideAttrs (oldAttrs: rec { pname = "picom-next"; - version = "unstable-2021-11-19"; + version = "unstable-2022-02-05"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce"; - sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw="; + rev = "928963721c8789fc5f27949e8b0730771aab940d"; + sha256 = "sha256-qu9HnUG5VQbiSgduW1oR/tVvzEckaD2TWzds4R5zI+Y="; }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix index ca95806b79..b1f80d102d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix @@ -13,19 +13,20 @@ , udev , libevdev , libinput -, libX11 , libGL +, libX11 +, xwaylandSupport ? true }: stdenv.mkDerivation rec { pname = "river"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "v${version}"; - sha256 = "0mysj6fmgiwzrfzm1rk09k4xa9qiqsdwvwr59b4rs010c1gsllwk"; + sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8="; fetchSubmodules = true; }; @@ -39,9 +40,8 @@ stdenv.mkDerivation rec { udev libevdev libinput - libX11 libGL - ]; + ] ++ lib.optional xwaylandSupport libX11; dontConfigure = true; @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install runHook postInstall ''; /* Builder patch install dir into river to get default config - When installFlags is removed, river becomes half broken. - See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 + When installFlags is removed, river becomes half broken. + See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 */ installFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix index be2c5bc3d6..11ef2979af 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { xcbutilwm ]; - sourceRoot = let + prePatch = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "source/${subdir}"; + in "cd ${subdir}"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix index 598e78be26..043e2b02a7 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3 , wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { pname = "weston"; - version = "9.0.0"; + version = "10.0.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"; + sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ]; buildInputs = [ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index b9d2de7277..32ac43d415 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "chrootenv"; - src = ./.; + src = ./src; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c similarity index 100% rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c rename to third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build similarity index 100% rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build rename to third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 1b6c340f7f..5718cadd4f 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -827,6 +827,8 @@ rec { # this on, but tooling may disable this to insert the store paths more # efficiently via other means, such as bind mounting the host store. includeStorePaths ? true + , # Passthru arguments for the underlying derivation. + passthru ? {} , }: assert @@ -987,7 +989,7 @@ rec { result = runCommand "stream-${baseName}" { inherit (conf) imageName; - passthru = { + passthru = passthru // { inherit (conf) imageTag; # Distinguish tarballs and exes at the Nix level so functions that diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix index 4e4162368b..27cb8312ea 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix @@ -5,10 +5,23 @@ , deepClone ? false, private ? false, forceFetchGit ? false , sparseCheckout ? "" , githubBase ? "github.com", varPrefix ? null +, meta ? { } , ... # For hash agility }@args: + let + + position = (if args.meta.description or null != null + then builtins.unsafeGetAttrPos "description" args.meta + else builtins.unsafeGetAttrPos "rev" args + ); baseUrl = "https://${githubBase}/${owner}/${repo}"; + newMeta = meta // { + homepage = meta.homepage or baseUrl; + + # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation + 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_"; useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != ""); @@ -37,4 +50,4 @@ let ) // privateAttrs // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; } +fetcher fetcherArgs // { meta = newMeta; inherit rev; } diff --git a/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix index 71c0d46649..740baa8cff 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix @@ -9,19 +9,24 @@ let # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 patchutils = buildPackages.patchutils_0_3_3; in -{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args: +{ stripLen ? 0 +, extraPrefix ? null +, excludes ? [] +, includes ? [] +, revert ? false +, postFetch ? "" +, ... +}@args: -let - # Make base-64 encoded SRI hash filename-safe using RFC 4648 §5 - tmpname = lib.replaceStrings [ "+" "/" "=" ] [ "-" "_" "" ] args.sha256; -in fetchurl ({ postFetch = '' - tmpfile="$TMPDIR/${tmpname}" + tmpfile="$TMPDIR/patch" + if [ ! -s "$out" ]; then echo "error: Fetched patch file '$out' is empty!" 1>&2 exit 1 fi + "${patchutils}/bin/lsdiff" "$out" \ | sort -u | sed -e 's/[*?]/\\&/g' \ | xargs -I{} \ @@ -33,6 +38,7 @@ fetchurl ({ --addnewprefix=b/${extraPrefix} \ ''} \ --clean "$out" > "$tmpfile" + if [ ! -s "$tmpfile" ]; then echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2 echo "Did you maybe fetch a HTML representation of a patch instead of a raw patch?" 1>&2 @@ -40,6 +46,7 @@ fetchurl ({ cat "$out" 1>&2 exit 1 fi + ${patchutils}/bin/filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ @@ -56,6 +63,6 @@ fetchurl ({ '' + lib.optionalString revert '' ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" - '' + (args.postFetch or ""); + '' + postFetch; meta.broken = excludes != [] && includes != []; } // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch"]) diff --git a/third_party/nixpkgs/pkgs/build-support/go/garble.nix b/third_party/nixpkgs/pkgs/build-support/go/garble.nix index 62fd931643..c9bcf2cec1 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/garble.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/garble.nix @@ -2,25 +2,25 @@ , buildGoModule , fetchFromGitHub , lib +, git }: buildGoModule rec { pname = "garble"; - version = "20200107"; + version = "0.5.1"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; - rev = "835f4aadf321521acf06aac4d5068473dc4b2ac1"; - sha256 = "sha256-NodsVHRll2YZoxrhmniJvelQOStG82u3kJyc0t8OXD8="; + rev = "v${version}"; + sha256 = "sha256-F8O/33o//yGnum9sZo1dzcvf3ifRalva6SDC36iPbDA=="; }; - vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek="; + vendorSha256 = "sha256-iNH/iBEOTkIhVlDGfI66ZYyVjyH6WrLbUSMyONPjUc4="; - preBuild = '' - # https://github.com/burrowers/garble/issues/184 - substituteInPlace testdata/scripts/tiny.txt \ - --replace "{6,8}" "{4,8}" - '' + lib.optionalString (!stdenv.isx86_64) '' + # Used for some of the tests. + checkInputs = [git]; + + preBuild = lib.optionalString (!stdenv.isx86_64) '' # The test assumex amd64 assembly rm testdata/scripts/asm.txt ''; diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh index 70884741af..0a87d64354 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd.sh @@ -31,7 +31,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Paths in cpio archives *must* be relative, otherwise the kernel # won't unpack 'em. -(cd root && cp -prd --parents $storePaths .) +(cd root && cp -prP --parents $storePaths .) # Put the closure in a gzipped cpio archive. diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix index 9ed00c8a8f..8f7df3386d 100644 --- a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix @@ -57,7 +57,9 @@ else stdenv.mkDerivation rec { ''} if [ -n "$doInstallCheck" ]; then - $CC -Wall -std=c99 -O3 test.c -o test + $CC -Wall -std=c99 \ + ${lib.optionalString (!stdenv.isDarwin) "-D_GNU_SOURCE"} \ + -O3 test.c -o test fi runHook postBuild @@ -97,7 +99,7 @@ else stdenv.mkDerivation rec { installCheckPhase = '' ( source "$hook/nix-support/setup-hook" - NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true" ./test + NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d)" ./test ) ''; diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c b/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c index 0dc7feb382..1222d2ee75 100644 --- a/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c +++ b/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c @@ -84,6 +84,13 @@ static const char * rewrite(const char * path, char * buf) return path; } +static char * rewrite_non_const(char * path, char * buf) +{ + // as long as the argument `path` is non-const, we can consider discarding + // the const qualifier of the return value to be safe. + return (char *)rewrite(path, buf); +} + static int open_needs_mode(int flags) { #ifdef O_TMPFILE @@ -354,3 +361,117 @@ WRAPPER(int, mkdirat)(int dirfd, const char *path, mode_t mode) return mkdirat_real(dirfd, rewrite(path, buf), mode); } WRAPPER_DEF(mkdirat) + +WRAPPER(int, unlink)(const char *path) +{ + int (*unlink_real) (const char *path) = LOOKUP_REAL(unlink); + char buf[PATH_MAX]; + return unlink_real(rewrite(path, buf)); +} +WRAPPER_DEF(unlink) + +WRAPPER(int, unlinkat)(int dirfd, const char *path, int flags) +{ + int (*unlinkat_real) (int dirfd, const char *path, int flags) = LOOKUP_REAL(unlinkat); + char buf[PATH_MAX]; + return unlinkat_real(dirfd, rewrite(path, buf), flags); +} +WRAPPER_DEF(unlinkat) + +WRAPPER(int, rmdir)(const char *path) +{ + int (*rmdir_real) (const char *path) = LOOKUP_REAL(rmdir); + char buf[PATH_MAX]; + return rmdir_real(rewrite(path, buf)); +} +WRAPPER_DEF(rmdir) + +static void copy_temp_wildcard(char * dest, char * src, int suffixlen) { + int dest_len = strnlen(dest, PATH_MAX); + int src_len = strnlen(src, PATH_MAX); + memcpy(dest + dest_len - (6 + suffixlen), src + src_len - (6 + suffixlen), 6); +} + +WRAPPER(int, mkstemp)(char *template) +{ + int (*mkstemp_real) (char *template) = LOOKUP_REAL(mkstemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkstemp_real(rewritten); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return retval; +} +WRAPPER_DEF(mkstemp) + +WRAPPER(int, mkostemp)(char *template, int flags) +{ + int (*mkostemp_real) (char *template, int flags) = LOOKUP_REAL(mkostemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkostemp_real(rewritten, flags); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return retval; +} +WRAPPER_DEF(mkostemp) + +WRAPPER(int, mkstemps)(char *template, int suffixlen) +{ + int (*mkstemps_real) (char *template, int suffixlen) = LOOKUP_REAL(mkstemps); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkstemps_real(rewritten, suffixlen); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, suffixlen); + } + return retval; +} +WRAPPER_DEF(mkstemps) + +WRAPPER(int, mkostemps)(char *template, int suffixlen, int flags) +{ + int (*mkostemps_real) (char *template, int suffixlen, int flags) = LOOKUP_REAL(mkostemps); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkostemps_real(rewritten, suffixlen, flags); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, suffixlen); + } + return retval; +} +WRAPPER_DEF(mkostemps) + +WRAPPER(char *, mkdtemp)(char *template) +{ + char * (*mkdtemp_real) (char *template) = LOOKUP_REAL(mkdtemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + char * retval = mkdtemp_real(rewritten); + if (retval == NULL) { + return retval; + }; + if (rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return template; +} +WRAPPER_DEF(mkdtemp) + +WRAPPER(char *, mktemp)(char *template) +{ + char * (*mktemp_real) (char *template) = LOOKUP_REAL(mktemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + char * retval = mktemp_real(rewritten); + if (retval == NULL) { + return retval; + }; + if (rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return template; +} +WRAPPER_DEF(mktemp) diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/test.c b/third_party/nixpkgs/pkgs/build-support/libredirect/test.c index 853f26bb52..144e6d3d66 100644 --- a/third_party/nixpkgs/pkgs/build-support/libredirect/test.c +++ b/third_party/nixpkgs/pkgs/build-support/libredirect/test.c @@ -1,14 +1,18 @@ #include +#include #include +#include #include #include #include +#include #include #include #include #include +#define TESTDIR "/bar/baz" #define TESTPATH "/foo/bar/test" #define SUBTEST "./test sub" @@ -41,11 +45,25 @@ void test_subprocess(void) { assert(system(SUBTEST) == 0); } +void assert_mktemp_path( + const char * orig_prefix, + const char * orig_suffix, + const char * updated +) { + // prefix unchanged + assert(strncmp(updated, orig_prefix, strlen(orig_prefix)) == 0); + // wildcards replaced + assert(strcmp(updated + strlen(orig_prefix), "XXXXXX") != 0); + // suffix unchanged + assert(strcmp(updated + strlen(orig_prefix) + 6, orig_suffix) == 0); +} + int main(int argc, char *argv[]) { FILE *testfp; int testfd; struct stat testsb; + char buf[PATH_MAX]; testfp = fopen(TESTPATH, "r"); assert(testfp != NULL); @@ -59,6 +77,54 @@ int main(int argc, char *argv[]) assert(stat(TESTPATH, &testsb) != -1); + assert(mkdir(TESTDIR "/dir-mkdir", 0777) == 0); + assert(unlink(TESTDIR "/dir-mkdir") == -1); // it's a directory! +#ifndef __APPLE__ + assert(errno == EISDIR); +#endif + assert(rmdir(TESTDIR "/dir-mkdir") == 0); + assert(unlink(TESTDIR "/dir-mkdir") == -1); + assert(errno == ENOENT); + + assert(mkdirat(123, TESTDIR "/dir-mkdirat", 0777) == 0); + assert(unlinkat(123, TESTDIR "/dir-mkdirat", 0) == -1); // it's a directory! +#ifndef __APPLE__ + assert(errno == EISDIR); +#endif + assert(unlinkat(123, TESTDIR "/dir-mkdirat", AT_REMOVEDIR) == 0); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + testfd = mkstemp(buf); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", "", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + testfd = mkostemp(buf, 0); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", "", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX); + testfd = mkstemps(buf, strlen(".test")); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", ".test", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX); + testfd = mkostemps(buf, strlen(".test"), 0); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", ".test", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + assert(mkdtemp(buf) == buf); + assert_mktemp_path(TESTDIR "/temp", "", buf); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + assert(mktemp(buf) == buf); + assert_mktemp_path(TESTDIR "/temp", "", buf); + test_spawn(); test_system(); diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh index 903e17c3b2..604096135c 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -36,6 +36,58 @@ makeWrapper() { assertExecutable "$original" + # Write wrapper code which adds `value` to the beginning or end of + # the list variable named by `varName`, depending on the `mode` + # specified. + # + # A value which is already part of the list will not be added + # again. If this is the case and the `suffix` mode is used, the + # list won't be touched at all. The `prefix` mode will however + # move the last matching instance of the value to the beginning + # of the list. Any remaining duplicates of the value will be left + # as-is. + addValue() { + local mode="$1" # `prefix` or `suffix` to add to the beginning or end respectively + local varName="$2" # name of list variable to add to + local separator="$3" # character used to separate elements of list + local value="$4" # one value, or multiple values separated by `separator`, to add to list + if test -n "$value"; then + local old_ifs=$IFS + IFS=$separator + + if [[ "$mode" == '--prefix'* ]]; then + # Keep the order of the components as written when + # prefixing; normally, they would be added in the + # reverse order. + local tmp= + for v in $value; do + tmp=$v${tmp:+$separator}$tmp + done + value="$tmp" + fi + for v in $value; do + { + echo "$varName=\${$varName:+${separator@Q}\$$varName${separator@Q}}" # add separators on both ends unless empty + if [[ "$mode" == '--prefix'* ]]; then # -- in prefix mode -- + echo "$varName=\${$varName/${separator@Q}${v@Q}${separator@Q}/${separator@Q}}" # remove the first instance of the value (if any) + echo "$varName=${v@Q}\$$varName" # prepend the value + elif [[ "$mode" == '--suffix'* ]]; then # -- in suffix mode -- + echo "if [[ \$$varName != *${separator@Q}${v@Q}${separator@Q}* ]]; then" # if the value isn't already in the list + echo " $varName=\$$varName${v@Q}" # append the value + echo "fi" + else + echo "unknown mode $mode!" 1>&2 + exit 1 + fi + echo "$varName=\${$varName#${separator@Q}}" # remove leading separator + echo "$varName=\${$varName%${separator@Q}}" # remove trailing separator + echo "export $varName" + } >> "$wrapper" + done + IFS=$old_ifs + fi + } + mkdir -p "$(dirname "$wrapper")" echo "#! @shell@ -e" > "$wrapper" @@ -67,28 +119,14 @@ makeWrapper() { separator="${params[$((n + 2))]}" value="${params[$((n + 3))]}" n=$((n + 3)) - if test -n "$value"; then - if test "$p" = "--suffix"; then - echo "export $varName=\$$varName\${$varName:+${separator@Q}}${value@Q}" >> "$wrapper" - else - echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper" - fi - fi - elif [[ "$p" == "--prefix-each" ]]; then + addValue "$p" "$varName" "$separator" "$value" + elif [[ ("$p" == "--suffix-each") || ("$p" == "--prefix-each") ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" values="${params[$((n + 3))]}" n=$((n + 3)) for value in $values; do - echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper" - done - elif [[ "$p" == "--suffix-each" ]]; then - varName="${params[$((n + 1))]}" - separator="${params[$((n + 2))]}" - values="${params[$((n + 3))]}" - n=$((n + 3)) - for value in $values; do - echo "export $varName=\$$varName\${$varName:+$separator}${value@Q}" >> "$wrapper" + addValue "$p" "$varName" "$separator" "$value" done elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then varName="${params[$((n + 1))]}" @@ -97,11 +135,7 @@ makeWrapper() { n=$((n + 3)) for fileName in $fileNames; do contents="$(cat "$fileName")" - if test "$p" = "--suffix-contents"; then - echo "export $varName=\$$varName\${$varName:+$separator}${contents@Q}" >> "$wrapper" - else - echo "export $varName=${contents@Q}\${$varName:+$separator}\$$varName" >> "$wrapper" - fi + addValue "$p" "$varName" "$separator" "$contents" done elif [[ "$p" == "--add-flags" ]]; then flags="${params[$((n + 1))]}" diff --git a/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix index 011e88dc1d..49b4e6354c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,15 +1,36 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, python3 +, gettext +, appstream-glib +, gnome +}: stdenv.mkDerivation rec { pname = "cantarell-fonts"; - version = "0.301"; + version = "0.303.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"; + sha256 = "+UY6BlnGPlfjgf3XU88ZKSJTlcW0kTWYlCR2GDBTBBE="; }; - nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + nativeBuildInputs = [ + meson + ninja + python3 + python3.pkgs.psautohint + python3.pkgs.cffsubr + python3.pkgs.statmake + python3.pkgs.ufo2ft + python3.pkgs.setuptools + python3.pkgs.ufoLib2 + gettext + appstream-glib + ]; # ad-hoc fix for https://github.com/NixOS/nixpkgs/issues/50855 # until we fix gettext's envHook @@ -19,7 +40,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; + outputHash = "XeqHVdTQ7PTzxkjwfzS/BTR7+k/M69sfUKdRXGOTmZE="; passthru = { updateScript = gnome.updateScript { diff --git a/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix index d7437c3231..3248813c3c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; meta = with lib; { - homepage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/"; + homepage = "https://cm-unicode.sourceforge.io/"; description = "Computer Modern Unicode fonts"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix index 3550facfc1..1b0b033836 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.8.3"; + version = "1.13.0"; in fetchzip rec { name = "Cozette-${version}"; url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx"; + sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; postFetch = '' mkdir -p $out/share/fonts diff --git a/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix b/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix index b8ff43a112..9400ef06cf 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; meta = with lib; { - homepage = "https://aldusleaf.org/crimson.html"; + homepage = "https://github.com/skosch/Crimson"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix index aed90b103b..ba9fed1be2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix @@ -12,7 +12,7 @@ let This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and the TeX Gyre DejaVu Math font. ''; - homepage = "http://dejavu-fonts.org/wiki/Main_Page"; + homepage = "https://dejavu-fonts.github.io/"; # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. diff --git a/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix index c6bb23b432..3fd0115ddb 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix @@ -23,7 +23,7 @@ fetchzip rec { Designed by Pablo Impallari and Andres Torresi. ''; - homepage = "http://www.impallari.com/projects/overview/encode"; + homepage = "https://github.com/impallari/Encode-Sans"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix index cafd3c16fd..5223bc499d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix @@ -1,16 +1,16 @@ { lib, fetchzip }: fetchzip { - name = "ipaexfont-003.01"; + name = "ipaexfont-004.01"; - url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,7 +21,7 @@ fetchzip { This is the successor to the IPA fonts. ''; - homepage = "http://ipafont.ipa.go.jp/"; + homepage = "https://moji.or.jp/ipafont/"; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix index eec28db883..9bc9b82db0 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "ipafont-003.03"; - url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; + url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -19,7 +19,7 @@ fetchzip { Promotion Agency of Japan. It provides both Mincho and Gothic fonts, suitable for both display and printing. ''; - homepage = "http://ipafont.ipa.go.jp/ipafont/"; + homepage = "https://moji.or.jp/ipafont/"; license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index a1f8f31677..136a321876 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.043"; + version = "0.044"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-oxQRrFhTf37OrJSbDlmzh/7xOuKrtxO7v2+j7QcsAmE="; + sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index a0d3b34c85..9c9996db39 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchurl , cairo +, nixosTests , python3 , pkg-config , pngquant @@ -70,12 +71,15 @@ let owner = "googlefonts"; repo = "noto-cjk"; inherit rev sha256; + sparseCheckout = "${typeface}/OTC"; }; installPhase = '' install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc ''; + passthru.tests.noto-fonts = nixosTests.noto-fonts; + meta = with lib; { description = "Beautiful and free fonts for CJK languages"; homepage = "https://www.google.com/get/noto/help/cjk/"; @@ -113,14 +117,14 @@ in typeface = "Sans"; version = "2.004"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU="; }; noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; version = "2.000"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY="; }; noto-fonts-emoji = let 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 503e4e1d29..9da7178e80 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 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20211201"; + version = "20220204"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-lcwQALFQ4zkgDLCX1uthAP3QZwP7UcWcPSOU+UTDykE="; + sha256 = "sha256-DYz2fnn1ZfX09NQcRXmGTYY95K5wOWhlmJeDjEvN1vY="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix new file mode 100644 index 0000000000..5afd2fe228 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "phinger-cursors"; + version = "1.1"; + + src = fetchurl { + url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2"; + sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc="; + }; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r ./phinger-cursors* $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "The most over-engineered cursor theme"; + homepage = "https://github.com/phisch/phinger-cursors"; + platforms = platforms.unix; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix index 3ed389569b..d19dcba69f 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "unstable-2021-12-24"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495"; - sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki"; + rev = version; + sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; # These fixup steps are slow and unnecessary for this package. - # Package may installs almost 400 000 small files. + # Package may install almost 400 000 small files. dontPatchELF = true; dontRewriteSymlinks = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index c8a76b9836..2ffb05e2eb 100644 --- a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20210812"; + version = "20220119"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-dRqyjDC9yNkNOnYQ9fkWPlnyzSqIZ4zxZ2T7t8Bu9FE="; + sha256 = "sha256-8JJ6RG7yA1ssoYsvgDYp3/r+h1+rKnOwwoDhRx2brY8="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index c695ea2688..48a9bc9a0d 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3034b8f1052c41d5b3c571cb2bedb5f62bbede65", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3034b8f1052c41d5b3c571cb2bedb5f62bbede65.tar.gz", - "sha256": "0kqga1mf7vr292jcaqw8qk4s1bjwc2z1wwjih5xwli3hkk584l20", - "msg": "Update from Hackage at 2022-01-24T10:21:35Z" + "commit": "72a59574747346b3f9aa2cd91cb7469d4e168b53", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/72a59574747346b3f9aa2cd91cb7469d4e168b53.tar.gz", + "sha256": "0nspncjgh8lgr15zx8ss3fp289jl7gg21wchj0k821y3cz057ry3", + "msg": "Update from Hackage at 2022-01-31T19:23:21Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/mime-types/default.nix b/third_party/nixpkgs/pkgs/data/misc/mime-types/default.nix deleted file mode 100644 index 77b67e48f9..0000000000 --- a/third_party/nixpkgs/pkgs/data/misc/mime-types/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchzip }: - -let - version = "9"; -in fetchzip rec { - name = "mime-types-${version}"; - url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; - postFetch = '' - mkdir -p $out/etc - tar xjvf $downloadedFile --directory=$out/etc --strip-components=1 - ''; - sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; - - meta = with lib; { - description = "A database of common mappings of file extensions to MIME types"; - homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/data/misc/poppler-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/poppler-data/default.nix index d1e0434dc2..6d35279b6d 100644 --- a/third_party/nixpkgs/pkgs/data/misc/poppler-data/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/poppler-data/default.nix @@ -1,20 +1,30 @@ -{ fetchurl, lib, stdenv, cmake, ninja }: +{ fetchurl +, lib +, stdenv +, cmake +, ninja +, poppler +}: stdenv.mkDerivation rec { - name = "poppler-data-0.4.11"; + pname = "poppler-data"; + version = "0.4.11"; src = fetchurl { - url = "https://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "sha256-LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; + url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz"; + sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = with maintainers; [ ]; + maintainers = poppler.meta.maintainers; }; } 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 89e12785b7..1115edabce 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 = "20220114024213"; + version = "20220201175515"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-sF9WvXhyfMUvSXmFjkfGq4cZE/MiAnOKbkpv2CHSV3Q="; + sha256 = "sha256-vgw6i8djBQDV+fmkVe5CuKMwES/PXGoVe8cTgB5tflo="; }; vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix index 2bed43daee..c1b6500a1a 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202201200035"; + version = "202202030030"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "8d388b019028fb6fa9f0756b745331ffb9eb7c03"; - sha256 = "sha256-ymXaDmmMucTuvJRqjJv6n22e7ONRt1awtOMABFJ+Y/w="; + rev = "ca550e313a264e05c1fb22f293bc64c7432049ef"; + sha256 = "sha256-gajlNfyaq8HwghBU6Gcq7lyqjVAmNcOgJKKsw5P+8Nc="; }; installPhase = '' 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 28737253af..735dfdb4f8 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 @@ -63,8 +63,9 @@ let ''; meta = { - homepage = "http://wiki.docbook.org/topic/DocBookXslStylesheets"; + homepage = "https://github.com/docbook/wiki/wiki/DocBookXslStylesheets"; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/data/themes/graphite/default.nix b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix similarity index 76% rename from third_party/nixpkgs/pkgs/data/themes/graphite/default.nix rename to third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix index 7f3ee33c03..0c9bae8ac3 100644 --- a/third_party/nixpkgs/pkgs/data/themes/graphite/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -10,6 +10,8 @@ , sizeVariants ? [] # default: standard , tweaks ? [] , wallpapers ? false +, withGrub ? false +, grubScreens ? [] # default: 1080p }: let @@ -20,16 +22,17 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2022-01-07"; + version = "unstable-2022-02-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec"; - sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk"; + rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891"; + sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr"; }; nativeBuildInputs = [ @@ -65,6 +68,18 @@ stdenvNoCC.mkDerivation { ''} ''} + ${lib.optionalString withGrub '' + ( + cd other/grub2 + + patchShebangs install.sh + + ./install.sh --justcopy --dest $out/share/grub/themes \ + ${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \ + ${lib.optionalString (grubScreens != []) "--screen " + builtins.toString grubScreens} + ) + ''} + jdupes -L -r $out/share runHook postInstall diff --git a/third_party/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix new file mode 100644 index 0000000000..dd3a215a03 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/graphite-kde-theme/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "graphite-kde-theme"; + version = "2022-02-08"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf"; + }; + + installPhase = '' + runHook preInstall + + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + + name= ./install.sh --dest $out/share/themes + + mkdir -p $out/share/sddm/themes + cp -a sddm/Graphite $out/share/sddm/themes/ + + runHook postInstall + ''; + + meta = with lib; { + description = "A flat Design theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Graphite-kde-theme"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix new file mode 100644 index 0000000000..06b0e32d1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, wrapQtAppsHook +, kwin +, kdelibs4support +, libepoxy +, libXdmcp +, lib +}: + +stdenv.mkDerivation rec { + pname = "kde-rounded-corners"; + version = "unstable-2021-11-06"; + + src = fetchFromGitHub { + owner = "matinlotfali"; + repo = "KDE-Rounded-Corners"; + rev = "8ad8f5f5eff9d1625abc57cb24dc484d51f0e1bd"; + sha256 = "0xbskf7jd03d2invfz1nnfc82klzvc784snw539n4kn6c6rc381p"; + }; + + postConfigure = '' + substituteInPlace cmake_install.cmake \ + --replace "${kdelibs4support}" "$out" + ''; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ kwin kdelibs4support libepoxy libXdmcp ]; + + meta = with lib; { + description = "Rounds the corners of your windows"; + homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index 7a1b79d6d9..966cb1c4f6 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "12.0"; + version = "12.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "10mf1cbm6a9k0b1vcafy3jb7kicpvnf6xqmn1dfxwsq3k81mmy7d"; + sha256 = "04im7va5xpi17yjkrc46m5bm9j55qq66br1xg8a2arm0j4i0bqsk"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix index 7715f4f232..71b661f126 100644 --- a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix @@ -46,6 +46,8 @@ in stdenv.mkDerivation rec { bison ncompress gawk autoPatchelfHook makeWrapper fakeroot rpcsvc-proto ]; + # build fails otherwise + enableParallelBuilding = false; makeFlags = [ "World" diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/bindings/libglademm/default.nix deleted file mode 100644 index b997a9ddd1..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }: - -stdenv.mkDerivation rec { - name = "libglademm-2.6.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; - sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; - }; - - outputs = [ "out" "devdoc" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool ]; - - propagatedBuildInputs = [ gtkmm2 libglade ]; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix index 90d6fd0b7a..a8ff7b58ed 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix @@ -62,10 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; { autoreconfHook = pkgs.autoreconfHook269; }; -#### BINDINGS - - libglademm = callPackage ./bindings/libglademm { }; - } // lib.optionalAttrs (config.allowAliases or true) { inherit (pkgs) # GTK Libs @@ -89,4 +85,5 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; + libglademm = throw "libglademm has been removed"; # 2022-01-15 }) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix index 392ea61688..6b51d11adf 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix @@ -43,13 +43,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "41.0"; + version = "41.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VzjEKTqfWoDUpungb00N8+nzE8p7Yb+02K+rqYPiANw="; + sha256 = "uwtlCnzqkPCaMyhPvQKXUxVAfvwY6BQAmFLRvK00N9Q="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix index 860af8bee1..302d201f23 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "41.2"; + version = "41.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-NDKe79rK0jMqatuuU4yNpuUiNcd3WpCLfDIECgdT7Go="; + sha256 = "sha256-jNHKq5MRgowEUkaMalBnqbxEY4NbI6FL5E6P2bAwAcY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix index 6a274e35bf..7ee9e156e5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "40.0"; + version = "41.3"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = version; - hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo="; + hash = "sha256-aC0tkTf2lgCRlcbFj1FEOVBm3YUuP+8Yz98W3ZjUydg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix index 3ba6958fad..3c6903b2b0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,16 +1,42 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas -, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, libepoxy, gnugrep, bash, gnome-session-ctl }: +{ fetchurl +, lib +, stdenv +, substituteAll +, meson +, ninja +, pkg-config +, gnome +, glib +, gtk3 +, gsettings-desktop-schemas +, gnome-desktop +, dbus +, json-glib +, libICE +, xmlto +, docbook_xsl +, docbook_xml_dtd_412 +, python3 +, libxslt +, gettext +, makeWrapper +, systemd +, xorg +, libepoxy +, bash +, gnome-session-ctl +}: stdenv.mkDerivation rec { pname = "gnome-session"; - version = "40.1.1"; + # Also bump ./ctl.nix when bumping major version. + version = "41.3"; - outputs = ["out" "sessions"]; + outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w"; + sha256 = "7koikFP1ImJAVIiWCTNbiFKHz2e73g3J/YgrAeybWzk="; }; patches = [ @@ -18,22 +44,41 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; gsettings = "${glib.bin}/bin/gsettings"; dbusLaunch = "${dbus.lib}/bin/dbus-launch"; - grep = "${gnugrep}/bin/grep"; bash = "${bash}/bin/bash"; }) ]; - mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; - nativeBuildInputs = [ - meson ninja pkg-config gettext makeWrapper - xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3 + meson + ninja + pkg-config + gettext + makeWrapper + xmlto + libxslt + docbook_xsl + docbook_xml_dtd_412 + python3 dbus # for DTD ]; buildInputs = [ - glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme - gnome.gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy + glib + gtk3 + libICE + gnome-desktop + json-glib + xorg.xtrans + gnome.adwaita-icon-theme + gnome.gnome-settings-daemon + gsettings-desktop-schemas + systemd + libepoxy + ]; + + mesonFlags = [ + "-Dsystemd=true" + "-Dsystemd_session=default" ]; postPatch = '' @@ -49,17 +94,6 @@ stdenv.mkDerivation rec { {} + ''; - # `bin/gnome-session` will reset the environment when run in wayland, we - # therefor wrap `libexec/gnome-session-binary` instead which is the actual - # binary needing wrapping - preFixup = '' - wrapProgram "$out/libexec/gnome-session-binary" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" - ''; - # We move the GNOME sessions to another output since gnome-session is a dependency of # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is # enabled without proper GNOME installation. @@ -72,12 +106,26 @@ stdenv.mkDerivation rec { rm -rf $out/libexec/gnome-session-ctl ''; + # `bin/gnome-session` will reset the environment when run in wayland, we + # therefor wrap `libexec/gnome-session-binary` instead which is the actual + # binary needing wrapping + preFixup = '' + wrapProgram "$out/libexec/gnome-session-binary" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ + --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-session"; attrPath = "gnome.gnome-session"; }; - providedSessions = [ "gnome" "gnome-xorg" ]; + providedSessions = [ + "gnome" + "gnome-xorg" + ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch index 320b3024de..38805c645b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch @@ -1,17 +1,10 @@ diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index ddd1a591..46a3488b 100755 +index b4b1f8fa..99d52cba 100755 --- a/gnome-session/gnome-session.in +++ b/gnome-session/gnome-session.in -@@ -3,17 +3,19 @@ - if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && +@@ -4,13 +4,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && - [ -n "$SHELL" ] && -- grep -q "$SHELL" /etc/shells && -- ! (echo "$SHELL" | grep -q "false") && -- ! (echo "$SHELL" | grep -q "nologin"); then -+ @grep@ -q "$SHELL" /etc/shells && -+ ! (echo "$SHELL" | @grep@ -q "false") && -+ ! (echo "$SHELL" | @grep@ -q "nologin"); then + [ -n "$SHELL" ]; then if [ "$1" != '-l' ]; then - exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" + # Make sure the shell actually sets up the environment. @@ -28,7 +21,7 @@ index ddd1a591..46a3488b 100755 REGION=${REGION%\'} diff --git a/gnome-session/main.c b/gnome-session/main.c -index 84edfbe5..e5285489 100644 +index a460a849..9d07898f 100644 --- a/gnome-session/main.c +++ b/gnome-session/main.c @@ -215,7 +215,7 @@ require_dbus_session (int argc, diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index 5de52723d0..dc3aaea930 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "41.2"; + version = "41.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "OEZR6wUTk9ur4AbRrQV78p1c1z67h7x3n/Xhwx6AqCc="; + sha256 = "Hj36KgvklFQYK0rOd/EdENP1uYjvD8tzK3MTVzlJ3tE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix index 17145ccadf..d9dd6efa14 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix @@ -46,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "41.2"; + version = "41.3"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AN+oEvHEhtdKK3P0IEWuEYL5JGx3lNZ9dLXlQ+pwBhc="; + sha256 = "cZxdEGDrYFwbpkO0hvtXsaPHGX59+DvWwzZvxLaEd+U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix deleted file mode 100644 index 0d1f8df4f2..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-dash-to-panel"; - version = "45"; - - src = fetchFromGitHub { - owner = "home-sweet-gnome"; - repo = "dash-to-panel"; - rev = "v${version}"; - sha256 = "05bfd3b1g9zd86pl1rpgfqsmip271lasyfj8phpqf1gdds5yz6f6"; - }; - - buildInputs = [ - glib gettext - ]; - - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - - passthru = { - extensionUuid = "dash-to-panel@jderose9.github.com"; - extensionPortalSlug = "dash-to-panel"; - }; - - meta = with lib; { - description = "An icon taskbar for Gnome Shell"; - license = licenses.gpl2; - maintainers = with maintainers; [ mounium ]; - homepage = "https://github.com/jderose9/dash-to-panel"; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json index d5bafe73fa..d34a95ea36 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json @@ -11,7 +11,7 @@ , {"uuid": "user-theme@gnome-shell-extensions.gcampax.github.com", "name": "User Themes", "pname": "user-themes", "description": "Load shell themes from user directory.", "link": "https://extensions.gnome.org/extension/19/user-themes/", "shell_version_map": {"38": {"version": "42", "sha256": "0jykwcd8pmvr03dm2vala6nzzhi9i83c11svgx8wymfvxr5qrya8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInVzZXItdGhlbWVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "40": {"version": "46", "sha256": "07gbzvbnxah5bws5vc6sivw43j0rgm23n6vsp4a64z7s8s2ay7sm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "48", "sha256": "0bbm4vbyrp9n3mmqwbhpb6f7dmlx23x1avnp8pilw4p1wr03p7h8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}}} , {"uuid": "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "name": "Workspace Indicator", "pname": "workspace-indicator", "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.", "link": "https://extensions.gnome.org/extension/21/workspace-indicator/", "shell_version_map": {"38": {"version": "45", "sha256": "16y7zhlsj0qjwwj78fvcr81m7081i2y30gwjm35qahr3j0gfrk16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid29ya3NwYWNlLWluZGljYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"}, "40": {"version": "49", "sha256": "0483k1scq0lwfpg3i3yww7kfzv0qwlp6aqyikkacivh0nkq6v2iy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "41": {"version": "51", "sha256": "1s2mkk41vq9nrlsw26317zh592l59y7cldfmkd3f0d4j2mdiy8bw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="}}} , {"uuid": "gTile@vibou", "name": "gTile", "pname": "gtile", "description": "Tile windows on a grid.", "link": "https://extensions.gnome.org/extension/28/gtile/", "shell_version_map": {"38": {"version": "48", "sha256": "10lldk59j2sfdhcxj8dw83bhc1jkm2343h8yxb2v722qhkz1bhhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZS9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "40": {"version": "48", "sha256": "10lldk59j2sfdhcxj8dw83bhc1jkm2343h8yxb2v722qhkz1bhhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZS9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "41": {"version": "48", "sha256": "10lldk59j2sfdhcxj8dw83bhc1jkm2343h8yxb2v722qhkz1bhhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZS9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDQ4Cn0="}}} -, {"uuid": "lockkeys@vaina.lt", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock & Capslock status on the panel", "link": "https://extensions.gnome.org/extension/36/lock-keys/", "shell_version_map": {"38": {"version": "45", "sha256": "0cqkhi8k8lywjsy9g6nbl5kbv8bvz4nql16k1ciajar4443gbz7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0NQp9"}, "40": {"version": "45", "sha256": "0cqkhi8k8lywjsy9g6nbl5kbv8bvz4nql16k1ciajar4443gbz7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0NQp9"}, "41": {"version": "45", "sha256": "0cqkhi8k8lywjsy9g6nbl5kbv8bvz4nql16k1ciajar4443gbz7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0NQp9"}}} +, {"uuid": "lockkeys@vaina.lt", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock & Capslock status on the panel. Gnome version 3.30 and earlier users please install 44 version of the extension https://extensions.gnome.org/download-extension/lockkeys%40vaina.lt.shell-extension.zip?version_tag=26229 ", "link": "https://extensions.gnome.org/extension/36/lock-keys/", "shell_version_map": {"38": {"version": "45", "sha256": "08g4gng7ik6y27yl4s8cbk9k5k89xlkgi02jwximjvqnrsp0r5sg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "40": {"version": "45", "sha256": "08g4gng7ik6y27yl4s8cbk9k5k89xlkgi02jwximjvqnrsp0r5sg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "41": {"version": "45", "sha256": "08g4gng7ik6y27yl4s8cbk9k5k89xlkgi02jwximjvqnrsp0r5sg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDQ1Cn0="}}} , {"uuid": "putWindow@clemens.lab21.org", "name": "Put Windows", "pname": "put-windows", "description": "Fully customizable replacement for the old compiz put plugin. \n * Move windows to left/right side, bottom/top, center or corner \n * Move window to other screen \n * Select focused window using the keyboard \n * Application based window placement \n\n Please check github if your gnome-shell version is not supported", "link": "https://extensions.gnome.org/extension/39/put-windows/", "shell_version_map": {"38": {"version": "32", "sha256": "1n4hk2sqdbcn25lxk02vljc9xxbidragimvc4b6dj2m72625lx67", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IGN1c3RvbWl6YWJsZSByZXBsYWNlbWVudCBmb3IgdGhlIG9sZCBjb21waXogcHV0IHBsdWdpbi4gXG4gKiBNb3ZlIHdpbmRvd3MgdG8gbGVmdC9yaWdodCBzaWRlLCBib3R0b20vdG9wLCBjZW50ZXIgb3IgY29ybmVyIFxuICogTW92ZSB3aW5kb3cgdG8gb3RoZXIgc2NyZWVuIFxuICogU2VsZWN0IGZvY3VzZWQgd2luZG93IHVzaW5nIHRoZSBrZXlib2FyZCBcbiAqIEFwcGxpY2F0aW9uIGJhc2VkIHdpbmRvdyBwbGFjZW1lbnQgXG5cbiBQbGVhc2UgY2hlY2sgZ2l0aHViIGlmIHlvdXIgZ25vbWUtc2hlbGwgdmVyc2lvbiBpcyBub3Qgc3VwcG9ydGVkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHV0V2luZG93IiwKICAibmFtZSI6ICJQdXQgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmctbGFiMjEtcHV0d2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVnZXN0aS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLW5lZ2VzdGkiLAogICJ1dWlkIjogInB1dFdpbmRvd0BjbGVtZW5zLmxhYjIxLm9yZyIsCiAgInZlcnNpb24iOiAzMgp9"}}} , {"uuid": "permanent-notifications@bonzini.gnu.org", "name": "Permanent notifications", "pname": "permanent-notifications", "description": "Keep notifications on the message tray until clicked", "link": "https://extensions.gnome.org/extension/41/permanent-notifications/", "shell_version_map": {"40": {"version": "7", "sha256": "1zlxvn9c4ydpvkja6vpyvif21rfi1y86rzi0iqms5mk8in4cgx41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JvbnppbmkvZ25vbWUtc2hlbGwtcGVybWFuZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcm1hbmVudC1ub3RpZmljYXRpb25zQGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1zlxvn9c4ydpvkja6vpyvif21rfi1y86rzi0iqms5mk8in4cgx41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JvbnppbmkvZ25vbWUtc2hlbGwtcGVybWFuZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcm1hbmVudC1ub3RpZmljYXRpb25zQGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "gnome-shell-trash-extension", "name": "Trash", "pname": "trash", "description": "A Trash button for the GNOME shell panel", "link": "https://extensions.gnome.org/extension/48/trash/", "shell_version_map": {"38": {"version": "18", "sha256": "1cysvxrgi7lnig7d8blhqqbxz0phd4fvn7nww6zpihjnw32rvm4z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} @@ -36,7 +36,7 @@ , {"uuid": "caffeine@patapon.info", "name": "Caffeine", "pname": "caffeine", "description": "Disable the screensaver and auto suspend", "link": "https://extensions.gnome.org/extension/517/caffeine/", "shell_version_map": {"38": {"version": "37", "sha256": "05g1910jcwkjl9gmvnk57ip20sbzy09mk4v6q2fm0pg8398v0vhf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW9ucGF0YXBvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJ1dWlkIjogImNhZmZlaW5lQHBhdGFwb24uaW5mbyIsCiAgInZlcnNpb24iOiAzNwp9"}, "40": {"version": "40", "sha256": "1rza4ppzcimh6qmg14srawv16vas4lbcw4njxjigl29d9qf43sdr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDQwCn0="}, "41": {"version": "40", "sha256": "1rza4ppzcimh6qmg14srawv16vas4lbcw4njxjigl29d9qf43sdr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDQwCn0="}}} , {"uuid": "backslide@codeisland.org", "name": "BackSlide", "pname": "backslide", "description": "Automatic background-image (wallpaper) slideshow for Gnome Shell", "link": "https://extensions.gnome.org/extension/543/backslide/", "shell_version_map": {"38": {"version": "18", "sha256": "1vm4w61cksj9ya5z4xcy7h96bk0wwi5njp0lyhnqa8j2fgsq5iin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9iaXRidWNrZXQub3JnL0x1a2FzS251dGgvYmFja3NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}}} , {"uuid": "historymanager-prefix-search@sustmidown.centrum.cz", "name": "HistoryManager Prefix Search", "pname": "historymanager-prefix-search", "description": "Use PageUp and PageDown to move in HistoryManager (eg. RunCommand, Looking Glass) according to prefix", "link": "https://extensions.gnome.org/extension/544/historymanager-prefix-search/", "shell_version_map": {"40": {"version": "14", "sha256": "1n6gac80xrk6lhlj29zb03h62ia0a66va0i9pmjgqbg3bs74yds0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBQYWdlVXAgYW5kIFBhZ2VEb3duIHRvIG1vdmUgaW4gSGlzdG9yeU1hbmFnZXIgKGVnLiBSdW5Db21tYW5kLCBMb29raW5nIEdsYXNzKSBhY2NvcmRpbmcgdG8gcHJlZml4IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlzdG9yeW1hbmFnZXItcHJlZml4LXNlYXJjaCIsCiAgIm5hbWUiOiAiSGlzdG9yeU1hbmFnZXIgUHJlZml4IFNlYXJjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5oaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy43LjMiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VzdG1pL2dub21lLXNoZWxsLWV4dGVuc2lvbi1oaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoIiwKICAidXVpZCI6ICJoaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoQHN1c3RtaWRvd24uY2VudHJ1bS5jeiIsCiAgInZlcnNpb24iOiAxNAp9"}}} -, {"uuid": "hidetopbar@mathieu.bidon.ca", "name": "Hide Top Bar", "pname": "hide-top-bar", "description": "Hides the top bar, except in overview. However, there is an option to show the panel whenever the mouse pointer approaches the edge of the screen. And if \"intellihide\" is enabled, the panel only hides when a window takes the space.\n\n- Press backspace to remove keyboard shortcut.\n- Log off and on again when there is an error after upgrading.", "link": "https://extensions.gnome.org/extension/545/hide-top-bar/", "shell_version_map": {"38": {"version": "100", "sha256": "19mwdahjj5lyjbhzl7cha129zmccfgxy4yjhrsfk18i4k394rbcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDAKfQ=="}, "40": {"version": "100", "sha256": "19mwdahjj5lyjbhzl7cha129zmccfgxy4yjhrsfk18i4k394rbcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDAKfQ=="}, "41": {"version": "100", "sha256": "19mwdahjj5lyjbhzl7cha129zmccfgxy4yjhrsfk18i4k394rbcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDAKfQ=="}}} +, {"uuid": "hidetopbar@mathieu.bidon.ca", "name": "Hide Top Bar", "pname": "hide-top-bar", "description": "Hides the top bar, except in overview. However, there is an option to show the panel whenever the mouse pointer approaches the edge of the screen. And if \"intellihide\" is enabled, the panel only hides when a window takes the space.\n\n- Press backspace to remove keyboard shortcut.\n- Log off and on again when there is an error after upgrading.", "link": "https://extensions.gnome.org/extension/545/hide-top-bar/", "shell_version_map": {"38": {"version": "102", "sha256": "1d31dnlhis06fmkpyxdymj2qk7pvk0gqngmgdqw72xcnl3s341zc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDIKfQ=="}, "40": {"version": "102", "sha256": "1d31dnlhis06fmkpyxdymj2qk7pvk0gqngmgdqw72xcnl3s341zc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDIKfQ=="}, "41": {"version": "102", "sha256": "1d31dnlhis06fmkpyxdymj2qk7pvk0gqngmgdqw72xcnl3s341zc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDIKfQ=="}}} , {"uuid": "hdate@hatul.info", "name": "Gnome HDate", "pname": "gnome-hdate", "description": "Show Hebrew Date in the Panel.\nRequires libhdate-glib", "link": "https://extensions.gnome.org/extension/554/gnome-hdate/", "shell_version_map": {"40": {"version": "20", "sha256": "1aj5ry3g93wx1crn8rr2jm9vbz07kz0r7qc6sr2vj352bgjzrlbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pYWQvZ25vbWUtaGRhdGUiLAogICJ1dWlkIjogImhkYXRlQGhhdHVsLmluZm8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "1aj5ry3g93wx1crn8rr2jm9vbz07kz0r7qc6sr2vj352bgjzrlbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pYWQvZ25vbWUtaGRhdGUiLAogICJ1dWlkIjogImhkYXRlQGhhdHVsLmluZm8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} , {"uuid": "todo.txt@bart.libert.gmail.com", "name": "Todo.txt", "pname": "todotxt", "description": "A Gnome shell interface for todo.txt. \n\nTodo.txt is a future-proof syntax for tasks (not made by me), for more info: http://todotxt.com/\n\nSome examples:\nTask: Basic task\n(A) Task: High priority task\nTask @project +context: Task is part of project and has a certain context\nx 2013-08-22 Task: Task was completed on the 22nd of August\n\nFor more info about the syntax: https://github.com/ginatrapani/todo.txt-cli/wiki/The-Todo.txt-Format\n\nQuick start:\nWhen you first enable the extension, chances are high you'll see a [X] in your top panel. If you click the [X], you will be able to choose between creating the necessary files automatically or selecting your own existing files to be used with the extension.\n\nPlease use the issue tracker on the homepage to report bugs and/or file feature requests, this makes tracking easier for me. Thanks!\n\nSee the included CHANGELOG.md for info about changes between different versions, or see it online: https://gitlab.com/bartl/todo-txt-gnome-shell-extension/raw/master/CHANGELOG.md", "link": "https://extensions.gnome.org/extension/570/todotxt/", "shell_version_map": {"38": {"version": "33", "sha256": "1spq0i8w9xw8zgq3niqzs2dslg01l0gsbcys26p8lpydz0dsy7xa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JhcnRsL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9kby50eHRAYmFydC5saWJlcnQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMzCn0="}, "40": {"version": "35", "sha256": "18vc11nls6giskq94kw48kbcx399706rglaqsmla4yvix0jkd8lz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iYXJ0bC90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "41": {"version": "36", "sha256": "1pnw1fm38zxacjyz31vw9wfdmk1h6i4grxzi3n1nlz23gpkn3df3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iYXJ0bC90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"}}} , {"uuid": "text_translator@awamper.gmail.com", "name": "Text Translator", "pname": "text-translator", "description": "** Needs the package translate-shell **\nTranslation of the text by different translators (currently Google.Translate, Yandex.Translate).\nShortcuts:\nSuper+T - open translator dialog.\nSuper+Shift+T - open translator dialog and translate text from clipboard.\nSuper+Alt+T - open translator dialog and translate from primary selection.\nCtrl+Enter+ - Translate text.\nCtrl+Shift+C - copy translated text to clipboard.\nCtrl+S - swap languages.\nCtrl+D - reset languages to default\nTab+ - toggle transliteration of result text.", "link": "https://extensions.gnome.org/extension/593/text-translator/", "shell_version_map": {"38": {"version": "36", "sha256": "1idzgg4vb791k5dryjvznr6mfwfx59vlgabw2n3spysbwvjv2a48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqIE5lZWRzIHRoZSBwYWNrYWdlIHRyYW5zbGF0ZS1zaGVsbCAqKlxuVHJhbnNsYXRpb24gb2YgdGhlIHRleHQgYnkgZGlmZmVyZW50IHRyYW5zbGF0b3JzIChjdXJyZW50bHkgR29vZ2xlLlRyYW5zbGF0ZSwgWWFuZGV4LlRyYW5zbGF0ZSkuXG5TaG9ydGN1dHM6XG5TdXBlcitUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZy5cblN1cGVyK1NoaWZ0K1QgLSBvcGVuIHRyYW5zbGF0b3IgZGlhbG9nIGFuZCB0cmFuc2xhdGUgdGV4dCBmcm9tIGNsaXBib2FyZC5cblN1cGVyK0FsdCtUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZyBhbmQgdHJhbnNsYXRlIGZyb20gcHJpbWFyeSBzZWxlY3Rpb24uXG5DdHJsK0VudGVyKyAtIFRyYW5zbGF0ZSB0ZXh0LlxuQ3RybCtTaGlmdCtDIC0gY29weSB0cmFuc2xhdGVkIHRleHQgdG8gY2xpcGJvYXJkLlxuQ3RybCtTIC0gc3dhcCBsYW5ndWFnZXMuXG5DdHJsK0QgLSByZXNldCBsYW5ndWFnZXMgdG8gZGVmYXVsdFxuVGFiKyAtIHRvZ2dsZSB0cmFuc2xpdGVyYXRpb24gb2YgcmVzdWx0IHRleHQuIiwKICAibmFtZSI6ICJUZXh0IFRyYW5zbGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGV4dC10cmFuc2xhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Vmb2UvdGV4dC10cmFuc2xhdG9yIiwKICAidXVpZCI6ICJ0ZXh0X3RyYW5zbGF0b3JAYXdhbXBlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} @@ -49,7 +49,7 @@ , {"uuid": "ShellTile@emasab.it", "name": "ShellTile", "pname": "shelltile", "description": "A tiling window extension for GNOME Shell. Just move a window to the edges of the screen to create a tiling, otherwise move a window over another one, holding down the Control key. Grouped windows minimize, resize, raise and change workspace together. Move or maximize a window to remove it from the group.", "link": "https://extensions.gnome.org/extension/657/shelltile/", "shell_version_map": {"38": {"version": "65", "sha256": "0kb7crng8lmkcjjxzd7ma2x0x43rg4j5ygvvpiq5z2j15rx8bcg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbWFzYWIvc2hlbGx0aWxlIiwKICAidXVpZCI6ICJTaGVsbFRpbGVAZW1hc2FiLml0IiwKICAidmVyc2lvbiI6IDY1Cn0="}}} , {"uuid": "lunarcal@ailin.nemui", "name": "Lunar Calendar 农历", "pname": "lunar-calendar", "description": "Display Chinese Lunar Calendar in panel\n\n⚠⚠⚠ dependency: typelib-1_0-LunarDate-3_0 / gir1.2-lunar-date-2.0", "link": "https://extensions.gnome.org/extension/675/lunar-calendar/", "shell_version_map": {"38": {"version": "25", "sha256": "1pj439wdsqpxim6p4d0y09v40kdjga908hagxfyvq0fzjykc51rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "27", "sha256": "159iiyw0sblq8jwkm1qfcakgdy3rvk07vzz8q6yj2davp64wpg5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsdW5hcmNhbEBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "159iiyw0sblq8jwkm1qfcakgdy3rvk07vzz8q6yj2davp64wpg5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsdW5hcmNhbEBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAyNwp9"}}} , {"uuid": "EasyScreenCast@iacopodeenosee.gmail.com", "name": "EasyScreenCast", "pname": "easyscreencast", "description": "This extension simplifies the use of the video recording function integrated in gnome shell, allows quickly to change the various settings of the desktop recording.\n\nSOURCE CODE -> https://github.com/EasyScreenCast/EasyScreenCast\n\nVIDEO -> https://youtu.be/81E9AruraKU\n\n**NOTICE**\nif an error occurs during the update is recommended to reload GNOME Shell (Alt + F2, 'r') and reload the extension's installation page.", "link": "https://extensions.gnome.org/extension/690/easyscreencast/", "shell_version_map": {"38": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "40": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}}} -, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "27", "sha256": "1jqmfkznm2aaf739n4hj35d00ds8ny0qin249bd0fraxyih3idrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1jqmfkznm2aaf739n4hj35d00ds8ny0qin249bd0fraxyih3idrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNwp9"}}} +, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "29", "sha256": "022pkhylbxwcppsfgs0znk6pr7j160w7l7dm517ksip59zifa7mk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "022pkhylbxwcppsfgs0znk6pr7j160w7l7dm517ksip59zifa7mk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyOQp9"}}} , {"uuid": "all-windows@ezix.org", "name": "All Windows", "pname": "all-windows", "description": "List open windows of all workspaces", "link": "https://extensions.gnome.org/extension/704/all-windows/", "shell_version_map": {"40": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "panel-osd@berend.de.schouwer.gmail.com", "name": "Panel OSD", "pname": "panel-osd", "description": "Configuring where on the (main) screen notifications will appear, instead of just above the message tray", "link": "https://extensions.gnome.org/extension/708/panel-osd/", "shell_version_map": {"38": {"version": "39", "sha256": "109qlcckx5z8fwndpr86r2bfggyh4akmi6lqi0ki7gr9bfigdqnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyaW5nIHdoZXJlIG9uIHRoZSAobWFpbikgc2NyZWVuIG5vdGlmaWNhdGlvbnMgd2lsbCBhcHBlYXIsIGluc3RlYWQgb2YganVzdCBhYm92ZSB0aGUgbWVzc2FnZSB0cmF5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJQYW5lbCBPU0QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qZW5zbG9keS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtb3NkIiwKICAidXVpZCI6ICJwYW5lbC1vc2RAYmVyZW5kLmRlLnNjaG91d2VyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "40": {"version": "40", "sha256": "0hskvmdnqjihixaxhb7a7apsx0203zmymm5j6ncb2al928p795yx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyaW5nIHdoZXJlIG9uIHRoZSAobWFpbikgc2NyZWVuIG5vdGlmaWNhdGlvbnMgd2lsbCBhcHBlYXIsIGluc3RlYWQgb2YganVzdCBhYm92ZSB0aGUgbWVzc2FnZSB0cmF5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJQYW5lbCBPU0QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vamVuc2xvZHkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsLW9zZCIsCiAgInV1aWQiOiAicGFuZWwtb3NkQGJlcmVuZC5kZS5zY2hvdXdlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}}} , {"uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "pname": "pixel-saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way.", "link": "https://extensions.gnome.org/extension/723/pixel-saver/", "shell_version_map": {"38": {"version": "25", "sha256": "10bzd0vdqm398xwyj2bn5klxmaazwh39clwp1069qszsxmw0lr86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkuIiwKICAibmFtZSI6ICJQaXhlbCBTYXZlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAuMiIsCiAgICAiNDAuMyIsCiAgICAiNDEuMCIsCiAgICAiNDEuMSIsCiAgICAiNDEuMiIsCiAgICAiNDEuMyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "25", "sha256": "10bzd0vdqm398xwyj2bn5klxmaazwh39clwp1069qszsxmw0lr86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkuIiwKICAibmFtZSI6ICJQaXhlbCBTYXZlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAuMiIsCiAgICAiNDAuMyIsCiAgICAiNDEuMCIsCiAgICAiNDEuMSIsCiAgICAiNDEuMiIsCiAgICAiNDEuMyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "25", "sha256": "10bzd0vdqm398xwyj2bn5klxmaazwh39clwp1069qszsxmw0lr86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkuIiwKICAibmFtZSI6ICJQaXhlbCBTYXZlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAuMiIsCiAgICAiNDAuMyIsCiAgICAiNDEuMCIsCiAgICAiNDEuMSIsCiAgICAiNDEuMiIsCiAgICAiNDEuMyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} @@ -63,7 +63,7 @@ , {"uuid": "ProxySwitcher@flannaghan.com", "name": "Proxy Switcher", "pname": "proxy-switcher", "description": "Switches between the system proxy settings profiles defined in Network Settings.", "link": "https://extensions.gnome.org/extension/771/proxy-switcher/", "shell_version_map": {"40": {"version": "15", "sha256": "1vyplw3yv9904sgcjcgc8lz4py3ra59k3afsf2vc35n6vba7k91n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yMS45MSIsCiAgICAiMy4yMi4yIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "1vyplw3yv9904sgcjcgc8lz4py3ra59k3afsf2vc35n6vba7k91n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yMS45MSIsCiAgICAiMy4yMi4yIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "clipboard-indicator@tudmotu.com", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "Clipboard Manager extension for Gnome-Shell - Adds a clipboard indicator to the top panel, and caches clipboard history.", "link": "https://extensions.gnome.org/extension/779/clipboard-indicator/", "shell_version_map": {"38": {"version": "37", "sha256": "1nd6ydp5wmd56zf3vwrsi2wflrw15krdbvqv2fkmla8rndallp1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "40": {"version": "39", "sha256": "19zwg7jnf24cgqv75hzcz2a5w750kfc6yi6pn2azzknmwnsz0i7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckB0dWRtb3R1LmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "41": {"version": "39", "sha256": "19zwg7jnf24cgqv75hzcz2a5w750kfc6yi6pn2azzknmwnsz0i7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckB0dWRtb3R1LmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}}} , {"uuid": "pidgin@muffinmad", "name": "Pidgin IM integration", "pname": "pidgin-im-integration", "description": "Integrate Pidgin IMs in the Gnome Shell message tray", "link": "https://extensions.gnome.org/extension/782/pidgin-im-integration/", "shell_version_map": {"40": {"version": "41", "sha256": "1g2iflmb8rjzfc82yv8wcii99df5aaqx5czqkhxpf9pfsrkknhs9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWZmaW5tYWQvcGlkZ2luLWltLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGlkZ2luQG11ZmZpbm1hZCIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "1g2iflmb8rjzfc82yv8wcii99df5aaqx5czqkhxpf9pfsrkknhs9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWZmaW5tYWQvcGlkZ2luLWltLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGlkZ2luQG11ZmZpbm1hZCIsCiAgInZlcnNpb24iOiA0MQp9"}}} -, {"uuid": "ShutdownTimer@neumann", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Shutdown/suspend the device after a specific time.\n\nMaximum timer value und default slider position can be modified in the settings.", "link": "https://extensions.gnome.org/extension/792/shutdowntimer/", "shell_version_map": {"38": {"version": "33", "sha256": "1m7rxxjlxfi9bwsxwxnjhpfzhsz3ry79jwd2i17sc3v1i7h6xqsd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "33", "sha256": "1m7rxxjlxfi9bwsxwxnjhpfzhsz3ry79jwd2i17sc3v1i7h6xqsd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1m7rxxjlxfi9bwsxwxnjhpfzhsz3ry79jwd2i17sc3v1i7h6xqsd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} +, {"uuid": "ShutdownTimer@neumann", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Shutdown/suspend the device after a specific time.\n\nMaximum timer value und default slider position can be modified in the settings.", "link": "https://extensions.gnome.org/extension/792/shutdowntimer/", "shell_version_map": {"38": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "40": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} , {"uuid": "hide-dash@xenatt.github.com", "name": "Hide Dash X", "pname": "hide-dash", "description": "Hide the dash from the activities overview.", "link": "https://extensions.gnome.org/extension/805/hide-dash/", "shell_version_map": {"38": {"version": "10", "sha256": "059cy18awzv9qyn803zjyxiznacnf6pai8px2mb9mrbyf98153xz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGRhc2ggZnJvbSB0aGUgYWN0aXZpdGllcyBvdmVydmlldy4iLAogICJuYW1lIjogIkhpZGUgRGFzaCBYIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphY2JhcnRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VkZW5ob2Zlci9NaW5pbWFsaXNtLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJoaWRlLWRhc2hAeGVuYXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "hide-workspace@xenatt.github.com", "name": "Hide Workspace Thumbnails", "pname": "hide-workspace-thumbnails", "description": "Hide workspace thumbnails from the overview. But don't worry they are still present and one can switch between them like usual with e.g. shortcuts..", "link": "https://extensions.gnome.org/extension/808/hide-workspace-thumbnails/", "shell_version_map": {"40": {"version": "16", "sha256": "0443zyqr2hwq5fj3h8zch8iav83xzj4bqn1k6qd5f2z46kvzj611", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgd29ya3NwYWNlIHRodW1ibmFpbHMgZnJvbSB0aGUgb3ZlcnZpZXcuIEJ1dCBkb24ndCB3b3JyeSB0aGV5IGFyZSBzdGlsbCBwcmVzZW50IGFuZCBvbmUgY2FuIHN3aXRjaCBiZXR3ZWVuIHRoZW0gbGlrZSB1c3VhbCB3aXRoIGUuZy4gc2hvcnRjdXRzLi4iLAogICJuYW1lIjogIkhpZGUgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWRlbmhvZmVyL01pbmltYWxpc20tR25vbWUtU2hlbGwiLAogICJ1dWlkIjogImhpZGUtd29ya3NwYWNlQHhlbmF0dC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"uuid": "keyman@dpoetzsch.github.com", "name": "KeyMan", "pname": "keyman", "description": "Access passwords from the gnome keyring in a convenient way:\nSimply search for your password and copy it to clipboad by clicking it. After a certain amount of time it will be removed automatically (default is 5 seconds). As this only works if the keyrings are unlocked, this extension also provides easy access to lock/unlock keyrings.", "link": "https://extensions.gnome.org/extension/819/keyman/", "shell_version_map": {"40": {"version": "20", "sha256": "1wd76bdnzs7mxwwyvffw0fm8r8chsblz3dinpwiyc5d5kmlnyv5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kcG9ldHpzY2gva2V5bWFuIiwKICAidXVpZCI6ICJrZXltYW5AZHBvZXR6c2NoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} @@ -236,7 +236,7 @@ , {"uuid": "dict@sun.wxg@gmail.com", "name": "Screen word translate", "pname": "screen-word-translate", "description": "Translate word on the screen.\nDefault web address is translate.google.com, you can add the web address for your own language. Also you can contribute your web address to my github repo.\nUse hotkey Ctrl+Alt+j to toggle the function.\nUse hotkey Ctrl+Alt+o to show popup window", "link": "https://extensions.gnome.org/extension/1849/screen-word-translate/", "shell_version_map": {"38": {"version": "32", "sha256": "0wh9d0siggr49bfcx1308xx8rxc58nadnhp3mjj53i6fvja3cx62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "40": {"version": "38", "sha256": "19rpi2hqznwzngzw9zsar00mhmqav8v7wbij4r7cai4jgvmk8459", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}, "41": {"version": "38", "sha256": "19rpi2hqznwzngzw9zsar00mhmqav8v7wbij4r7cai4jgvmk8459", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}}} , {"uuid": "gamemode@christian.kellner.me", "name": "GameMode", "pname": "gamemode", "description": "Status indicator for GameMode", "link": "https://extensions.gnome.org/extension/1852/gamemode/", "shell_version_map": {"38": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "unredirect@vaina.lt", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell", "link": "https://extensions.gnome.org/extension/1873/disable-unredirect-fullscreen-windows/", "shell_version_map": {"38": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "Cryptocurrency utility", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": {"38": {"version": "5", "sha256": "0pmga4iqpm0i853lgqfhvnkxhji8m79pk9hgf24lvbpv8alkxzz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "14", "sha256": "04nplrnqbbg449yrbzlz6250ra9ai21swx1k4rx1r7z9x7pd8g74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "04nplrnqbbg449yrbzlz6250ra9ai21swx1k4rx1r7z9x7pd8g74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNAp9"}}} +, {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "Cryptocurrency utility", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": {"38": {"version": "5", "sha256": "0pmga4iqpm0i853lgqfhvnkxhji8m79pk9hgf24lvbpv8alkxzz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "15", "sha256": "0mnrlzxgsimyrj8lfnkah5k21w6jmy703cbrqp3hxjri28a5ym4f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "0mnrlzxgsimyrj8lfnkah5k21w6jmy703cbrqp3hxjri28a5ym4f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "cmus-status@yagreg7.gmail.com", "name": "cmus status", "pname": "cmus-status", "description": "Shows cmus status", "link": "https://extensions.gnome.org/extension/1934/cmus-status/", "shell_version_map": {"38": {"version": "8", "sha256": "1a6b10kirzbjlllcnffznjlljicah172kpvs0p8rmwhcpn88i8hx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dyZWdUaGVNYWRNb25rL2dub21lLWNtdXMtc3RhdHVzIiwKICAidXVpZCI6ICJjbXVzLXN0YXR1c0B5YWdyZWc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "0a1g8l2w46nky88db7vjpv3iz87jk967vfm3vnvi7rw9wqphkn9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3JlZ1RoZU1hZE1vbmsvZ25vbWUtY211cy1zdGF0dXMiLAogICJ1dWlkIjogImNtdXMtc3RhdHVzQHlhZ3JlZzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0a1g8l2w46nky88db7vjpv3iz87jk967vfm3vnvi7rw9wqphkn9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3JlZ1RoZU1hZE1vbmsvZ25vbWUtY211cy1zdGF0dXMiLAogICJ1dWlkIjogImNtdXMtc3RhdHVzQHlhZ3JlZzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "no-title-bar@jonaspoehler.de", "name": "No Title Bar - Forked", "pname": "no-title-bar-forked", "description": "No Title Bar removes the title bar from non-GTK applications and moves the window title and buttons to the top panel.\n\nTitlebars are also hidden for Wayland-native clients that don't use CSD. Some of the options may be incompatible with this. For issues on Wayland please visit github!\n\nThis is a fork of https://extensions.gnome.org/extension/1267/no-title-bar/ with added compatibility for Gnome 3.32+.\n\nThis extension depends on some Xorg utilities. To install them:\n\n⚫ Debian/Ubuntu: apt install x11-utils\n⚫ Fedora/RHEL: dnf install xorg-x11-utils\n⚫ Arch: pacman -S xorg-xprop", "link": "https://extensions.gnome.org/extension/2015/no-title-bar-forked/", "shell_version_map": {"38": {"version": "5", "sha256": "0kch8yra13813gg3wa90lm57skqshmj3j1147lrqwhl9va9rk4q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIFRpdGxlIEJhciByZW1vdmVzIHRoZSB0aXRsZSBiYXIgZnJvbSBub24tR1RLIGFwcGxpY2F0aW9ucyBhbmQgbW92ZXMgdGhlIHdpbmRvdyB0aXRsZSBhbmQgYnV0dG9ucyB0byB0aGUgdG9wIHBhbmVsLlxuXG5UaXRsZWJhcnMgYXJlIGFsc28gaGlkZGVuIGZvciBXYXlsYW5kLW5hdGl2ZSBjbGllbnRzIHRoYXQgZG9uJ3QgdXNlIENTRC4gU29tZSBvZiB0aGUgb3B0aW9ucyBtYXkgYmUgaW5jb21wYXRpYmxlIHdpdGggdGhpcy4gRm9yIGlzc3VlcyBvbiBXYXlsYW5kIHBsZWFzZSB2aXNpdCBnaXRodWIhXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyNjcvbm8tdGl0bGUtYmFyLyB3aXRoIGFkZGVkIGNvbXBhdGliaWxpdHkgZm9yIEdub21lIDMuMzIrLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcblxuXHUyNmFiIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuXHUyNmFiIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuXHUyNmFiIEFyY2g6IHBhY21hbiAtUyB4b3JnLXhwcm9wIiwKICAibmFtZSI6ICJObyBUaXRsZSBCYXIgLSBGb3JrZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb2VobGVyai9uby10aXRsZS1iYXIiLAogICJ1dWlkIjogIm5vLXRpdGxlLWJhckBqb25hc3BvZWhsZXIuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "6", "sha256": "1plnj999qynsfvab6s01rfrdvw6m0s19b4zirhmlqrpax9vjl3zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIFRpdGxlIEJhciByZW1vdmVzIHRoZSB0aXRsZSBiYXIgZnJvbSBub24tR1RLIGFwcGxpY2F0aW9ucyBhbmQgbW92ZXMgdGhlIHdpbmRvdyB0aXRsZSBhbmQgYnV0dG9ucyB0byB0aGUgdG9wIHBhbmVsLlxuXG5UaXRsZWJhcnMgYXJlIGFsc28gaGlkZGVuIGZvciBXYXlsYW5kLW5hdGl2ZSBjbGllbnRzIHRoYXQgZG9uJ3QgdXNlIENTRC4gU29tZSBvZiB0aGUgb3B0aW9ucyBtYXkgYmUgaW5jb21wYXRpYmxlIHdpdGggdGhpcy4gRm9yIGlzc3VlcyBvbiBXYXlsYW5kIHBsZWFzZSB2aXNpdCBnaXRodWIhXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyNjcvbm8tdGl0bGUtYmFyLyB3aXRoIGFkZGVkIGNvbXBhdGliaWxpdHkgZm9yIEdub21lIDMuMzIrLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcblxuXHUyNmFiIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuXHUyNmFiIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuXHUyNmFiIEFyY2g6IHBhY21hbiAtUyB4b3JnLXhwcm9wIiwKICAibmFtZSI6ICJObyBUaXRsZSBCYXIgLSBGb3JrZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9laGxlcmovbm8tdGl0bGUtYmFyIiwKICAidXVpZCI6ICJuby10aXRsZS1iYXJAam9uYXNwb2VobGVyLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "application_view_when_empty@fawtytoo", "name": "Show Application View When Workspace Empty", "pname": "show-application-view-when-workspace-empty", "description": "Shows the application view when the workspace is or becomes empty, such as switching to an empty workspace, when all windows on a workspace are closed, or after login. Starting applications or switching to a workspace with open windows will hide the application view if it's showing.\nFrom version 22, this extension waits for any window closing animation to complete (if enabled) before showing the application view.", "link": "https://extensions.gnome.org/extension/2036/show-application-view-when-workspace-empty/", "shell_version_map": {"38": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}, "40": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}}} @@ -246,7 +246,7 @@ , {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {"38": {"version": "6", "sha256": "0hcbjrhrg11f5p23bhss75nhc9sqlh6p1bmfq7p7m7d276ckdmkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "horizontal-workspaces@gnome-shell-extensions.gcampax.github.com", "name": "Horizontal workspaces", "pname": "horizontal-workspaces", "description": "Use a horizontal workspace layout", "link": "https://extensions.gnome.org/extension/2141/horizontal-workspaces/", "shell_version_map": {"38": {"version": "5", "sha256": "0kbqcrs96v72yk0rf8jghy1a31651fyvgpi97yp46n4wmvc41vk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBhIGhvcml6b250YWwgd29ya3NwYWNlIGxheW91dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJIb3Jpem9udGFsIHdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiaG9yaXpvbnRhbC13b3Jrc3BhY2VzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "threefingerwindowmove@do.sch.dev.gmail.com", "name": "Three Finger Window Move", "pname": "three-finger-window-move", "description": "Allows moving windows around with a three finger trackpad gesture (Wayland only)", "link": "https://extensions.gnome.org/extension/2164/three-finger-window-move/", "shell_version_map": {"38": {"version": "7", "sha256": "1m7vwr6s6w297b0x0bmnj8fs2hl73pbys6m93lnb9inh5pmgiv1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBtb3Zpbmcgd2luZG93cyBhcm91bmQgd2l0aCBhIHRocmVlIGZpbmdlciB0cmFja3BhZCBnZXN0dXJlIChXYXlsYW5kIG9ubHkpIiwKICAibmFtZSI6ICJUaHJlZSBGaW5nZXIgV2luZG93IE1vdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kby1zY2gvZ25vbWUtc2hlbGwtdG91Y2hwYWQtd2luZG93LW1vdmUiLAogICJ1dWlkIjogInRocmVlZmluZ2Vyd2luZG93bW92ZUBkby5zY2guZGV2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "spotify-ad-block@danigm.net", "name": "Mute spotify ads", "pname": "mute-spotify-ads", "description": "Mute spotify ads", "link": "https://extensions.gnome.org/extension/2176/mute-spotify-ads/", "shell_version_map": {"38": {"version": "11", "sha256": "1cqrbzhb02k4nacjhpych5fqw17gbly1f04ahhx6xhz9a6p3gq36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1cqrbzhb02k4nacjhpych5fqw17gbly1f04ahhx6xhz9a6p3gq36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1cqrbzhb02k4nacjhpych5fqw17gbly1f04ahhx6xhz9a6p3gq36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "spotify-ad-block@danigm.net", "name": "Mute spotify ads", "pname": "mute-spotify-ads", "description": "Mute spotify ads", "link": "https://extensions.gnome.org/extension/2176/mute-spotify-ads/", "shell_version_map": {"38": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "vim-altTab@kokong.info", "name": "VIM Alt-Tab", "pname": "vim-alt-tab", "description": "Add the ability to switch between windows and applications using vim-like keypresses (h, j, k, l)", "link": "https://extensions.gnome.org/extension/2212/vim-alt-tab/", "shell_version_map": {"38": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "easy_docker_containers@red.software.systems", "name": "Easy Docker Containers", "pname": "easy-docker-containers", "description": "A GNOME Shell extension (GNOME Panel applet) to be able to generally control your available Docker containers.", "link": "https://extensions.gnome.org/extension/2224/easy-docker-containers/", "shell_version_map": {"38": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}}} @@ -264,7 +264,7 @@ , {"uuid": "kernel-indicator@elboulangero.gitlab.com", "name": "Kernel Indicator", "pname": "kernel-indicator", "description": "Display the kernel version in the top bar", "link": "https://extensions.gnome.org/extension/2512/kernel-indicator/", "shell_version_map": {"40": {"version": "4", "sha256": "0v3vxk9adzwk18vpvhpwxp7893wh7my8bh8j5vp4fdiq3l06v4sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbGJvdWxhbmdlcm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtlcm5lbC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImtlcm5lbC1pbmRpY2F0b3JAZWxib3VsYW5nZXJvLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0v3vxk9adzwk18vpvhpwxp7893wh7my8bh8j5vp4fdiq3l06v4sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbGJvdWxhbmdlcm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtlcm5lbC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImtlcm5lbC1pbmRpY2F0b3JAZWxib3VsYW5nZXJvLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "floatingDock@sun.wxg@gmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "Move dock anywhere on the desktop\n\nPress Ctrl+Alt+k to vi mode\nPress lowercase alphabet, open new window or active the window\nPress uppercase alphabet, force to open new window\n\nPoint on the main button, change workspace by mouse scroll\nRight click the main button, show some selections", "link": "https://extensions.gnome.org/extension/2542/floating-dock/", "shell_version_map": {"38": {"version": "12", "sha256": "1844hhr0z4wd0wvh29q0sxh6xmwq7chg3kr3sa3c46q8n97i78x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "21", "sha256": "0qj1vqd44clpr72j5lccvva48kzaz76zd48k6nxzvnkgh2n5dh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "23", "sha256": "0ag8pq9sgk885912mqiyhsacfmgkn9n4jvyp0rk4nw0fghd1mgd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "maxi@darkretailer.github.com", "name": "Maxi", "pname": "maxi", "description": "Maximize your windows vertical and/or horizontal (based on https://github.com/aXe1/gnome-shell-extension-maximized-by-default)", "link": "https://extensions.gnome.org/extension/2554/maxi/", "shell_version_map": {"40": {"version": "5", "sha256": "121nd6ggr9id3yfsrkiza7rjq19638p156ym83i3j57ikz6r3ky5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgd2luZG93cyB2ZXJ0aWNhbCBhbmQvb3IgaG9yaXpvbnRhbCAoYmFzZWQgb24gaHR0cHM6Ly9naXRodWIuY29tL2FYZTEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplZC1ieS1kZWZhdWx0KSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtYXhpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWF4aSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhcmtyZXRhaWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25fbWF4aSIsCiAgInV1aWQiOiAibWF4aUBkYXJrcmV0YWlsZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "gnordvpn-local@isopolito", "name": "gNordVPN-Local", "pname": "gnordvpn-local", "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.", "link": "https://extensions.gnome.org/extension/2569/gnordvpn-local/", "shell_version_map": {"38": {"version": "8", "sha256": "1bn9n7q8wi909gyys27dmqhay6hx9y7dl1pxy6zrmh7baijz2gr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "gnordvpn-local@isopolito", "name": "gNordVPN-Local", "pname": "gnordvpn-local", "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.", "link": "https://extensions.gnome.org/extension/2569/gnordvpn-local/", "shell_version_map": {"38": {"version": "9", "sha256": "103ddz7n14n4ahks90w60sqgq8w07mpjqln5va7kxnjh3rdwlk3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICIzLjM4LjQiLAogICAgIjQwLjUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "103ddz7n14n4ahks90w60sqgq8w07mpjqln5va7kxnjh3rdwlk3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICIzLjM4LjQiLAogICAgIjQwLjUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "fully-transparent-top-bar@aunetx", "name": "Smart transparent topbar", "pname": "fully-transparent-top-bar", "description": "Permits to change topbar's look and feel when free-floating.\n\nIf you have issues or recommandations, you can tell me on github so I can see them!", "link": "https://extensions.gnome.org/extension/2588/fully-transparent-top-bar/", "shell_version_map": {"38": {"version": "11", "sha256": "1mksqaxw7jzzdghzii1bhhkbsccxb23qa69f3x6hg32ig9qi762x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcm1pdHMgdG8gY2hhbmdlIHRvcGJhcidzIGxvb2sgYW5kIGZlZWwgd2hlbiBmcmVlLWZsb2F0aW5nLlxuXG5JZiB5b3UgaGF2ZSBpc3N1ZXMgb3IgcmVjb21tYW5kYXRpb25zLCB5b3UgY2FuIHRlbGwgbWUgb24gZ2l0aHViIHNvIEkgY2FuIHNlZSB0aGVtISIsCiAgIm5hbWUiOiAiU21hcnQgdHJhbnNwYXJlbnQgdG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJmdWxseS10cmFuc3BhcmVudC10b3AtYmFyQGF1bmV0eCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "always-indicator@martin.zurowietz.de", "name": "Always Indicator", "pname": "always-indicator", "description": "Always show the new messages indicator on new messages. Features: 1) New message indicator is always shown if there are notifications. 2) The color of the indicator can be customized. 3) If 'do not disturb' is active, the icon is displayed in the custom color if there are notifications.", "link": "https://extensions.gnome.org/extension/2594/always-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "1hryk0ispnxpfmfskj29nii72vwbaly4bcb4idyg2z3c1c71qhdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWFsd2F5cy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImFsd2F5cy1pbmRpY2F0b3JAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1hryk0ispnxpfmfskj29nii72vwbaly4bcb4idyg2z3c1c71qhdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWFsd2F5cy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImFsd2F5cy1pbmRpY2F0b3JAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime profile switcher for the Eruption Linux input and LED driver for keyboards, mice and other devices", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "1jy9m2inx8jjwsy666hg67i7d8py2ar4drn2i8si7d80cba45al4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "20", "sha256": "0mfy34n9gqa1k8sw6b1xcsxygvjnjqnd88bs49jd6l7hwisyns15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "0mfy34n9gqa1k8sw6b1xcsxygvjnjqnd88bs49jd6l7hwisyns15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} @@ -276,7 +276,7 @@ , {"uuid": "transparent-panel@fthx", "name": "Ubuntu-like Panel", "pname": "transparent-panel", "description": "Panel: transparent, straight, reduced height, non-bold fonts. Nothing more.\n\nLooks roughly like Ubuntu session's panel (Yaru). You can easily modify the transparency level through the CSS stylesheet in the extensions's folder.", "link": "https://extensions.gnome.org/extension/2660/transparent-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "mounter@heartmire", "name": "Mounter", "pname": "mounter", "description": "Mount and umount fstab entries with 'noauto,user' options.\n\n/etc/fstab example that will be picked up and listed by the extension:\n192.168.1.1:/mnt/data/users/martin /mnt/server-martin nfs noauto,user,noatime,rw 0 0\n\nToggle the menu with the shortcut: CTRL + ALT + m", "link": "https://extensions.gnome.org/extension/2666/mounter/", "shell_version_map": {"38": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "simple-task-bar@fthx", "name": "Simple Task Bar", "pname": "simple-task-bar", "description": "*** Superseeded by https://extensions.gnome.org/extension/4000/babar. ***\n\nTask bar in the top panel, tasks on all workspaces.\n\n Basic actions, nothing more : activate, minimize, switch, per-desktop overview. Some settings through GNOME Extensions manager, thanks @leleat.\n\n This extension can hide the Activities button and makes the Places Menu extension's label become a folder icon.\n\n This extension is *light* and should *not interfere* with GNOME Shell behaviour+logic. If you want more, please consider installing Dash to Panel.", "link": "https://extensions.gnome.org/extension/2672/simple-task-bar/", "shell_version_map": {"38": {"version": "33", "sha256": "0rsvfymmnljqikarihmgs2fdi14pclfdhwrsz06zxzxd6nvmj4x1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqKiBTdXBlcnNlZWRlZCBieSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MDAwL2JhYmFyLiAqKipcblxuVGFzayBiYXIgaW4gdGhlIHRvcCBwYW5lbCwgdGFza3Mgb24gYWxsIHdvcmtzcGFjZXMuXG5cbiBCYXNpYyBhY3Rpb25zLCBub3RoaW5nIG1vcmUgOiBhY3RpdmF0ZSwgbWluaW1pemUsIHN3aXRjaCwgcGVyLWRlc2t0b3Agb3ZlcnZpZXcuIFNvbWUgc2V0dGluZ3MgdGhyb3VnaCBHTk9NRSBFeHRlbnNpb25zIG1hbmFnZXIsIHRoYW5rcyBAbGVsZWF0LlxuXG4gVGhpcyBleHRlbnNpb24gY2FuIGhpZGUgdGhlIEFjdGl2aXRpZXMgYnV0dG9uIGFuZCBtYWtlcyB0aGUgUGxhY2VzIE1lbnUgZXh0ZW5zaW9uJ3MgbGFiZWwgYmVjb21lIGEgZm9sZGVyIGljb24uXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyAqbGlnaHQqIGFuZCBzaG91bGQgKm5vdCBpbnRlcmZlcmUqIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiBJZiB5b3Ugd2FudCBtb3JlLCBwbGVhc2UgY29uc2lkZXIgaW5zdGFsbGluZyBEYXNoIHRvIFBhbmVsLiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRhc2sgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zaW1wbGUtdGFzay1iYXIiLAogICJ1dWlkIjogInNpbXBsZS10YXNrLWJhckBmdGh4IiwKICAidmVyc2lvbiI6IDMzCn0="}}} -, {"uuid": "minimize-shelf@etenil", "name": "Minimize Shelf", "pname": "minimize-shelf", "description": "Minimize shelf in the top panel, with minimized windows of the current workspace.\n\n No settings but you can easily play around with CSS file. This extension is light and should not interfere with GNOME Shell behaviour+logic.", "link": "https://extensions.gnome.org/extension/2735/minimize-shelf/", "shell_version_map": {"40": {"version": "7", "sha256": "0phvhc13qqrdcbdmysbhah7rixfs2xf927rhif86ba1wxsbffp6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuXG4gTm8gc2V0dGluZ3MgYnV0IHlvdSBjYW4gZWFzaWx5IHBsYXkgYXJvdW5kIHdpdGggQ1NTIGZpbGUuIFRoaXMgZXh0ZW5zaW9uIGlzIGxpZ2h0IGFuZCBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIEdOT01FIFNoZWxsIGJlaGF2aW91citsb2dpYy4iLAogICJuYW1lIjogIk1pbmltaXplIFNoZWxmIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF0aXN0ZW8vbWluaW1pemUtc2hlbGYiLAogICJ1dWlkIjogIm1pbmltaXplLXNoZWxmQGV0ZW5pbCIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0phvhc13qqrdcbdmysbhah7rixfs2xf927rhif86ba1wxsbffp6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuXG4gTm8gc2V0dGluZ3MgYnV0IHlvdSBjYW4gZWFzaWx5IHBsYXkgYXJvdW5kIHdpdGggQ1NTIGZpbGUuIFRoaXMgZXh0ZW5zaW9uIGlzIGxpZ2h0IGFuZCBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIEdOT01FIFNoZWxsIGJlaGF2aW91citsb2dpYy4iLAogICJuYW1lIjogIk1pbmltaXplIFNoZWxmIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF0aXN0ZW8vbWluaW1pemUtc2hlbGYiLAogICJ1dWlkIjogIm1pbmltaXplLXNoZWxmQGV0ZW5pbCIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "minimize-shelf@etenil", "name": "Minimize Shelf", "pname": "minimize-shelf", "description": "Minimize shelf in the top panel, with minimized windows of the current workspace.\nThis extension is light and should not interfere with GNOME Shell behaviour+logic.", "link": "https://extensions.gnome.org/extension/2735/minimize-shelf/", "shell_version_map": {"40": {"version": "10", "sha256": "0kslw9nikb6nza9axvw0salkdx2nx1bpgfrlznprw7xf43x2dqyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuVGhpcyBleHRlbnNpb24gaXMgbGlnaHQgYW5kIHNob3VsZCBub3QgaW50ZXJmZXJlIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiIsCiAgIm5hbWUiOiAiTWluaW1pemUgU2hlbGYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXRpc3Rlby9taW5pbWl6ZS1zaGVsZiIsCiAgInV1aWQiOiAibWluaW1pemUtc2hlbGZAZXRlbmlsIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0kslw9nikb6nza9axvw0salkdx2nx1bpgfrlznprw7xf43x2dqyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuVGhpcyBleHRlbnNpb24gaXMgbGlnaHQgYW5kIHNob3VsZCBub3QgaW50ZXJmZXJlIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiIsCiAgIm5hbWUiOiAiTWluaW1pemUgU2hlbGYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXRpc3Rlby9taW5pbWl6ZS1zaGVsZiIsCiAgInV1aWQiOiAibWluaW1pemUtc2hlbGZAZXRlbmlsIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "remove-alt-tab-delay@daase.net", "name": "Remove Alt+Tab Delay v2", "pname": "remove-alttab-delay-v2", "description": "Another extension that removes the 0.15 second popup delay in switcher pop-ups. This extension is actively maintained. It fixes at least this known issue: https://gitlab.gnome.org/GNOME/mutter/issues/888.", "link": "https://extensions.gnome.org/extension/2741/remove-alttab-delay-v2/", "shell_version_map": {"38": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "corona-tracker@lachhebo.github.io", "name": "corona-tracker", "pname": "corona-tracker", "description": "A GNOME Shell extension (GNOME Panel applet) to notify you every day with information about the COVID-19 virus spread.", "link": "https://extensions.gnome.org/extension/2767/corona-tracker/", "shell_version_map": {"38": {"version": "14", "sha256": "12mnlkh2l23wdx6m28x332lhqd0yq16zhfnmdhk6bzma7wq73sxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIG5vdGlmeSB5b3UgZXZlcnkgZGF5IHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlIENPVklELTE5IHZpcnVzIHNwcmVhZC4iLAogICJuYW1lIjogImNvcm9uYS10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhY2hoZWJvL2Nvcm9uYS10cmFja2VyIiwKICAidXVpZCI6ICJjb3JvbmEtdHJhY2tlckBsYWNoaGViby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "14", "sha256": "12mnlkh2l23wdx6m28x332lhqd0yq16zhfnmdhk6bzma7wq73sxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIG5vdGlmeSB5b3UgZXZlcnkgZGF5IHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlIENPVklELTE5IHZpcnVzIHNwcmVhZC4iLAogICJuYW1lIjogImNvcm9uYS10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhY2hoZWJvL2Nvcm9uYS10cmFja2VyIiwKICAidXVpZCI6ICJjb3JvbmEtdHJhY2tlckBsYWNoaGViby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "gnome-trash@gnome-trash.b00f.gitlab.com", "name": "Gnome Trash - UNMAINTAINED", "pname": "gnome-trash", "description": "MOVED HERE:\n\nhttps://github.com/b00f/gnome-trash", "link": "https://extensions.gnome.org/extension/2773/gnome-trash/", "shell_version_map": {"38": {"version": "13", "sha256": "1z7da74nvl4wvy6ckv55xkl3sc5qzcv6lz5k6bdfa0xcshifhl6h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1PVkVEIEhFUkU6XG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdHJhc2giLAogICJuYW1lIjogIkdub21lIFRyYXNoIC0gVU5NQUlOVEFJTkVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS10cmFzaCIsCiAgInV1aWQiOiAiZ25vbWUtdHJhc2hAZ25vbWUtdHJhc2guYjAwZi5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} @@ -330,7 +330,7 @@ , {"uuid": "touchpad_window_switcher@gonza.com", "name": "Touchpad Window Switcher", "pname": "tocuhpad-window-switcher", "description": "3 fingers window switcher. To make it work on Xorg check the service on github.\n\nUp - down: toggle between overview and show desktop (Needs Super+D shorcut to be set on Xorg. Set it with `gsettings set org.gnome.desktop.wm.keybindings show-desktop 'd'`).\n\nYou can also change windows by going to the overview (up) and moving to the left and right, and choosing the window with down. The overview is modified so it’s shown in chronological order.\n", "link": "https://extensions.gnome.org/extension/3294/tocuhpad-window-switcher/", "shell_version_map": {"38": {"version": "8", "sha256": "1x016p30z0pci3qlhpmfqrsgy0vwcfxqladny66ppbb32qisbkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIjMgZmluZ2VycyB3aW5kb3cgc3dpdGNoZXIuIFRvIG1ha2UgaXQgd29yayBvbiBYb3JnIGNoZWNrIHRoZSBzZXJ2aWNlIG9uIGdpdGh1Yi5cblxuVXAgLSBkb3duOiB0b2dnbGUgYmV0d2VlbiBvdmVydmlldyBhbmQgc2hvdyBkZXNrdG9wIChOZWVkcyBTdXBlcitEIHNob3JjdXQgdG8gYmUgc2V0IG9uIFhvcmcuIFNldCBpdCB3aXRoIGBnc2V0dGluZ3Mgc2V0IG9yZy5nbm9tZS5kZXNrdG9wLndtLmtleWJpbmRpbmdzIHNob3ctZGVza3RvcCAnPFN1cGVyPmQnYCkuXG5cbllvdSBjYW4gYWxzbyBjaGFuZ2Ugd2luZG93cyBieSBnb2luZyB0byB0aGUgb3ZlcnZpZXcgKHVwKSBhbmQgbW92aW5nIHRvIHRoZSBsZWZ0IGFuZCByaWdodCwgYW5kIGNob29zaW5nIHRoZSB3aW5kb3cgd2l0aCBkb3duLiBUaGUgb3ZlcnZpZXcgaXMgbW9kaWZpZWQgc28gaXRcdTIwMTlzIHNob3duIGluIGNocm9ub2xvZ2ljYWwgb3JkZXIuXG4iLAogICJuYW1lIjogIlRvdWNocGFkIFdpbmRvdyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ0b3VjaHBhZF93aW5kb3dfc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "gnome-shell-duckduckgo-search-provider@keithcirkel.co.uk", "name": "DuckDuckGo Search Provider", "pname": "duckduckgo-search-provider", "description": "Add DuckDuckGo search suggestions to Gnome Shell Search", "link": "https://extensions.gnome.org/extension/3306/duckduckgo-search-provider/", "shell_version_map": {"38": {"version": "3", "sha256": "1id10vxz5dfq53wbiz8spqkr6d9qvs9dsykxpff29an96lzybj1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1id10vxz5dfq53wbiz8spqkr6d9qvs9dsykxpff29an96lzybj1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "translate-indicator@athenstaedt.net", "name": "Translate Indicator", "pname": "translate-indicator", "description": "Translate extension for Gnome-Shell - based on translate-shell, inspired by Tudmotu's clipboard-indicator and gufoe's text-translator", "link": "https://extensions.gnome.org/extension/3318/translate-indicator/", "shell_version_map": {"38": {"version": "3", "sha256": "04c3hjbcbn8y9d94swmc3qiv63sjynn71jnwp08sgqa79nrn4cyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsIC0gYmFzZWQgb24gdHJhbnNsYXRlLXNoZWxsLCBpbnNwaXJlZCBieSBUdWRtb3R1J3MgY2xpcGJvYXJkLWluZGljYXRvciBhbmQgZ3Vmb2UncyB0ZXh0LXRyYW5zbGF0b3IiLAogICJuYW1lIjogIlRyYW5zbGF0ZSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXZlbnV6L2dub21lLXRyYW5zbGF0ZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1pbmRpY2F0b3JAYXRoZW5zdGFlZHQubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "Disclaimer: If you experience instability try to disable other extensions since they can be incompatible and cause Material Shell to missbehave.\nA modern desktop interface for Linux - packaged as an extension for GNOME Shell. Improve your user experience and get rid of the anarchy of traditional desktop workflows. Designed to simplify navigation and reduce the need to manipulate windows in order to improve productivity. It's meant to be 100% predictable and bring the benefits of tools coveted by professionals to everyone.", "link": "https://extensions.gnome.org/extension/3357/material-shell/", "shell_version_map": {"38": {"version": "12", "sha256": "01izrrnichjk3bn2d0blr0dyqqz3dqhq85yw1xqmp4ccfnqnydy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJEaXNjbGFpbWVyOiBJZiB5b3UgZXhwZXJpZW5jZSBpbnN0YWJpbGl0eSB0cnkgdG8gZGlzYWJsZSBvdGhlciBleHRlbnNpb25zIHNpbmNlIHRoZXkgY2FuIGJlIGluY29tcGF0aWJsZSBhbmQgY2F1c2UgTWF0ZXJpYWwgU2hlbGwgdG8gbWlzc2JlaGF2ZS5cbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidGhlbWUiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50aGVtZSIsCiAgInR3ZWFrcyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnR3ZWFrcyIsCiAgInVybCI6ICJodHRwczovL21hdGVyaWFsLXNoZWxsLmNvbSIsCiAgInV1aWQiOiAibWF0ZXJpYWwtc2hlbGxAcGFweWVsZ3JpbmdvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "17", "sha256": "0y1pbsr8fgvk1fqj52kq0ima26mf01xyzk3pyv8lhhjgmxjzqhhz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJEaXNjbGFpbWVyOiBJZiB5b3UgZXhwZXJpZW5jZSBpbnN0YWJpbGl0eSB0cnkgdG8gZGlzYWJsZSBvdGhlciBleHRlbnNpb25zIHNpbmNlIHRoZXkgY2FuIGJlIGluY29tcGF0aWJsZSBhbmQgY2F1c2UgTWF0ZXJpYWwgU2hlbGwgdG8gbWlzc2JlaGF2ZS5cbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ0aGVtZSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnRoZW1lIiwKICAidHdlYWtzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudHdlYWtzIiwKICAidXJsIjogImh0dHBzOi8vbWF0ZXJpYWwtc2hlbGwuY29tIiwKICAidXVpZCI6ICJtYXRlcmlhbC1zaGVsbEBwYXB5ZWxncmluZ28iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "0y1pbsr8fgvk1fqj52kq0ima26mf01xyzk3pyv8lhhjgmxjzqhhz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJEaXNjbGFpbWVyOiBJZiB5b3UgZXhwZXJpZW5jZSBpbnN0YWJpbGl0eSB0cnkgdG8gZGlzYWJsZSBvdGhlciBleHRlbnNpb25zIHNpbmNlIHRoZXkgY2FuIGJlIGluY29tcGF0aWJsZSBhbmQgY2F1c2UgTWF0ZXJpYWwgU2hlbGwgdG8gbWlzc2JlaGF2ZS5cbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ0aGVtZSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnRoZW1lIiwKICAidHdlYWtzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudHdlYWtzIiwKICAidXJsIjogImh0dHBzOi8vbWF0ZXJpYWwtc2hlbGwuY29tIiwKICAidXVpZCI6ICJtYXRlcmlhbC1zaGVsbEBwYXB5ZWxncmluZ28iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} +, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "A modern desktop interface for Linux - packaged as an extension for GNOME Shell. Improve your user experience and get rid of the anarchy of traditional desktop workflows. Designed to simplify navigation and reduce the need to manipulate windows in order to improve productivity. It's meant to be 100% predictable and bring the benefits of tools coveted by professionals to everyone.", "link": "https://extensions.gnome.org/extension/3357/material-shell/", "shell_version_map": {"38": {"version": "12", "sha256": "1rjybqlgbjmflg21cm7js2gjzvdhw14lpzncpzwf18rh4mp2adnr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "18", "sha256": "1qnldrad5kkm2km4qdkwagp8m2x30bq56jzaba01h6j7mgw90ai6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidGhlbWUiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50aGVtZSIsCiAgInR3ZWFrcyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnR3ZWFrcyIsCiAgInVybCI6ICJodHRwczovL21hdGVyaWFsLXNoZWxsLmNvbSIsCiAgInV1aWQiOiAibWF0ZXJpYWwtc2hlbGxAcGFweWVsZ3JpbmdvIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "1qnldrad5kkm2km4qdkwagp8m2x30bq56jzaba01h6j7mgw90ai6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidGhlbWUiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50aGVtZSIsCiAgInR3ZWFrcyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnR3ZWFrcyIsCiAgInVybCI6ICJodHRwczovL21hdGVyaWFsLXNoZWxsLmNvbSIsCiAgInV1aWQiOiAibWF0ZXJpYWwtc2hlbGxAcGFweWVsZ3JpbmdvIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "proxyprofiles@massamany.github.com", "name": "Proxy Profiles", "pname": "proxy-profiles", "description": "Swich easily between several proxy profiles.", "link": "https://extensions.gnome.org/extension/3379/proxy-profiles/", "shell_version_map": {"38": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "galaxy-buds-battery@pemmoura", "name": "Galaxy Buds Battery", "pname": "galaxy-buds-battery", "description": "Galaxy Buds battery indicator.", "link": "https://extensions.gnome.org/extension/3383/galaxy-buds-battery/", "shell_version_map": {"38": {"version": "6", "sha256": "1f25mc5idqaw3v9b2xffiij9y0pcrl8msz85p8cz2x5l2r3sc7wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbGF4eSBCdWRzIGJhdHRlcnkgaW5kaWNhdG9yLiIsCiAgIm5hbWUiOiAiR2FsYXh5IEJ1ZHMgQmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BlbW1vdXJhL2dhbGF4eWJ1ZHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYWxheHktYnVkcy1iYXR0ZXJ5QHBlbW1vdXJhIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "color-picker@tuberry", "name": "Color Picker", "pname": "color-picker", "description": "Simple color picker for gnome shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3396/color-picker/", "shell_version_map": {"38": {"version": "20", "sha256": "1ss4r8dpa7smxbyz41rw3wl1gy20bvy89xdvwfz6zfhv3db5vl86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "25", "sha256": "0lx4bs7yfqkphb5cwmakl6xjf14q89m0yn70a882drakfhzgnagw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2NvbG9yLXBpY2tlciIsCiAgInV1aWQiOiAiY29sb3ItcGlja2VyQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "27", "sha256": "1scc0cgdzrg9rmpr090myrsxhfgp03aqld9jh4grqbfza6lrz4jd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDI3Cn0="}}} @@ -352,9 +352,9 @@ , {"uuid": "true-color-invert@jackkenney", "name": "True Color Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I", "link": "https://extensions.gnome.org/extension/3530/true-color-invert/", "shell_version_map": {"38": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "gitlab-extension@infinicode.de", "name": "GitLab Extension", "pname": "gitlab-extension", "description": "GitLab extension utilizes the official GitLab API to provide a comfortable overview about your projects, commits & pipelines.\n", "link": "https://extensions.gnome.org/extension/3535/gitlab-extension/", "shell_version_map": {"38": {"version": "4", "sha256": "04hclkbj95alqv9lq5qa5dnf7wb8ssd08q0lzd9wxzw95hiqcvwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkdpdExhYiBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2luYXRpYy9naXRsYWItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRsYWItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "04hclkbj95alqv9lq5qa5dnf7wb8ssd08q0lzd9wxzw95hiqcvwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkdpdExhYiBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2luYXRpYy9naXRsYWItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRsYWItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "downfall@torculus.github.com", "name": "DownFall", "pname": "downfall", "description": "Moves text of your choice across the screen. Can simulate leaves, snow, fireworks, ufos, and more!", "link": "https://extensions.gnome.org/extension/3539/downfall/", "shell_version_map": {"38": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} -, {"uuid": "time-awareness@gnome-extensions.kapranoff.ru", "name": "Time Awareness", "pname": "time-awareness", "description": "Tracks the time you have been actively using your computer", "link": "https://extensions.gnome.org/extension/3556/time-awareness/", "shell_version_map": {"38": {"version": "6", "sha256": "0kfw4s2y0r51plmchzga7fkd69ynksccz881xh683k4as6af4mcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vc3IuaHQvfmthcHBhL2dub21lLXNoZWxsLXRpbWUtYXdhcmVuZXNzLyIsCiAgInV1aWQiOiAidGltZS1hd2FyZW5lc3NAZ25vbWUtZXh0ZW5zaW9ucy5rYXByYW5vZmYucnUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0kfw4s2y0r51plmchzga7fkd69ynksccz881xh683k4as6af4mcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vc3IuaHQvfmthcHBhL2dub21lLXNoZWxsLXRpbWUtYXdhcmVuZXNzLyIsCiAgInV1aWQiOiAidGltZS1hd2FyZW5lc3NAZ25vbWUtZXh0ZW5zaW9ucy5rYXByYW5vZmYucnUiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0kfw4s2y0r51plmchzga7fkd69ynksccz881xh683k4as6af4mcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vc3IuaHQvfmthcHBhL2dub21lLXNoZWxsLXRpbWUtYXdhcmVuZXNzLyIsCiAgInV1aWQiOiAidGltZS1hd2FyZW5lc3NAZ25vbWUtZXh0ZW5zaW9ucy5rYXByYW5vZmYucnUiLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "time-awareness@gnome-extensions.kapranoff.ru", "name": "Time Awareness", "pname": "time-awareness", "description": "Tracks the time you have been actively using your computer", "link": "https://extensions.gnome.org/extension/3556/time-awareness/", "shell_version_map": {"38": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "mullvadindicator@pobega.github.com", "name": "Mullvad Indicator", "pname": "mullvad-indicator", "description": "Mullvad connection status indicator", "link": "https://extensions.gnome.org/extension/3560/mullvad-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "task-widget@juozasmiskinis.gitlab.io", "name": "Task Widget", "pname": "task-widget", "description": "Display tasks next to the calendar widget.\n\nVisit our Wiki page for more information and troubleshooting.", "link": "https://extensions.gnome.org/extension/3569/task-widget/", "shell_version_map": {"38": {"version": "10", "sha256": "16nx63qcaih4812hyvhw0kypvik88g8423i5sp1360bwkrdppc36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMCwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "40": {"version": "10", "sha256": "16nx63qcaih4812hyvhw0kypvik88g8423i5sp1360bwkrdppc36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMCwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "41": {"version": "10", "sha256": "16nx63qcaih4812hyvhw0kypvik88g8423i5sp1360bwkrdppc36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMCwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}}} +, {"uuid": "task-widget@juozasmiskinis.gitlab.io", "name": "Task Widget", "pname": "task-widget", "description": "Display tasks next to the calendar widget.\n\nVisit our Wiki page for more information and troubleshooting.", "link": "https://extensions.gnome.org/extension/3569/task-widget/", "shell_version_map": {"38": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "40": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "41": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}}} , {"uuid": "air-quality@mcardillo55", "name": "Air Quality", "pname": "air-quality", "description": "View local air quality from PurpleAir in the top bar", "link": "https://extensions.gnome.org/extension/3574/air-quality/", "shell_version_map": {"40": {"version": "2", "sha256": "037hbbb6z3gj818hqxqq96yszd1hka57pn4gj9f5kps7ak5hca4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbG9jYWwgYWlyIHF1YWxpdHkgZnJvbSBQdXJwbGVBaXIgaW4gdGhlIHRvcCBiYXIiLAogICJuYW1lIjogIkFpciBRdWFsaXR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21jYXJkaWxsbzU1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1haXItcXVhbGl0eSIsCiAgInV1aWQiOiAiYWlyLXF1YWxpdHlAbWNhcmRpbGxvNTUiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "oclock@ortega.tech", "name": "OClock", "pname": "oclock", "description": "Shows an analog clock on the panel", "link": "https://extensions.gnome.org/extension/3578/oclock/", "shell_version_map": {"40": {"version": "2", "sha256": "1pp155a51c1fsmlwfsr1hxsv79xra3sbqrda3fkvhrv4jif7n7s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJKZXJlbWlhcyBPcnRlZ2EiLAogICJkZXNjcmlwdGlvbiI6ICJTaG93cyBhbiBhbmFsb2cgY2xvY2sgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJPQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly93d3cuZ2l0aHViLmNvbS9qZXJlLW9ydGVnYTI0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1vY2xvY2svIiwKICAidXVpZCI6ICJvY2xvY2tAb3J0ZWdhLnRlY2giLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1pp155a51c1fsmlwfsr1hxsv79xra3sbqrda3fkvhrv4jif7n7s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJKZXJlbWlhcyBPcnRlZ2EiLAogICJkZXNjcmlwdGlvbiI6ICJTaG93cyBhbiBhbmFsb2cgY2xvY2sgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJPQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly93d3cuZ2l0aHViLmNvbS9qZXJlLW9ydGVnYTI0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1vY2xvY2svIiwKICAidXVpZCI6ICJvY2xvY2tAb3J0ZWdhLnRlY2giLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "azan@hatem.masmoudi.org", "name": "Azan Islamic Prayer Times", "pname": "azan-islamic-prayer-times", "description": "Azan is an Islamic prayer times extension for Gnome Shell based on the extension by Fahrinh.\n\nFeatures\n- List compulsory prayer times\n Optionally display Imsak, Sunrise, Sunset and Midnight\n- Show remaining time for the upcoming prayer.\n- Show current date in Hijri calendar.\n- Display a notification when it's time for prayer.\n- Automatic Geoclue2 location detection\n- Show times in 24 hour and 12 hour formats\n- Hijri date adjusment\n- Moon status icon", "link": "https://extensions.gnome.org/extension/3602/azan-islamic-prayer-times/", "shell_version_map": {"38": {"version": "2", "sha256": "1z58m1w04mdddq9p3102jv852zks41f2l7xbx7j8jcljy4ahiqll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF6YW4gaXMgYW4gSXNsYW1pYyBwcmF5ZXIgdGltZXMgZXh0ZW5zaW9uIGZvciBHbm9tZSBTaGVsbCBiYXNlZCBvbiB0aGUgZXh0ZW5zaW9uIGJ5IEZhaHJpbmguXG5cbkZlYXR1cmVzXG4tIExpc3QgY29tcHVsc29yeSBwcmF5ZXIgdGltZXNcbiBPcHRpb25hbGx5IGRpc3BsYXkgSW1zYWssIFN1bnJpc2UsIFN1bnNldCBhbmQgTWlkbmlnaHRcbi0gU2hvdyByZW1haW5pbmcgdGltZSBmb3IgdGhlIHVwY29taW5nIHByYXllci5cbi0gU2hvdyBjdXJyZW50IGRhdGUgaW4gSGlqcmkgY2FsZW5kYXIuXG4tIERpc3BsYXkgYSBub3RpZmljYXRpb24gd2hlbiBpdCdzIHRpbWUgZm9yIHByYXllci5cbi0gQXV0b21hdGljIEdlb2NsdWUyIGxvY2F0aW9uIGRldGVjdGlvblxuLSBTaG93IHRpbWVzIGluIDI0IGhvdXIgYW5kIDEyIGhvdXIgZm9ybWF0c1xuLSBIaWpyaSBkYXRlIGFkanVzbWVudFxuLSBNb29uIHN0YXR1cyBpY29uIiwKICAibmFtZSI6ICJBemFuIElzbGFtaWMgUHJheWVyIFRpbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF6YW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vaG1hc21vdWRpL2F6YW4tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhemFuQGhhdGVtLm1hc21vdWRpLm9yZyIsCiAgInZlcnNpb24iOiAyCn0="}}} @@ -497,7 +497,7 @@ , {"uuid": "eclipse@blackjackshellac.ca", "name": "eclipse", "pname": "eclipse", "description": "eclipse clipboard interface with item encryption\n\nAdded encryption of clipboard items. Encrypted items can be\nsaved to disk in a folder of your choice. These items are persisted\nbetween sessions using openssl to encrypt the content.\n\nEclipse uses dbus to communicate with the gpaste daemon.\n\nThe following utilities are required,\n\n# for example, on fedora (add gpaste-ui for gpaste settings gui)\n$ sudo dnf install gpaste openssl\n# ubuntu\n$ sudo apt install gpaste openssl\n\nNow works with Gpaste 1 and Gpaste 2 on GS 3.36, 3.38 and 40\n\nIf updating the extension reports an ERROR it should work after the next reboot or if you logout and login again. If you're not running on Wayland you should be able to just restart the shell (Alt+F2,r).\n\nPlease report issues on github.\n", "link": "https://extensions.gnome.org/extension/4246/eclipse/", "shell_version_map": {"38": {"version": "8", "sha256": "09j5f8p23m4v2bdad582497r194z05x4izc2wywp9nhv1nldcs3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImVjbGlwc2UgY2xpcGJvYXJkIGludGVyZmFjZSB3aXRoIGl0ZW0gZW5jcnlwdGlvblxuXG5BZGRlZCBlbmNyeXB0aW9uIG9mIGNsaXBib2FyZCBpdGVtcy4gRW5jcnlwdGVkIGl0ZW1zIGNhbiBiZVxuc2F2ZWQgdG8gZGlzayBpbiBhIGZvbGRlciBvZiB5b3VyIGNob2ljZS4gVGhlc2UgaXRlbXMgYXJlIHBlcnNpc3RlZFxuYmV0d2VlbiBzZXNzaW9ucyB1c2luZyBvcGVuc3NsIHRvIGVuY3J5cHQgdGhlIGNvbnRlbnQuXG5cbkVjbGlwc2UgdXNlcyBkYnVzIHRvIGNvbW11bmljYXRlIHdpdGggdGhlIGdwYXN0ZSBkYWVtb24uXG5cblRoZSBmb2xsb3dpbmcgdXRpbGl0aWVzIGFyZSByZXF1aXJlZCxcblxuIyBmb3IgZXhhbXBsZSwgb24gZmVkb3JhIChhZGQgZ3Bhc3RlLXVpIGZvciBncGFzdGUgc2V0dGluZ3MgZ3VpKVxuJCBzdWRvIGRuZiBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG4jIHVidW50dVxuJCBzdWRvIGFwdCBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG5cbk5vdyB3b3JrcyB3aXRoIEdwYXN0ZSAxIGFuZCBHcGFzdGUgMiBvbiBHUyAzLjM2LCAzLjM4IGFuZCA0MFxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IgaXQgc2hvdWxkIHdvcmsgYWZ0ZXIgdGhlIG5leHQgcmVib290IG9yIGlmIHlvdSBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiBJZiB5b3UncmUgbm90IHJ1bm5pbmcgb24gV2F5bGFuZCB5b3Ugc2hvdWxkIGJlIGFibGUgdG8ganVzdCByZXN0YXJ0IHRoZSBzaGVsbCAoQWx0K0YyLHIpLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBnaXRodWIuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlY2xpcHNlLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogImVjbGlwc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZWNsaXBzZS1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMvZWNsaXBzZSIsCiAgInV1aWQiOiAiZWNsaXBzZUBibGFja2phY2tzaGVsbGFjLmNhIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "09j5f8p23m4v2bdad582497r194z05x4izc2wywp9nhv1nldcs3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImVjbGlwc2UgY2xpcGJvYXJkIGludGVyZmFjZSB3aXRoIGl0ZW0gZW5jcnlwdGlvblxuXG5BZGRlZCBlbmNyeXB0aW9uIG9mIGNsaXBib2FyZCBpdGVtcy4gRW5jcnlwdGVkIGl0ZW1zIGNhbiBiZVxuc2F2ZWQgdG8gZGlzayBpbiBhIGZvbGRlciBvZiB5b3VyIGNob2ljZS4gVGhlc2UgaXRlbXMgYXJlIHBlcnNpc3RlZFxuYmV0d2VlbiBzZXNzaW9ucyB1c2luZyBvcGVuc3NsIHRvIGVuY3J5cHQgdGhlIGNvbnRlbnQuXG5cbkVjbGlwc2UgdXNlcyBkYnVzIHRvIGNvbW11bmljYXRlIHdpdGggdGhlIGdwYXN0ZSBkYWVtb24uXG5cblRoZSBmb2xsb3dpbmcgdXRpbGl0aWVzIGFyZSByZXF1aXJlZCxcblxuIyBmb3IgZXhhbXBsZSwgb24gZmVkb3JhIChhZGQgZ3Bhc3RlLXVpIGZvciBncGFzdGUgc2V0dGluZ3MgZ3VpKVxuJCBzdWRvIGRuZiBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG4jIHVidW50dVxuJCBzdWRvIGFwdCBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG5cbk5vdyB3b3JrcyB3aXRoIEdwYXN0ZSAxIGFuZCBHcGFzdGUgMiBvbiBHUyAzLjM2LCAzLjM4IGFuZCA0MFxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IgaXQgc2hvdWxkIHdvcmsgYWZ0ZXIgdGhlIG5leHQgcmVib290IG9yIGlmIHlvdSBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiBJZiB5b3UncmUgbm90IHJ1bm5pbmcgb24gV2F5bGFuZCB5b3Ugc2hvdWxkIGJlIGFibGUgdG8ganVzdCByZXN0YXJ0IHRoZSBzaGVsbCAoQWx0K0YyLHIpLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBnaXRodWIuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlY2xpcHNlLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogImVjbGlwc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZWNsaXBzZS1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMvZWNsaXBzZSIsCiAgInV1aWQiOiAiZWNsaXBzZUBibGFja2phY2tzaGVsbGFjLmNhIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "audio-switcher@albertomosconi", "name": "Audio Switcher 40", "pname": "audio-switcher-40", "description": "Adds a switch for choosing audio input/output to the system menu in GNOME 40. (Makes InputSlider always visible)", "link": "https://extensions.gnome.org/extension/4248/audio-switcher-40/", "shell_version_map": {"38": {"version": "4", "sha256": "0mvc4f6i7vsqijq8l4adcixdyycfxmd7kvw13d5h0vx4hg6vam1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIGlucHV0L291dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUgaW4gR05PTUUgNDAuIChNYWtlcyBJbnB1dFNsaWRlciBhbHdheXMgdmlzaWJsZSkiLAogICJuYW1lIjogIkF1ZGlvIFN3aXRjaGVyIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4xIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vYWxiZXJ0b21vc2NvbmkvYXVkaW8tc3dpdGNoZXIiLAogICJ1dWlkIjogImF1ZGlvLXN3aXRjaGVyQGFsYmVydG9tb3Njb25pIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0mvc4f6i7vsqijq8l4adcixdyycfxmd7kvw13d5h0vx4hg6vam1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIGlucHV0L291dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUgaW4gR05PTUUgNDAuIChNYWtlcyBJbnB1dFNsaWRlciBhbHdheXMgdmlzaWJsZSkiLAogICJuYW1lIjogIkF1ZGlvIFN3aXRjaGVyIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4xIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vYWxiZXJ0b21vc2NvbmkvYXVkaW8tc3dpdGNoZXIiLAogICJ1dWlkIjogImF1ZGlvLXN3aXRjaGVyQGFsYmVydG9tb3Njb25pIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "shell-configurator@adeswanta", "name": "Shell Configurator", "pname": "shell-configurator", "description": "Configure and customize GNOME Shell with advanced settings.", "link": "https://extensions.gnome.org/extension/4254/shell-configurator/", "shell_version_map": {"38": {"version": "4", "sha256": "18dcbxizgj295v34m2dsz1dq9wxlk1s9cgqcgwd1k6r2v2f4p00z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBhbmQgY3VzdG9taXplIEdOT01FIFNoZWxsIHdpdGggYWR2YW5jZWQgc2V0dGluZ3MuIiwKICAiaWQiOiAic2hlbGwtY29uZmlndXJhdG9yIiwKICAiaW5zdGFsbC10eXBlIjogIlVzZXIiLAogICJuYW1lIjogIlNoZWxsIENvbmZpZ3VyYXRvciIsCiAgInJlbGVhc2Utc3RhdGUiOiAicmVsZWFzZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYWRlc3dhbnRhVGVjaHMvc2hlbGwtY29uZmlndXJhdG9yIiwKICAidXVpZCI6ICJzaGVsbC1jb25maWd1cmF0b3JAYWRlc3dhbnRhIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "18dcbxizgj295v34m2dsz1dq9wxlk1s9cgqcgwd1k6r2v2f4p00z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBhbmQgY3VzdG9taXplIEdOT01FIFNoZWxsIHdpdGggYWR2YW5jZWQgc2V0dGluZ3MuIiwKICAiaWQiOiAic2hlbGwtY29uZmlndXJhdG9yIiwKICAiaW5zdGFsbC10eXBlIjogIlVzZXIiLAogICJuYW1lIjogIlNoZWxsIENvbmZpZ3VyYXRvciIsCiAgInJlbGVhc2Utc3RhdGUiOiAicmVsZWFzZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYWRlc3dhbnRhVGVjaHMvc2hlbGwtY29uZmlndXJhdG9yIiwKICAidXVpZCI6ICJzaGVsbC1jb25maWd1cmF0b3JAYWRlc3dhbnRhIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "io.github.mreditor.gnome-shell-extensions.scroll-panel", "name": "Scroll Panel", "pname": "scroll-panel", "description": "This extension allows switching between windows or workspaces by scrolling Gnome Shell topbar with mouse (both in overview and workspace modes).", "link": "https://extensions.gnome.org/extension/4257/scroll-panel/", "shell_version_map": {"40": {"version": "7", "sha256": "0j1yig77q5n44phkaw2p4jyikdkd8z5kd983993v04fvrv38i1jl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNStnaXQtODcxZmZiNCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0j1yig77q5n44phkaw2p4jyikdkd8z5kd983993v04fvrv38i1jl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNStnaXQtODcxZmZiNCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "io.github.mreditor.gnome-shell-extensions.scroll-panel", "name": "Scroll Panel", "pname": "scroll-panel", "description": "This extension allows switching between windows or workspaces by scrolling Gnome Shell topbar with mouse (both in overview and workspace modes).", "link": "https://extensions.gnome.org/extension/4257/scroll-panel/", "shell_version_map": {"40": {"version": "6", "sha256": "0505zv1sbdd00pk1nfsjwqycq4mzih19r128aqpm35q4wj6frpn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNCtnaXQtMzdmMGM3YyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0505zv1sbdd00pk1nfsjwqycq4mzih19r128aqpm35q4wj6frpn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNCtnaXQtMzdmMGM3YyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "wb@pwall.github.com", "name": "WindowButtons", "pname": "windowbuttons", "description": "This is an extension for Gnome 3.38 which puts minimize and close buttons in the top panel.", "link": "https://extensions.gnome.org/extension/4261/windowbuttons/", "shell_version_map": {"38": {"version": "6", "sha256": "1w9j3rmn8yhppfkxrgyfvws2hsr24ki60vi8d73hdhifpnfps2sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZSAzLjM4IHdoaWNoIHB1dHMgbWluaW1pemUgYW5kIGNsb3NlIGJ1dHRvbnMgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIldpbmRvd0J1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QV2FsbDIyMjIvV0IiLAogICJ1dWlkIjogIndiQHB3YWxsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "rippleremove@slippinggitty", "name": "Ripple Remove", "pname": "ripple-remove", "description": "Removes the ripple effect from the Activities hot corner", "link": "https://extensions.gnome.org/extension/4264/ripple-remove/", "shell_version_map": {"40": {"version": "1", "sha256": "1dnk8nfnv5hp8c11fzhn5vscicij4lk9i1vz25fz6sjc3rn1a9pq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlIHJpcHBsZSBlZmZlY3QgZnJvbSB0aGUgQWN0aXZpdGllcyBob3QgY29ybmVyIiwKICAibmFtZSI6ICJSaXBwbGUgUmVtb3ZlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5zbGlwcGluZ2l0dHkucmlwcGxlcmVtb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyaXBwbGVyZW1vdmVAc2xpcHBpbmdnaXR0eSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "quickmenu@slippinggitty", "name": "Quick Menu [DEAD]", "pname": "quick-menu", "description": "This is a fork of fedoramenu (which is a fork of Big Sur Menu by fausto) that scrubs references of Fedora by replacing the icon with the GNOME logo.\n\nQuick Menu is a panel applet similar to the Apple menu found on macOS.\n\nEDIT: This extension's purpose is dead. Check out Tofu Menu, which is fedoramenu, but with the ability to change the icon. https://extensions.gnome.org/extension/4272/tofu-menu/", "link": "https://extensions.gnome.org/extension/4266/quick-menu/", "shell_version_map": {"40": {"version": "1", "sha256": "1qla029n79366a7xvg2d9v0wa7272bqj40ggvbjrfsbd8x066aca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBmb3JrIG9mIGZlZG9yYW1lbnUgKHdoaWNoIGlzIGEgZm9yayBvZiBCaWcgU3VyIE1lbnUgYnkgZmF1c3RvKSB0aGF0IHNjcnVicyByZWZlcmVuY2VzIG9mIEZlZG9yYSBieSByZXBsYWNpbmcgdGhlIGljb24gd2l0aCB0aGUgR05PTUUgbG9nby5cblxuUXVpY2sgTWVudSBpcyBhIHBhbmVsIGFwcGxldCBzaW1pbGFyIHRvIHRoZSBBcHBsZSBtZW51IGZvdW5kIG9uIG1hY09TLlxuXG5FRElUOiBUaGlzIGV4dGVuc2lvbidzIHB1cnBvc2UgaXMgZGVhZC4gQ2hlY2sgb3V0IFRvZnUgTWVudSwgd2hpY2ggaXMgZmVkb3JhbWVudSwgYnV0IHdpdGggdGhlIGFiaWxpdHkgdG8gY2hhbmdlIHRoZSBpY29uLiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MjcyL3RvZnUtbWVudS8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWljay1tZW51IiwKICAibmFtZSI6ICJRdWljayBNZW51IFtERUFEXSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuc2xpcHBpbmdpdHR5LnF1aWNrLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2xpcHBpbmdHaXR0eS9xdWlja21lbnUiLAogICJ1dWlkIjogInF1aWNrbWVudUBzbGlwcGluZ2dpdHR5IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -533,7 +533,7 @@ , {"uuid": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.\nThis extension required Gnome Shell version 40.\nOrganize the items by going into the extensions settings.\n\n!!! Please make sure you're fully on Gnome 40 / you're using a distribution, which is fully on Gnome 40, since otherwise this extension might not work correctly. This was the case for Manjaro Stable until recently and is probably the case for Ubuntu 21.04 right now. !!!", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "121a8r063ifv4lv5s07pglxj4h90n3lp6f0jyw4lnbg38v0nqv28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci5cblRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVkIEdub21lIFNoZWxsIHZlcnNpb24gNDAuXG5Pcmdhbml6ZSB0aGUgaXRlbXMgYnkgZ29pbmcgaW50byB0aGUgZXh0ZW5zaW9ucyBzZXR0aW5ncy5cblxuISEhIFBsZWFzZSBtYWtlIHN1cmUgeW91J3JlIGZ1bGx5IG9uIEdub21lIDQwIC8geW91J3JlIHVzaW5nIGEgZGlzdHJpYnV0aW9uLCB3aGljaCBpcyBmdWxseSBvbiBHbm9tZSA0MCwgc2luY2Ugb3RoZXJ3aXNlIHRoaXMgZXh0ZW5zaW9uIG1pZ2h0IG5vdCB3b3JrIGNvcnJlY3RseS4gVGhpcyB3YXMgdGhlIGNhc2UgZm9yIE1hbmphcm8gU3RhYmxlIHVudGlsIHJlY2VudGx5IGFuZCBpcyBwcm9iYWJseSB0aGUgY2FzZSBmb3IgVWJ1bnR1IDIxLjA0IHJpZ2h0IG5vdy4gISEhIiwKICAibmFtZSI6ICJUb3AgQmFyIE9yZ2FuaXplciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3AtYmFyLW9yZ2FuaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {"38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "5", "sha256": "0j757f5zlam7713hnkg8xx5k24z9a0kjqalxnkipvy0kqak0416s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0j757f5zlam7713hnkg8xx5k24z9a0kjqalxnkipvy0kqak0416s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "shell-isw@zamraky.cz", "name": "MSI Fan Control", "pname": "msi-fan-control", "description": "Use isw to change MSI laptop fan settings", "link": "https://extensions.gnome.org/extension/4363/msi-fan-control/", "shell_version_map": {"38": {"version": "1", "sha256": "0pl9dxwkw47r4c0f5sxjhh8bxl82r0sjlwsji7pwypkb6m0hh342", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBpc3cgdG8gY2hhbmdlIE1TSSBsYXB0b3AgZmFuIHNldHRpbmdzIiwKICAibmFtZSI6ICJNU0kgRmFuIENvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hlbGwtaXN3QHphbXJha3kuY3oiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "vertical-window-list@student.gitlab.com", "name": "Vertical Window List", "pname": "vertical-window-list", "description": "Displays opened windows in vertical panel with productivity perks\n\n- left click to open favorites/activate window\n- right click to close\n- middle click to rename\n- drag-and-drop to re-arrange\n- Alt-Tab to cycle\n- adjust panel width, transparency and icon size in extension settings", "link": "https://extensions.gnome.org/extension/4369/vertical-window-list/", "shell_version_map": {"40": {"version": "6", "sha256": "1gaaxw4j3p0g3jbnn8y93j7hpqvn67l36ws02h3nky1nfnyji4nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1gaaxw4j3p0g3jbnn8y93j7hpqvn67l36ws02h3nky1nfnyji4nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} +, {"uuid": "vertical-window-list@student.gitlab.com", "name": "Vertical Window List", "pname": "vertical-window-list", "description": "Displays opened windows in vertical panel with productivity perks\n\n- left click to open favorites/activate window\n- right click to close\n- middle click to rename\n- drag-and-drop to re-arrange\n- Alt-Tab to cycle\n- adjust panel width, transparency and icon size in extension settings", "link": "https://extensions.gnome.org/extension/4369/vertical-window-list/", "shell_version_map": {"40": {"version": "7", "sha256": "1gakw5c0gjygj61h9lhd3s7vg14vry055qnxrrdvm6vaingkzqhr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1gakw5c0gjygj61h9lhd3s7vg14vry055qnxrrdvm6vaingkzqhr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "ShutdownTimer@deminder", "name": "Shutdown Timer", "pname": "shutdowntimer", "description": "Shutdown/reboot/suspend the device after a specific time or wake with a rtc alarm.\n\nThe screen saver will not interrupt the timer. A privileged control script may be installed to control shutdown and rtcwake as user. Additionally, a check command may be configured before shutdown.", "link": "https://extensions.gnome.org/extension/4372/shutdowntimer/", "shell_version_map": {"38": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"uuid": "docker_status2@gpouilloux", "name": "Docker Integration", "pname": "docker-integration", "description": "A status menu for managing docker containers.", "link": "https://extensions.gnome.org/extension/4374/docker-integration/", "shell_version_map": {"40": {"version": "1", "sha256": "1ia763h3wbc3d3p9ddb1b9rg5f486y5x3m2k4pblq9f9ca9cjrdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIG1hbmFnaW5nIGRvY2tlciBjb250YWluZXJzLiIsCiAgIm5hbWUiOiAiRG9ja2VyIEludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3BvdWlsbG91eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJfc3RhdHVzMkBncG91aWxsb3V4IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "bifocals@shiznatix", "name": "Bifocals", "pname": "bifocals", "description": "Gnome extension adding more window management keyboard shortcuts.\n\n* Left / right 'view split' anchoring cycles through 3 sizes: 1/3, 1/2, and 2/3 of the current screen width.\n*Adds 'mid screen' of centering the window with 3/4 screen height and width.", "link": "https://extensions.gnome.org/extension/4375/bifocals/", "shell_version_map": {"38": {"version": "1", "sha256": "02j0if3bwaws0svaz98054jznrx9pj8zkhy4avsnnhchv2dwmgdi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBhZGRpbmcgbW9yZSB3aW5kb3cgbWFuYWdlbWVudCBrZXlib2FyZCBzaG9ydGN1dHMuXG5cbiogTGVmdCAvIHJpZ2h0ICd2aWV3IHNwbGl0JyBhbmNob3JpbmcgY3ljbGVzIHRocm91Z2ggMyBzaXplczogMS8zLCAxLzIsIGFuZCAyLzMgb2YgdGhlIGN1cnJlbnQgc2NyZWVuIHdpZHRoLlxuKkFkZHMgJ21pZCBzY3JlZW4nIG9mIGNlbnRlcmluZyB0aGUgd2luZG93IHdpdGggMy80IHNjcmVlbiBoZWlnaHQgYW5kIHdpZHRoLiIsCiAgIm5hbWUiOiAiQmlmb2NhbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hpem5hdGl4L2JpZm9jYWxzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlmb2NhbHNAc2hpem5hdGl4IiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "02j0if3bwaws0svaz98054jznrx9pj8zkhy4avsnnhchv2dwmgdi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBhZGRpbmcgbW9yZSB3aW5kb3cgbWFuYWdlbWVudCBrZXlib2FyZCBzaG9ydGN1dHMuXG5cbiogTGVmdCAvIHJpZ2h0ICd2aWV3IHNwbGl0JyBhbmNob3JpbmcgY3ljbGVzIHRocm91Z2ggMyBzaXplczogMS8zLCAxLzIsIGFuZCAyLzMgb2YgdGhlIGN1cnJlbnQgc2NyZWVuIHdpZHRoLlxuKkFkZHMgJ21pZCBzY3JlZW4nIG9mIGNlbnRlcmluZyB0aGUgd2luZG93IHdpdGggMy80IHNjcmVlbiBoZWlnaHQgYW5kIHdpZHRoLiIsCiAgIm5hbWUiOiAiQmlmb2NhbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hpem5hdGl4L2JpZm9jYWxzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlmb2NhbHNAc2hpem5hdGl4IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -596,7 +596,7 @@ , {"uuid": "dollar@dotpyc.com", "name": "Dollar", "pname": "dollar", "description": "Cotações do (USD Dólar Americano) convertido para (BRL Real Brasileiro).\n\nAs atualizações são recebidas a cada 30 segundos e utiliza como base informações disponiblizadas pela API AwesomeAPI, que pode ser consultada diretamente acessando o endereço eletronico https://docs.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/4573/dollar/", "shell_version_map": {"38": {"version": "2", "sha256": "0100dspvm8ryqday9dqm76ykc9n9sikv3098yn6a92kpz9kgxacm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdGFcdTAwZTdcdTAwZjVlcyBkbyAoVVNEIERcdTAwZjNsYXIgQW1lcmljYW5vKSBjb252ZXJ0aWRvIHBhcmEgKEJSTCBSZWFsIEJyYXNpbGVpcm8pLlxuXG5BcyBhdHVhbGl6YVx1MDBlN1x1MDBmNWVzIHNcdTAwZTNvIHJlY2ViaWRhcyBhIGNhZGEgMzAgc2VndW5kb3MgZSB1dGlsaXphIGNvbW8gYmFzZSBpbmZvcm1hXHUwMGU3XHUwMGY1ZXMgZGlzcG9uaWJsaXphZGFzIHBlbGEgQVBJIEF3ZXNvbWVBUEksIHF1ZSBwb2RlIHNlciBjb25zdWx0YWRhIGRpcmV0YW1lbnRlIGFjZXNzYW5kbyBvIGVuZGVyZVx1MDBlN28gZWxldHJvbmljbyBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxkZW1hdHRvcy9kb2xsYXItZG90cHljLmNvbSIsCiAgInV1aWQiOiAiZG9sbGFyQGRvdHB5Yy5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0100dspvm8ryqday9dqm76ykc9n9sikv3098yn6a92kpz9kgxacm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdGFcdTAwZTdcdTAwZjVlcyBkbyAoVVNEIERcdTAwZjNsYXIgQW1lcmljYW5vKSBjb252ZXJ0aWRvIHBhcmEgKEJSTCBSZWFsIEJyYXNpbGVpcm8pLlxuXG5BcyBhdHVhbGl6YVx1MDBlN1x1MDBmNWVzIHNcdTAwZTNvIHJlY2ViaWRhcyBhIGNhZGEgMzAgc2VndW5kb3MgZSB1dGlsaXphIGNvbW8gYmFzZSBpbmZvcm1hXHUwMGU3XHUwMGY1ZXMgZGlzcG9uaWJsaXphZGFzIHBlbGEgQVBJIEF3ZXNvbWVBUEksIHF1ZSBwb2RlIHNlciBjb25zdWx0YWRhIGRpcmV0YW1lbnRlIGFjZXNzYW5kbyBvIGVuZGVyZVx1MDBlN28gZWxldHJvbmljbyBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxkZW1hdHRvcy9kb2xsYXItZG90cHljLmNvbSIsCiAgInV1aWQiOiAiZG9sbGFyQGRvdHB5Yy5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0100dspvm8ryqday9dqm76ykc9n9sikv3098yn6a92kpz9kgxacm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdGFcdTAwZTdcdTAwZjVlcyBkbyAoVVNEIERcdTAwZjNsYXIgQW1lcmljYW5vKSBjb252ZXJ0aWRvIHBhcmEgKEJSTCBSZWFsIEJyYXNpbGVpcm8pLlxuXG5BcyBhdHVhbGl6YVx1MDBlN1x1MDBmNWVzIHNcdTAwZTNvIHJlY2ViaWRhcyBhIGNhZGEgMzAgc2VndW5kb3MgZSB1dGlsaXphIGNvbW8gYmFzZSBpbmZvcm1hXHUwMGU3XHUwMGY1ZXMgZGlzcG9uaWJsaXphZGFzIHBlbGEgQVBJIEF3ZXNvbWVBUEksIHF1ZSBwb2RlIHNlciBjb25zdWx0YWRhIGRpcmV0YW1lbnRlIGFjZXNzYW5kbyBvIGVuZGVyZVx1MDBlN28gZWxldHJvbmljbyBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxkZW1hdHRvcy9kb2xsYXItZG90cHljLmNvbSIsCiAgInV1aWQiOiAiZG9sbGFyQGRvdHB5Yy5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "activate_gnome@isjerryxiao", "name": "Activate Gnome", "pname": "activate_gnome", "description": "Shows Activate Gnome watermark on your screen.", "link": "https://extensions.gnome.org/extension/4574/activate_gnome/", "shell_version_map": {"40": {"version": "3", "sha256": "1hmadwwzm6m9vg4wxz6lvalh9bvi2fnhzjyg9f4whzb5zp8klc4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdub21lIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdub21lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pc2plcnJ5eGlhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWN0aXZhdGUtZ25vbWUiLAogICJ1dWlkIjogImFjdGl2YXRlX2dub21lQGlzamVycnl4aWFvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1hmadwwzm6m9vg4wxz6lvalh9bvi2fnhzjyg9f4whzb5zp8klc4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdub21lIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdub21lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pc2plcnJ5eGlhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWN0aXZhdGUtZ25vbWUiLAogICJ1dWlkIjogImFjdGl2YXRlX2dub21lQGlzamVycnl4aWFvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "huawei-wmi@apps.sdore.me", "name": "Huawei WMI controls", "pname": "huawei-wmi-controls", "description": "Control various Huawei & Honor laptops WMI functions, such as battery protection, Fn-lock and keyboard backlight (just not yet).", "link": "https://extensions.gnome.org/extension/4580/huawei-wmi-controls/", "shell_version_map": {"40": {"version": "2", "sha256": "12qmk8k8hyaa9d4zsy9j2778yj7k6nlfhry0x81197nxkbfqqf1c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgJiBIb25vciBsYXB0b3BzIFdNSSBmdW5jdGlvbnMsIHN1Y2ggYXMgYmF0dGVyeSBwcm90ZWN0aW9uLCBGbi1sb2NrIGFuZCBrZXlib2FyZCBiYWNrbGlnaHQgKGp1c3Qgbm90IHlldCkuIiwKICAibmFtZSI6ICJIdWF3ZWkgV01JIGNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "12qmk8k8hyaa9d4zsy9j2778yj7k6nlfhry0x81197nxkbfqqf1c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgJiBIb25vciBsYXB0b3BzIFdNSSBmdW5jdGlvbnMsIHN1Y2ggYXMgYmF0dGVyeSBwcm90ZWN0aW9uLCBGbi1sb2NrIGFuZCBrZXlib2FyZCBiYWNrbGlnaHQgKGp1c3Qgbm90IHlldCkuIiwKICAibmFtZSI6ICJIdWF3ZWkgV01JIGNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "Add Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": {"38": {"version": "3", "sha256": "1vsm7r2i30pmkasb47ia29isrzn40hhhl52z7jq1wpwz0ip3k3g5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJBZGQgVXNlcm5hbWUgYW5kIEhvc3RuYW1lIHRvIHBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lIiwKICAidXVpZCI6ICJ1c2VybmFtZS1ob3RuYW1lQGl0LXVuZC1lbnR3aWNrbHVuZy1mZy5kZSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": {"38": {"version": "4", "sha256": "0v98gymiw2pdczvndrvj3lsyhwi8ps0jldry1ykm9aghb05s13gx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l0LWVudHdpY2tsdW5nLWZnL1VzZXJuYW1lLWFuZC1Ib3N0bmFtZSIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0v98gymiw2pdczvndrvj3lsyhwi8ps0jldry1ykm9aghb05s13gx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l0LWVudHdpY2tsdW5nLWZnL1VzZXJuYW1lLWFuZC1Ib3N0bmFtZSIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0v98gymiw2pdczvndrvj3lsyhwi8ps0jldry1ykm9aghb05s13gx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l0LWVudHdpY2tsdW5nLWZnL1VzZXJuYW1lLWFuZC1Ib3N0bmFtZSIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "InternetSpeedMonitor@Rishu", "name": "Internet Speed Monitor", "pname": "internet-speed-monitor", "description": "Extension to Monitor Internet Speed and Daily Data Usage minimally.\n\nNew update for shell version 3.34+ : Added option to choose what to display in settings menu", "link": "https://extensions.gnome.org/extension/4585/internet-speed-monitor/", "shell_version_map": {"38": {"version": "5", "sha256": "0v4za9lcc7p861vyrnwwza1sizgzj2nv3yz1aixlsbq22d7zf0ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cblxuTmV3IHVwZGF0ZSBmb3Igc2hlbGwgdmVyc2lvbiAzLjM0KyA6IEFkZGVkIG9wdGlvbiB0byBjaG9vc2Ugd2hhdCB0byBkaXNwbGF5IGluIHNldHRpbmdzIG1lbnUiLAogICJuYW1lIjogIkludGVybmV0IFNwZWVkIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvSW50ZXJuZXRTcGVlZE1vbml0b3IiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNb25pdG9yQFJpc2h1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0v4za9lcc7p861vyrnwwza1sizgzj2nv3yz1aixlsbq22d7zf0ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cblxuTmV3IHVwZGF0ZSBmb3Igc2hlbGwgdmVyc2lvbiAzLjM0KyA6IEFkZGVkIG9wdGlvbiB0byBjaG9vc2Ugd2hhdCB0byBkaXNwbGF5IGluIHNldHRpbmdzIG1lbnUiLAogICJuYW1lIjogIkludGVybmV0IFNwZWVkIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvSW50ZXJuZXRTcGVlZE1vbml0b3IiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNb25pdG9yQFJpc2h1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0v4za9lcc7p861vyrnwwza1sizgzj2nv3yz1aixlsbq22d7zf0ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cblxuTmV3IHVwZGF0ZSBmb3Igc2hlbGwgdmVyc2lvbiAzLjM0KyA6IEFkZGVkIG9wdGlvbiB0byBjaG9vc2Ugd2hhdCB0byBkaXNwbGF5IGluIHNldHRpbmdzIG1lbnUiLAogICJuYW1lIjogIkludGVybmV0IFNwZWVkIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvSW50ZXJuZXRTcGVlZE1vbml0b3IiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNb25pdG9yQFJpc2h1IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "simulate-switching-workspaces-on-active-monitor@micheledaros.com", "name": "Switch workspaces on active monitor", "pname": "switch-workspaces-on-active-monitor", "description": "Simulates switching the workspace on the active monitor only. Ctrl+Alt+q switches to the previous workspace, Ctrl+Alt+a switches to the next", "link": "https://extensions.gnome.org/extension/4586/switch-workspaces-on-active-monitor/", "shell_version_map": {"38": {"version": "7", "sha256": "13wm1xq452ik57mxx3v9h56dlhhjng326kw2cqgj365h7k6bjs99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "13wm1xq452ik57mxx3v9h56dlhhjng326kw2cqgj365h7k6bjs99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "13wm1xq452ik57mxx3v9h56dlhhjng326kw2cqgj365h7k6bjs99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "newworkspaceshortcut@barnix.io", "name": "New Workspace Shortcut", "pname": "new-workspace-shortcut", "description": "This extension will enable the following:\n\nMove-window-to-new-workspace Shortcut:\nUse a shortcut to move the in-focus window to a new workspace on the right of your current workspace: Super + Alt + Shift + n\nOr to the left / backward: Super + Alt + Shift + b\n\nNew-empty-workspace Shortcut:\nUse a shortcut to create an empty workspace on the right: Super + Alt + n\nOr to the left / backward: Super + Alt + b\n\nReorder-workspace Shortcut:\nUse a shortcut to move an entire workspace left or right of the current workspace: Ctl + Super + Left or Ctl + Super + Right\nBy default, this shorcut with automatically trigger the Overview to provide a limited form of visual feedback. However, this preference can be changed via the extension's Settings panel.\n\nThese shortcuts are created to work logically with the vanilla gnome shortcuts including change-workspace (Super + ALT + Left/Right) and move-window-to-next-workspace (Shift + Super + ALT + Left/Right).", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {"41": {"version": "5", "sha256": "0anj72nb9wf80xyhymzr0v97v6hkpi95nmpmpajg5a3w05dz8y7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG5Vc2UgYSBzaG9ydGN1dCB0byBtb3ZlIHRoZSBpbi1mb2N1cyB3aW5kb3cgdG8gYSBuZXcgd29ya3NwYWNlIG9uIHRoZSByaWdodCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlOiBTdXBlciArIEFsdCArIFNoaWZ0ICsgblxuT3IgdG8gdGhlIGxlZnQgLyBiYWNrd2FyZDogU3VwZXIgKyBBbHQgKyBTaGlmdCArIGJcblxuTmV3LWVtcHR5LXdvcmtzcGFjZSBTaG9ydGN1dDpcblVzZSBhIHNob3J0Y3V0IHRvIGNyZWF0ZSBhbiBlbXB0eSB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0OiBTdXBlciArIEFsdCArIG5cbk9yIHRvIHRoZSBsZWZ0IC8gYmFja3dhcmQ6IFN1cGVyICsgQWx0ICsgYlxuXG5SZW9yZGVyLXdvcmtzcGFjZSBTaG9ydGN1dDpcblVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbkJ5IGRlZmF1bHQsIHRoaXMgc2hvcmN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLlxuXG5UaGVzZSBzaG9ydGN1dHMgYXJlIGNyZWF0ZWQgdG8gd29yayBsb2dpY2FsbHkgd2l0aCB0aGUgdmFuaWxsYSBnbm9tZSBzaG9ydGN1dHMgaW5jbHVkaW5nIGNoYW5nZS13b3Jrc3BhY2UgKFN1cGVyICsgQUxUICsgTGVmdC9SaWdodCkgYW5kIG1vdmUtd2luZG93LXRvLW5leHQtd29ya3NwYWNlIChTaGlmdCArIFN1cGVyICsgQUxUICsgTGVmdC9SaWdodCkuIiwKICAibmFtZSI6ICJOZXcgV29ya3NwYWNlIFNob3J0Y3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ld3dvcmtzcGFjZXNob3J0Y3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} @@ -630,12 +630,12 @@ , {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of an entered web server url, green for up, red for down.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {"40": {"version": "5", "sha256": "1pkbkzsa7hydin9sbkxnj92nxllr35zy9jqan97yra6wh438rlgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBhbiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJsLCBncmVlbiBmb3IgdXAsIHJlZCBmb3IgZG93bi4iLAogICJuYW1lIjogIlNlcnZlciBTdGF0dXMgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "focus-follows-workspace@christopher.luebbemeier.gmail.com", "name": "Focus Follows Workspace", "pname": "focus-follows-workspace", "description": "Focus the primary monitor after switching workspaces via keyboard.\n\nThis extension is meant to be used with a multi-monitor setup with the setting \"Workspaces on primary display only\". It enables quick switching to an application on a given workspace via keyboard by preventing the focus from being restored to a window on a secondary monitor.", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {"41": {"version": "1", "sha256": "1xllg9wp7phrqa9897m9al740k60v01zird49vwwm24wzpmyby9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBtZWFudCB0byBiZSB1c2VkIHdpdGggYSBtdWx0aS1tb25pdG9yIHNldHVwIHdpdGggdGhlIHNldHRpbmcgXCJXb3Jrc3BhY2VzIG9uIHByaW1hcnkgZGlzcGxheSBvbmx5XCIuIEl0IGVuYWJsZXMgcXVpY2sgc3dpdGNoaW5nIHRvIGFuIGFwcGxpY2F0aW9uIG9uIGEgZ2l2ZW4gd29ya3NwYWNlIHZpYSBrZXlib2FyZCBieSBwcmV2ZW50aW5nIHRoZSBmb2N1cyBmcm9tIGJlaW5nIHJlc3RvcmVkIHRvIGEgd2luZG93IG9uIGEgc2Vjb25kYXJ5IG1vbml0b3IuIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "pip-on-top@rafostar.github.com", "name": "PiP on top", "pname": "pip-on-top", "description": "Makes \"Picture-in-Picture\" windows stay on top (even on Wayland session). Compatible with Firefox and Clapper media player.", "link": "https://extensions.gnome.org/extension/4691/pip-on-top/", "shell_version_map": {"38": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "roundedSystemMenuButtons@pratap.fastmail.fm", "name": "Rounded System Menu Buttons", "pname": "rounded-system-menu-buttons", "description": "Rounded System Menu Buttons", "link": "https://extensions.gnome.org/extension/4693/rounded-system-menu-buttons/", "shell_version_map": {"38": {"version": "15", "sha256": "0ffkgb2cxv8qcyqly0wcq1vi58d5wliawc3n6qf1wwjzmm6snh3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "15", "sha256": "0ffkgb2cxv8qcyqly0wcq1vi58d5wliawc3n6qf1wwjzmm6snh3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0ffkgb2cxv8qcyqly0wcq1vi58d5wliawc3n6qf1wwjzmm6snh3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} +, {"uuid": "roundedSystemMenuButtons@pratap.fastmail.fm", "name": "Rounded System Menu Buttons", "pname": "rounded-system-menu-buttons", "description": "Rounded System Menu Buttons", "link": "https://extensions.gnome.org/extension/4693/rounded-system-menu-buttons/", "shell_version_map": {"38": {"version": "16", "sha256": "0f307827hagpqg77xd1f6zdhgcnhn1frldd7f2i5dl1xl2x32m5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "0f307827hagpqg77xd1f6zdhgcnhn1frldd7f2i5dl1xl2x32m5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "0f307827hagpqg77xd1f6zdhgcnhn1frldd7f2i5dl1xl2x32m5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "static-background@denizaksimsek.com", "name": "Static background in overview", "pname": "static-background-in-overview", "description": "The background, always clearly visible.", "link": "https://extensions.gnome.org/extension/4696/static-background-in-overview/", "shell_version_map": {"40": {"version": "2", "sha256": "1wr4xp0jj74fjp4yjizyvy1qvmbaclk59cjjhwigxh3glkgdy8ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBiYWNrZ3JvdW5kLCBhbHdheXMgY2xlYXJseSB2aXNpYmxlLiIsCiAgIm5hbWUiOiAiU3RhdGljIGJhY2tncm91bmQgaW4gb3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgInV1aWQiOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1wr4xp0jj74fjp4yjizyvy1qvmbaclk59cjjhwigxh3glkgdy8ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBiYWNrZ3JvdW5kLCBhbHdheXMgY2xlYXJseSB2aXNpYmxlLiIsCiAgIm5hbWUiOiAiU3RhdGljIGJhY2tncm91bmQgaW4gb3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgInV1aWQiOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "highlight-focus@pimsnel.com", "name": "Highlight Focus", "pname": "highlight-focus", "description": "Highlights the focussed window with a temporary border", "link": "https://extensions.gnome.org/extension/4699/highlight-focus/", "shell_version_map": {"38": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {"40": {"version": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME 40+. Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview. Native GNOME Shell click behavior is modified: minimize if one window is open, overview if many windows are open.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "19", "sha256": "1hmhrnw8hyf6g8bk68qxkrmjl2b6747pifd9k3ipi6hkbxj0gb7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1hmhrnw8hyf6g8bk68qxkrmjl2b6747pifd9k3ipi6hkbxj0gb7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDE5Cn0="}}} -, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "A Gnome shell extension to close and save open windows. And restore saved windows. Most importantly, it supports both X11 and Wayland!", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "9", "sha256": "0s3k3xvzj10lbcilkzfng0d0jqxwjlzlm99sp5y24hvhphv7rhdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgc2F2ZWQgd2luZG93cy4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhIiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "0s3k3xvzj10lbcilkzfng0d0jqxwjlzlm99sp5y24hvhphv7rhdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgc2F2ZWQgd2luZG93cy4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhIiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": " A Gnome shell extension to close and save open windows. And restore saved windows. Most importantly, it supports both X11 and Wayland!", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "10", "sha256": "1f1dvvk391fdg9mgpi52mqbnppmxxan0bs9vc6g22v5k36qhha4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBBIEdub21lIHNoZWxsIGV4dGVuc2lvbiB0byBjbG9zZSBhbmQgc2F2ZSBvcGVuIHdpbmRvd3MuIEFuZCByZXN0b3JlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kISIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1f1dvvk391fdg9mgpi52mqbnppmxxan0bs9vc6g22v5k36qhha4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiBBIEdub21lIHNoZWxsIGV4dGVuc2lvbiB0byBjbG9zZSBhbmQgc2F2ZSBvcGVuIHdpbmRvd3MuIEFuZCByZXN0b3JlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kISIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "prevent-double-empty-window@silliewous.nl", "name": "Prevent double empty window", "pname": "prevent-double-empty-window", "description": "Set MIN_NUMBER_WORKSPACES to 1 so there is only one empty workspace when there are no windows open.\n\nhttps://gitlab.com/g3786/prevent-double-empty-window", "link": "https://extensions.gnome.org/extension/4711/prevent-double-empty-window/", "shell_version_map": {"40": {"version": "1", "sha256": "18f1pflvv4sw1r182rrjz2jdy1ym1ipm5lid2sm518h8c3iiabb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "display-ddc-brightness-volume@sagrland.de", "name": "Display DDC Brightness Volume", "pname": "display-ddc-brightness-volume", "description": "Control external displays' brightness and audio volume via DDC. It requires ddcutil to be installed and i2c permissions for non-root users.", "link": "https://extensions.gnome.org/extension/4712/display-ddc-brightness-volume/", "shell_version_map": {"40": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "disable_hover@fawtytoo", "name": "Disable Hover On App & Window Switcher Popups", "pname": "disable-hover-on-app-window-switcher-popups", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups. For those users that like to use the keyboard only with these switchers.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.", "link": "https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "shell_version_map": {"38": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}}} @@ -648,11 +648,17 @@ , {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "Top dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "clip-translator@eexpss.gmail.com", "name": "Clip Translator", "pname": "clip-translator", "description": "Translate from Clipboard content", "link": "https://extensions.gnome.org/extension/4744/clip-translator/", "shell_version_map": {"40": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {"38": {"version": "2", "sha256": "0mgchdll76ml8zzznznlrpm2wb6frw9ff44ql0zhhc9mqy1fwgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaGlkZWRhdGVAaGlkZWRhdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0mgchdll76ml8zzznznlrpm2wb6frw9ff44ql0zhhc9mqy1fwgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaGlkZWRhdGVAaGlkZWRhdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0mgchdll76ml8zzznznlrpm2wb6frw9ff44ql0zhhc9mqy1fwgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaGlkZWRhdGVAaGlkZWRhdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {"38": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "toggleimwheel@mijorus.it", "name": "Toggle imwheel", "pname": "toggle-imwheel", "description": "This simple extension wants to mitigate the lack of a dedicated mouse wheel control on most of the modern linux distributions. Many are using imwheel as a temporary fix; however, if you are using laptop, you might want to have two different settings for the touchpad and the mouse. \n This extension will add an icon in the top bar which lets you toggle imwheel between two custom settings.\n\n\nhttps://github.com/mijorus/toggle-imwheel", "link": "https://extensions.gnome.org/extension/4748/toggle-imwheel/", "shell_version_map": {"40": {"version": "2", "sha256": "1fjqap51g7gy3jra7r1qq4j61iifx13l5lj8sw2csbvzliacsr62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBsYXB0b3AsIHlvdSBtaWdodCB3YW50IHRvIGhhdmUgdHdvIGRpZmZlcmVudCBzZXR0aW5ncyBmb3IgdGhlIHRvdWNocGFkIGFuZCB0aGUgbW91c2UuIFxuIFRoaXMgZXh0ZW5zaW9uIHdpbGwgYWRkIGFuIGljb24gaW4gdGhlIHRvcCBiYXIgd2hpY2ggbGV0cyB5b3UgdG9nZ2xlIGltd2hlZWwgYmV0d2VlbiB0d28gY3VzdG9tIHNldHRpbmdzLlxuXG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9nZ2xlaW13aGVlbEBtaWpvcnVzLml0IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "yakuake-extension@kde.org", "name": "Yakuake", "pname": "yakuake", "description": "A Gnome shell extension to use Yakuake on Gnome. Adds a global shortcut to show/hide yakuake and makes the console appear focussed.", "link": "https://extensions.gnome.org/extension/4757/yakuake/", "shell_version_map": {"40": {"version": "4", "sha256": "0rdrcbsscchvi8i9f6c9sjgnn4546i33l0q135jvav7c1a6bb9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0rdrcbsscchvi8i9f6c9sjgnn4546i33l0q135jvav7c1a6bb9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "dnf-shotcuts@rx1310", "name": "Shortcuts for DNF", "pname": "shortcuts-for-dnf", "description": "A small extension that adds buttons to the panel to check for DNF updates through the terminal without entering commands.", "link": "https://extensions.gnome.org/extension/4758/shortcuts-for-dnf/", "shell_version_map": {"38": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "speedbackground@luke.vader", "name": "Speed background", "pname": "speed-background", "description": "Increase how often Gnome will check the background.", "link": "https://extensions.gnome.org/extension/4761/speed-background/", "shell_version_map": {"41": {"version": "4", "sha256": "1dkmnkrag8fgyfdda4f9bpvsrkvx8h8xfb6wm83dyra1z8jq82fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "bottom-panel@sulincix", "name": "BottomPanel", "pname": "bottompanel", "description": "move top panel to bottom", "link": "https://extensions.gnome.org/extension/4764/bottompanel/", "shell_version_map": {"38": {"version": "1", "sha256": "07aqkjqz85v8p5nmjlhq304ksfz4vp4yz3sf23mv03zz7j38jqn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b20tcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "07aqkjqz85v8p5nmjlhq304ksfz4vp4yz3sf23mv03zz7j38jqn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b20tcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "07aqkjqz85v8p5nmjlhq304ksfz4vp4yz3sf23mv03zz7j38jqn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b20tcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "2", "sha256": "039z2mp28hv4iciyik2g52q6xyzkpr76sn3vcn5f8zvv12jg63lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "039z2mp28hv4iciyik2g52q6xyzkpr76sn3vcn5f8zvv12jg63lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "1", "sha256": "1r2i0c6rnz7v2dpq09n4v3zvxg7s1ad0mbs1v8pdfksiwjj74kr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1r2i0c6rnz7v2dpq09n4v3zvxg7s1ad0mbs1v8pdfksiwjj74kr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "bottom-panel@sulincix", "name": "Bottom Panel", "pname": "bottompanel", "description": "move top panel to bottom", "link": "https://extensions.gnome.org/extension/4764/bottompanel/", "shell_version_map": {"38": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable (english) clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "2", "sha256": "18y8r6f0czadrpamrribqq6rvwa57hpdpffpy864vqp7kq6i6s0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgKGVuZ2xpc2gpIGNsb2NrIGZvciB0aGUgZ25vbWUtc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "18y8r6f0czadrpamrribqq6rvwa57hpdpffpy864vqp7kq6i6s0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgKGVuZ2xpc2gpIGNsb2NrIGZvciB0aGUgZ25vbWUtc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "10", "sha256": "1var5rv8waazr1h40ai4ziwjcnxni8q6w26rqqgvax7wv4dzmyh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1var5rv8waazr1h40ai4ziwjcnxni8q6w26rqqgvax7wv4dzmyh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "ssh-tray@mario.cardia.com.br", "name": "SSH Tray", "pname": "ssh-tray", "description": "Simple SSH extension to allow you to connect to your hosts at ~/.ssh/config and ~/ssh/know_hosts file from Gnome top bar.", "link": "https://extensions.gnome.org/extension/4779/ssh-tray/", "shell_version_map": {"41": {"version": "1", "sha256": "1c7ndcv3bnsc95sijdkq39fshybpaq9fqdk3gvwm1lx40r1ibgih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBTU0ggZXh0ZW5zaW9uIHRvIGFsbG93IHlvdSB0byBjb25uZWN0IHRvIHlvdXIgaG9zdHMgYXQgfi8uc3NoL2NvbmZpZyBhbmQgfi9zc2gva25vd19ob3N0cyBmaWxlIGZyb20gR25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIlNTSCBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzc2gtdHJheUBtYXJpby5jYXJkaWEuY29tLmJyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "glasa@lyrahgames.github.io", "name": "Glasa", "pname": "glasa", "description": "This extension puts an icon in the panel consisting of two comic-like eyes following the cursor.", "link": "https://extensions.gnome.org/extension/4780/glasa/", "shell_version_map": {"38": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Add avatar to settings panel", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "2", "sha256": "0wrfcb62arhack39ld40f3q7hz8r7lmfy1mwxwgrnvv4s7ghg1y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhdmF0YXIgdG8gc2V0dGluZ3MgcGFuZWwiLAogICJuYW1lIjogIkF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXdlbHN3aXN6Y3ovQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXZhdGFyQHBhd2VsLnN3aXN6Y3ouY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "default-workspace@mateusrodcosta.com", "name": "Default Workspace", "pname": "default-workspace", "description": "Switches to the specified workspace on login.\nUseful for fixed number of workspace setups where the first workspace isn't the main one.", "link": "https://extensions.gnome.org/extension/4783/default-workspace/", "shell_version_map": {"40": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "Alt + Mouse control window", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "1", "sha256": "0in20d336slzr4z3f30621h2bl8g2iig3bp9nxqfnv4r844nvn5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93IiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWx0LW1vdXNlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0in20d336slzr4z3f30621h2bl8g2iig3bp9nxqfnv4r844nvn5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93IiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWx0LW1vdXNlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} ] diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index a08af5734e..28d0f32777 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -2,7 +2,6 @@ { "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; - "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/default.nix index e4f8dfa03c..381a82e5bd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -26,6 +26,16 @@ stdenv.mkDerivation rec { extensionPortalSlug = "pop-shell"; }; + postPatch = '' + for file in */main.js; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + done + ''; + + preFixup = '' + chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/*/main.js + ''; + meta = with lib; { description = "Keyboard-driven layer for GNOME Shell"; license = licenses.gpl3Only; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch index e1e6fb7a83..2f2a0bcfd0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -1,20 +1,3 @@ -diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts -index 9522499..9911530 100644 ---- a/src/color_dialog/src/main.ts -+++ b/src/color_dialog/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0'; - -@@ -84,4 +84,4 @@ function launch_color_dialog() { - - Gtk.init(null); - --launch_color_dialog() -\ No newline at end of file -+launch_color_dialog() diff --git a/src/extension.ts b/src/extension.ts index 7417c46..00d5829 100644 --- a/src/extension.ts @@ -28,23 +11,6 @@ index 7417c46..00d5829 100644 if (ipc) { const generator = (stdout: any, res: any) => { -diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts -index f298ec7..87a6bc4 100644 ---- a/src/floating_exceptions/src/main.ts -+++ b/src/floating_exceptions/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0' - -@@ -329,4 +329,4 @@ function main() { - Gtk.main() - } - --main() -\ No newline at end of file -+main() diff --git a/src/panel_settings.ts b/src/panel_settings.ts index 83ff56c..1bc1e98 100644 --- a/src/panel_settings.ts diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix new file mode 100644 index 0000000000..bba3000b7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, meson +, vala +, pkg-config +, ninja +, itstool +, clutter-gtk +, libgee +, gnome +, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-twenty-forty-eight"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; + sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; + }; + + nativeBuildInputs = [ + itstool + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gtk + libgee + gnome.libgnome-games-support + gtk3 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-2048"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/2048"; + description = "Obtain the 2048 tile"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix index a940a6f2cd..936fe62c25 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.4"; + version = "40.5"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AsrMdvTuQjD2eqAK2hlOnFSPidJ6DnLyANi9U67nGhc="; + sha256 = "Y6CcVeRqGhl1a/XglXyvmUMA+tq9umvaYC5mjfzfcSI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix index 8f73bdaeb7..e29464556e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix @@ -12,11 +12,11 @@ , bash , gobject-introspection , libsoup -, gtksourceview +, gtksourceview4 , gsettings-desktop-schemas , adwaita-icon-theme , gnome -, gtkspell3 +, gspell , shared-mime-info , libgee , libgit2-glib @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gitg"; - version = "3.32.1"; + version = "41"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; + sha256 = "f7Ybn7EPuqVI0j1wZbq9cq1j5iHeVYQMBlzm45hsRik="; }; nativeBuildInputs = [ @@ -52,8 +52,8 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gtk3 - gtksourceview - gtkspell3 + gtksourceview4 + gspell json-glib libdazzle libgee diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index 7c1be60b20..3a2f57a862 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "038irkjl9ap7kqacf1c0i74h0rwkcpaw685vyml50vj5hg23hc38"; + sha256 = "rsT5jInFnnbMBlbtBILx2CkS9N7MZg8hyNAE5JPgVBA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix index e379f5369f..ebac46692c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "21.10.0"; + version = "22.04.1"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "0m61p6idajsrrbjps7s1pnl6nfzwpy7j6l9bdhqi9gaaij687shn"; + sha256 = "FcXJc8tlpP9RCrO6EVGvHPFF6qXorImzi9UccgZU+co="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch deleted file mode 100644 index bd519c292c..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch +++ /dev/null @@ -1,240 +0,0 @@ -From b5d7cb20713eff3b3729e5c5fdd2f15680a29385 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sun, 31 Oct 2021 23:12:46 +0800 -Subject: [PATCH] build: add packagekit_backend option - ---- - .github/workflows/main.yml | 7 +++++++ - meson_options.txt | 1 + - src/Application.vala | 4 ++++ - src/Core/BackendAggregator.vala | 2 ++ - src/Core/Package.vala | 21 +++++++++++++-------- - src/Core/UpdateManager.vala | 6 ++++++ - src/Views/Homepage.vala | 4 ++++ - src/meson.build | 10 ++++++++-- - 8 files changed, 45 insertions(+), 10 deletions(-) - -diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml -index daf13654..5dc5a2fb 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -42,6 +42,13 @@ jobs: - meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build - ninja -C build install - -+ - name: Build (NixOS) -+ env: -+ DESTDIR: out -+ run: | -+ meson configure -Dcurated=false -Dpayments=false -Dpackagekit_backend=false build -+ ninja -C build install -+ - lint: - - runs-on: ubuntu-latest -diff --git a/meson_options.txt b/meson_options.txt -index 0ae93d07..37a6cd8a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,4 @@ option('name', type : 'string', value : 'AppCenter', description : 'The name of - option('payments', type : 'boolean', value : true, description : 'Enable payment features and display paid apps') - option('sharing', type : 'boolean', value : true, description : 'Display sharing features, i.e. copyable URLs to appcenter.elementary.io') - option('hide_upstream_distro_apps', type : 'boolean', value : true, description : 'Used for hiding Ubuntu repo apps on elementary OS') -+option('packagekit_backend', type : 'boolean', value : true, description : 'Enable PackageKit backend') -diff --git a/src/Application.vala b/src/Application.vala -index 65fae5aa..7c075076 100644 ---- a/src/Application.vala -+++ b/src/Application.vala -@@ -167,9 +167,11 @@ public class AppCenter.App : Gtk.Application { - - var client = AppCenterCore.Client.get_default (); - -+#if PACKAGEKIT_BACKEND - if (fake_update_packages != null) { - AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; - } -+#endif - - if (silent) { - NetworkMonitor.get_default ().network_changed.connect ((available) => { -@@ -183,6 +185,7 @@ public class AppCenter.App : Gtk.Application { - return; - } - -+#if PACKAGEKIT_BACKEND - if (local_path != null) { - var file = File.new_for_commandline_arg (local_path); - -@@ -192,6 +195,7 @@ public class AppCenter.App : Gtk.Application { - warning ("Failed to load local AppStream XML file: %s", e.message); - } - } -+#endif - - if (main_window == null) { - main_window = new MainWindow (this); -diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala -index 539dba98..feb1eaa9 100644 ---- a/src/Core/BackendAggregator.vala -+++ b/src/Core/BackendAggregator.vala -@@ -26,8 +26,10 @@ public class AppCenterCore.BackendAggregator : Backend, Object { - - construct { - backends = new Gee.ArrayList (); -+#if PACKAGEKIT_BACKEND - backends.add (PackageKitBackend.get_default ()); - backends.add (UbuntuDriversBackend.get_default ()); -+#endif - backends.add (FlatpakBackend.get_default ()); - - unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); -diff --git a/src/Core/Package.vala b/src/Core/Package.vala -index d6f12f15..8dbd7a22 100644 ---- a/src/Core/Package.vala -+++ b/src/Core/Package.vala -@@ -328,7 +328,14 @@ public class AppCenterCore.Package : Object { - public string origin_description { - owned get { - unowned string origin = component.get_origin (); -- if (backend is PackageKitBackend) { -+ if (backend is FlatpakBackend) { -+ var fp_package = this as FlatpakPackage; -+ if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { -+ return _("%s (system-wide)").printf (origin); -+ } -+ return origin; -+#if PACKAGEKIT_BACKEND -+ } else if (backend is PackageKitBackend) { - if (origin == APPCENTER_PACKAGE_ORIGIN) { - return _("AppCenter"); - } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { -@@ -336,15 +343,9 @@ public class AppCenterCore.Package : Object { - } else if (origin.has_prefix ("ubuntu-")) { - return _("Ubuntu (non-curated)"); - } -- } else if (backend is FlatpakBackend) { -- var fp_package = this as FlatpakPackage; -- if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { -- return _("%s (system-wide)").printf (origin); -- } -- -- return origin; - } else if (backend is UbuntuDriversBackend) { - return _("Ubuntu Drivers"); -+#endif - } - - return _("Unknown Origin (non-curated)"); -@@ -434,11 +435,15 @@ public class AppCenterCore.Package : Object { - _author_title = null; - backend_details = null; - -+#if PACKAGEKIT_BACKEND - // The version on a PackageKit package comes from the package not AppStream, so only reset the version - // on other backends - if (!(backend is PackageKitBackend)) { - _latest_version = null; - } -+#else -+ _latest_version = null; -+#endif - - this.component = component; - } -diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala -index 9deceaf5..c92c0d37 100644 ---- a/src/Core/UpdateManager.vala -+++ b/src/Core/UpdateManager.vala -@@ -52,6 +52,7 @@ public class AppCenterCore.UpdateManager : Object { - installed_package.update_state (); - } - -+#if PACKAGEKIT_BACKEND - Pk.Results pk_updates; - unowned PackageKitBackend client = PackageKitBackend.get_default (); - try { -@@ -60,10 +61,12 @@ public class AppCenterCore.UpdateManager : Object { - warning ("Unable to get updates from PackageKit backend: %s", e.message); - return 0; - } -+#endif - - uint os_count = 0; - string os_desc = ""; - -+#if PACKAGEKIT_BACKEND - var package_array = pk_updates.get_package_array (); - debug ("PackageKit backend reports %d updates", package_array.length); - -@@ -87,6 +90,7 @@ public class AppCenterCore.UpdateManager : Object { - ); - } - }); -+#endif - - os_updates.component.set_pkgnames ({}); - os_updates.change_information.clear_update_info (); -@@ -159,6 +163,7 @@ public class AppCenterCore.UpdateManager : Object { - count += 1; - } - -+#if PACKAGEKIT_BACKEND - pk_updates.get_details_array ().foreach ((pk_detail) => { - var pk_package = new Pk.Package (); - try { -@@ -181,6 +186,7 @@ public class AppCenterCore.UpdateManager : Object { - critical (e.message); - } - }); -+#endif - - os_updates.update_state (); - return count; -diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala -index 3673903f..2e128e77 100644 ---- a/src/Views/Homepage.vala -+++ b/src/Views/Homepage.vala -@@ -107,9 +107,13 @@ public class AppCenter.Homepage : AbstractView { - column_spacing = 24, - orientation = Gtk.Orientation.VERTICAL - }; -+#if PACKAGEKIT_BACKEND - grid.add (banner_revealer); - grid.add (recently_updated_revealer); - grid.add (categories_label); -+#else -+ category_flow.margin_top = 12; -+#endif - grid.add (category_flow); - - scrolled_window = new Gtk.ScrolledWindow (null, null) { -diff --git a/src/meson.build b/src/meson.build -index 7b319fc6..d1d77931 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -12,10 +12,8 @@ appcenter_files = files( - 'Core/FlatpakBackend.vala', - 'Core/Job.vala', - 'Core/Package.vala', -- 'Core/PackageKitBackend.vala', - 'Core/ScreenshotCache.vala', - 'Core/Task.vala', -- 'Core/UbuntuDriversBackend.vala', - 'Core/UpdateManager.vala', - 'Dialogs/InstallFailDialog.vala', - 'Dialogs/NonCuratedWarningDialog.vala', -@@ -76,6 +74,14 @@ if get_option('hide_upstream_distro_apps') - args += '--define=HIDE_UPSTREAM_DISTRO_APPS' - endif - -+if get_option('packagekit_backend') -+ args += '--define=PACKAGEKIT_BACKEND' -+ appcenter_files += files( -+ 'Core/PackageKitBackend.vala', -+ 'Core/UbuntuDriversBackend.vala', -+ ) -+endif -+ - executable( - meson.project_name(), - appcenter_files, diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index bdc2fbca59..d62141ece2 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -5,7 +5,6 @@ , appstream-glib , dbus , desktop-file-utils -, elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub , flatpak @@ -39,13 +38,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; - patches = [ - # Introduces a packagekit_backend meson flag. - # Makes appcenter actually work by using only the flatpak backend. - # https://github.com/elementary/appcenter/pull/1739 - ./add-packagekit-backend-option.patch - ]; - nativeBuildInputs = [ appstream-glib dbus # for pkg-config @@ -61,7 +53,6 @@ stdenv.mkDerivation rec { buildInputs = [ appstream - elementary-gtk-theme elementary-icon-theme flatpak glib @@ -79,8 +70,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dpayments=false" "-Dcurated=false" - # This option is introduced in add-packagekit-backend-option.patch - "-Dpackagekit_backend=false" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 115622e814..2356d362f6 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson 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 8cb9dcd18c..70b092d3f2 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 @@ -2,28 +2,26 @@ , stdenv , fetchFromGitHub , nix-update-script -, pkg-config +, appstream-glib +, desktop-file-utils , meson , ninja +, pkg-config +, python3 , vala -, desktop-file-utils -, gtk3 +, wrapGAppsHook +, clutter +, elementary-icon-theme +, evolution-data-server +, folks +, geoclue2 +, geocode-glib , granite +, gtk3 +, libchamplain , libgee , libhandy -, geoclue2 -, libchamplain -, clutter -, folks -, geocode-glib -, python3 -, libnotify , libical -, libgdata -, evolution-data-server -, appstream-glib -, elementary-icon-theme -, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -61,7 +59,6 @@ stdenv.mkDerivation rec { libgee libhandy libical - libnotify ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 7135795914..94bbc69047 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -3,25 +3,24 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config -, meson -, ninja -, vala +, appstream , desktop-file-utils -, python3 , gettext , libxml2 -, gtk3 +, meson +, ninja +, pkg-config +, python3 +, vala +, wrapGAppsHook +, elementary-icon-theme +, glib , granite +, gst_all_1 +, gtk3 +, libcanberra , libgee , libhandy -, gst_all_1 -, libcanberra -, clutter-gtk -, clutter-gst -, elementary-icon-theme -, appstream -, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -58,19 +57,22 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gst - clutter-gtk elementary-icon-theme + glib granite - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - gst_all_1.gstreamer gtk3 libcanberra libgee libhandy - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + # gtkSupport needed for gtksink + # https://github.com/elementary/camera/issues/181 + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-ugly + gstreamer + ]); postPatch = '' chmod +x meson/post_install.py 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 073ea45cbc..4087168feb 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 @@ -3,29 +3,28 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config +, appstream +, desktop-file-utils , meson , ninja -, vala +, pkg-config +, polkit , python3 -, desktop-file-utils -, gtk3 -, granite -, libgee -, libhandy -, elementary-icon-theme -, appstream -, libpeas +, vala +, wrapGAppsHook , editorconfig-core-c +, elementary-icon-theme +, granite +, gtk3 , gtksourceview4 , gtkspell3 +, libgee +, libgit2-glib +, libhandy +, libpeas , libsoup , vte -, webkitgtk , ctags -, libgit2-glib -, wrapGAppsHook -, polkit }: stdenv.mkDerivation rec { @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - ctags editorconfig-core-c elementary-icon-theme granite @@ -74,7 +72,6 @@ stdenv.mkDerivation rec { libpeas libsoup vte - webkitgtk ]; # ctags needed in path by outline plugin diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 9b760515ff..6d9fe808d8 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -14,7 +14,6 @@ , libgee , libhandy , elementary-icon-theme -, elementary-gtk-theme , gettext , wrapGAppsHook , appstream @@ -55,7 +54,6 @@ stdenv.mkDerivation rec { elementary-icon-theme granite gtk3 - elementary-gtk-theme libgee libhandy glib diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 5f1d0e9e71..4314e74d5a 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -20,7 +20,6 @@ , elementary-dock , bamf , sqlite -, libdbusmenu-gtk3 , zeitgeist , glib-networking , elementary-icon-theme @@ -64,7 +63,6 @@ stdenv.mkDerivation rec { gtk3 libcanberra libcloudproviders - libdbusmenu-gtk3 libgee libgit2-glib libhandy diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix index d71835a653..8438304277 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -3,31 +3,25 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config +, desktop-file-utils , meson , ninja -, vala -, desktop-file-utils -, gtk3 -, granite +, pkg-config , python3 -, libgee -, clutter-gtk -, json-glib +, vala +, wrapGAppsHook +, elementary-icon-theme +, glib +, granite +, gst_all_1 +, gtk3 , libgda +, libgee , libgpod , libhandy -, libnotify , libpeas -, libsoup -, zeitgeist -, gst_all_1 , taglib -, libdbusmenu -, libsignon-glib -, libaccounts-glib -, elementary-icon-theme -, wrapGAppsHook +, zeitgeist }: stdenv.mkDerivation rec { @@ -66,34 +60,25 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ - clutter-gtk + buildInputs = [ elementary-icon-theme + glib granite + gtk3 + libgda + libgee + libgpod + libhandy + libpeas + taglib + zeitgeist + ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer - gtk3 - json-glib - libaccounts-glib - libdbusmenu - libgda - libgee - libgpod - libhandy - libnotify - libpeas - libsignon-glib - libsoup - taglib - zeitgeist - ]; - - mesonFlags = [ - "-Dplugins=audioplayer,cdrom,ipod" - ]; + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 12f6242eaa..1ff9157b30 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -8,7 +8,6 @@ , vala , desktop-file-utils , gtk3 -, libaccounts-glib , libexif , libgee , libhandy @@ -24,7 +23,6 @@ , libsoup , sqlite , python3 -, scour , webkitgtk , libwebp , appstream @@ -34,13 +32,13 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY="; + sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI="; }; nativeBuildInputs = [ @@ -54,19 +52,13 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ + buildInputs = [ elementary-icon-theme geocode-glib gexiv2 granite - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer gtk3 json-glib - libaccounts-glib libexif libgee libgphoto2 @@ -76,10 +68,15 @@ stdenv.mkDerivation rec { librest libsoup libwebp - scour sqlite webkitgtk - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); mesonFlags = [ "-Dplugins=false" diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 9e65a56287..7629da0f73 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screenshot tool designed for elementary OS"; homepage = "https://github.com/elementary/screenshot"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.screenshot"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index f3402299ff..e796a2a344 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { smart copy/paste, and little to no configuration. ''; homepage = "https://github.com/elementary/terminal"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.terminal"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 494b50605e..cb1ea29122 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -40,21 +40,22 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ + buildInputs = [ clutter-gst clutter-gtk elementary-icon-theme granite + gtk3 + libgee + libhandy + ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer - gtk3 - libgee - libhandy - ]; + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix index d93b158168..6069fb8547 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -2,7 +2,6 @@ , stdenv , desktop-file-utils , nix-update-script -, elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub , flatpak @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme elementary-icon-theme flatpak glib diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch new file mode 100644 index 0000000000..657ea7a260 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch @@ -0,0 +1,82 @@ +From cc47fa33893e6840463ef8d59f9f4de4b7563726 Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Sat, 4 Dec 2021 22:00:38 +0800 +Subject: [PATCH] Add meson option for overlaying logo on wallpaper + +--- + meson.build | 8 ++++++++ + meson_options.txt | 1 + + src/Views/OperatingSystemView.vala | 8 ++++++++ + 3 files changed, 17 insertions(+) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 2125de6e..cbe3cadd 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,6 +20,14 @@ add_project_arguments( + vapi_dir = join_paths(meson.current_source_dir(), 'vapi') + add_project_arguments(['--vapidir', vapi_dir], language: 'vala') + ++vala_flags = [] ++ ++if get_option('wallpaper') ++ vala_flags += ['--define', 'WALLPAPER'] ++endif ++ ++add_project_arguments(vala_flags, language: 'vala') ++ + subdir('data') + subdir('src') + subdir('po') +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 00000000..8cef0bb3 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1 @@ ++option('wallpaper', type : 'boolean', value : true, description : 'Overlay logo on default wallpaper') +diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala +index fdb92e7e..6110d1aa 100644 +--- a/src/Views/OperatingSystemView.vala ++++ b/src/Views/OperatingSystemView.vala +@@ -39,6 +39,7 @@ public class About.OperatingSystemView : Gtk.Grid { + logo_icon_name = "distributor-logo"; + } + ++#if WALLPAPER + var logo = new Hdy.Avatar (128, "", false) { + // In case the wallpaper can't be loaded, we don't want an icon or text + icon_name = "invalid-icon-name", +@@ -53,6 +54,7 @@ public class About.OperatingSystemView : Gtk.Grid { + } + }); + logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++#endif + + var icon = new Gtk.Image () { + icon_name = logo_icon_name + "-symbolic", +@@ -64,9 +66,11 @@ public class About.OperatingSystemView : Gtk.Grid { + icon_style_context.add_class ("logo"); + icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + ++#if WALLPAPER + var logo_overlay = new Gtk.Overlay (); + logo_overlay.add (logo); + logo_overlay.add_overlay (icon); ++#endif + + // Intentionally not using GLib.OsInfoKey.PRETTY_NAME here because we + // want more granular control over text formatting +@@ -145,7 +149,11 @@ public class About.OperatingSystemView : Gtk.Grid { + valign = Gtk.Align.CENTER, + vexpand = true + }; ++#if WALLPAPER + software_grid.attach (logo_overlay, 0, 0, 1, 4); ++#else ++ software_grid.attach (icon, 0, 0, 1, 4); ++#endif + software_grid.attach (title, 1, 0, 3); + + software_grid.attach (kernel_version_label, 1, 2, 3); diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 03964284ed..82eece370d 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll , meson , ninja , pkg-config @@ -15,7 +14,6 @@ , switchboard , fwupd , appstream -, nixos-artwork }: stdenv.mkDerivation rec { @@ -30,11 +28,10 @@ stdenv.mkDerivation rec { }; patches = [ - # Use NixOS's default wallpaper - (substituteAll { - src = ./fix-background-path.patch; - default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; - }) + # Introduces a wallpaper meson flag. + # The wallpapaper path does not exist on NixOS, let's just remove the wallpaper. + # https://github.com/elementary/switchboard-plug-about/pull/236 + ./add-wallpaper-option.patch ]; nativeBuildInputs = [ @@ -55,6 +52,11 @@ stdenv.mkDerivation rec { switchboard ]; + mesonFlags = [ + # This option is introduced in add-wallpaper-option.patch + "-Dwallpaper=false" + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch deleted file mode 100644 index 6fea886913..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala -index fdb92e7e..4161538e 100644 ---- a/src/Views/OperatingSystemView.vala -+++ b/src/Views/OperatingSystemView.vala -@@ -47,7 +47,7 @@ public class About.OperatingSystemView : Gtk.Grid { - }; - logo.set_image_load_func ((size) => { - try { -- return new Gdk.Pixbuf.from_file_at_scale ("/usr/share/backgrounds/elementaryos-default", -1, size, true); -+ return new Gdk.Pixbuf.from_file_at_scale ("@default_wallpaper@", -1, size, true); - } catch (Error e) { - critical (e.message); - } diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 304e07749c..558c61d986 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK theme designed to be smooth, attractive, fast, and usable"; homepage = "https://github.com/elementary/stylesheet"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; }; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 40522bbf02..046f1fbdc9 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon. ''; homepage = "https://github.com/elementary/icons"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; }; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix index 617c6ed086..29192a4dd8 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/default.nix @@ -161,7 +161,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { }; - wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { }; + wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { + inherit (gnome) gnome-power-manager; + }; wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; @@ -232,18 +234,20 @@ lib.makeScope pkgs.newScope (self: with self; { # Please call these packages in pkgs/top-level/all-packages.nix instead of this file. # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 -} // lib.optionalAttrs (config.allowAliases or true) { +}) // lib.optionalAttrs (config.allowAliases or true) { ### ALIASES - inherit (pkgs) vala; # added 2019-10-10 + # They need to be outside the scope or they will shadow the attributes from parent scope. - cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; + vala = throw "The ‘pantheon.vala’ alias was removed on 2022-02-02, please use ‘pkgs.vala’ directly."; # added 2019-10-10 - elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21 + cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; # added 2020-04-06 + + elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 - inherit (pkgs) notes-up; # added 2021-12-18 + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 -}) +} diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 393186325b..a42ae92e97 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -47,8 +47,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - # Install our override for plank dockitems as Appcenter is not ready to be preinstalled. - # See: https://github.com/NixOS/nixpkgs/issues/70214. + # Install our override for plank dockitems as the desktop file path is different. schema_dir=$out/share/glib-2.0/schemas install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem new file mode 100644 index 0000000000..586a74df24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.appcenter.desktop diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override index 426368e847..0ba89fa4b4 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override @@ -1,2 +1,2 @@ [net.launchpad.plank.dock.settings] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] +dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 1f8c811d9d..dd6b10f5c8 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -2,7 +2,6 @@ , runCommand , mutter , elementary-default-settings -, nixos-artwork , glib , gala , epiphany diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index c5c8810c6c..3355ee0929 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -14,7 +14,6 @@ , granite , libgee , elementary-icon-theme -, elementary-gtk-theme , elementary-settings-daemon , gettext , libhandy @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme elementary-icon-theme elementary-settings-daemon # settings schema glib diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix index 9f4d275f24..c9a24b4906 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , file-roller }: stdenv.mkDerivation rec { pname = "file-roller-contract"; - version = "unstable-2021-02-23"; + version = "unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; @@ -36,6 +37,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/elementary/file-roller-contract.git"; + }; + }; + meta = with lib; { description = "Contractor extension for File Roller"; homepage = "https://github.com/elementary/file-roller-contract"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix index 36f4d3e539..e1a25eea4a 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , gnome-bluetooth }: stdenv.mkDerivation rec { pname = "gnome-bluetooth-contract"; - version = "unstable-2021-02-23"; + version = "unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; @@ -36,6 +37,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/elementary/gnome-bluetooth-contract.git"; + }; + }; + meta = with lib; { description = "Contractor extension for GNOME Bluetooth"; homepage = "https://github.com/elementary/gnome-bluetooth-contract"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 6c300536b2..ac98034955 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , substituteAll , nix-update-script -, gnome +, gnome-power-manager , pkg-config , meson , python3 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - gnome_power_manager = gnome.gnome-power-manager; + gnome_power_manager = gnome-power-manager; }) ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix index ec2255bbbc..f817a3017b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, nix-update-script , python3 , meson , ninja @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.2.0"; + version = "6.2.0"; # nixpkgs-update: no auto update outputs = [ "out" "dev" ]; @@ -52,12 +51,6 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - meta = with lib; { description = "An extension to GTK used by elementary OS"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index 6e3fbf5777..7e153293bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , meson , ninja @@ -45,6 +46,12 @@ stdenv.mkDerivation rec { pantheon.wingpanel ]; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/Lafydev/wingpanel-indicator-ayatana.git"; + }; + }; + meta = with lib; { description = "Ayatana Compatibility Indicator for Wingpanel"; homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana"; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index 3e9920cf62..ecd28b496d 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "bismuth"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Bismuth-Forge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ntfLijYPaOHvQToiAxuBZ5ayHPyQyevP9l6++SL0vUw="; + sha256 = "sha256-b+dlBv1M4//oeCGM2qrQ3s6z2yLql6eQWNqId3JB3Z4="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix index 4b057bea79..2340a57c22 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix @@ -214,7 +214,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; - inherit (pkgs.gnome2) libglade; + libglade = throw "libglade has been removed"; inherit (pkgs.gnome) gtksourceview; xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index e382e8024d..4743099506 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.5"; - sha256 = "sha256-r783SIGbVKxmLjCxexrMWjYdK7EgbgcHDFTG8KGjWMc="; + version = "1.2.6"; + sha256 = "sha256-HS+9pBCHy0NmDVUwL8QFDPeVpKyKib8YCwV8fZDL5Uc="; buildInputs = [ gtk3 libxfce4ui libxfce4util 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 0d0bf49161..dd74a0653b 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 @@ -20,11 +20,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wvbb1/g8ebY7g8mCMsedBQ4YZA6CRkueyNNkOpLDobA="; + sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index fa221e65ea..c45fba5ebd 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2pDxLmrplbzRyBvjVHmnqdMjCMZezWTlaLqMlZLTn8s="; + sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix index f8e6f423bd..c7bfa49ac7 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.21.2"; + version = "0.22.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-CiA71mvmq3HrJvgrEDMwp3CQ4Dl05BpTO5HusAL5FAQ="; + sha256 = "sha256-s5gCqQ0gJViS8t/jCAFtNYfmXQ7SBarlRLKUWHHEgSg="; rev = version; }; releaseType = "escript"; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 2bc8b18a00..9d1fa9aef0 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -137,11 +137,12 @@ let }; erlfmt = builder { name = "erlfmt"; - version = "1.0.0"; - src = fetchHex { - pkg = "erlfmt"; - version = "1.0.0"; - sha256 = "sha256-RL4L4DzmmQLcbc2PZeezre1qr10L5wlkGIyr1K0k8E4="; + version = "git"; + src = fetchFromGitHub { + owner = "gomoripeti"; + repo = "erlfmt"; + rev = "d4422d1fd79a73ef534c2bcbe5b5da4da5338833"; + sha256 = "07jp4g6a41w7318lh8ndsvgivkj0ahz3spnrsnx4cqkdb97yjaid"; }; beamDeps = [ ]; }; @@ -157,11 +158,11 @@ let }; elvis_core = builder { name = "elvis_core"; - version = "1.1.1"; + version = "1.3.1"; src = fetchHex { pkg = "elvis_core"; - version = "1.1.1"; - sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + version = "1.3.1"; + sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk="; }; beamDeps = [ katana_code zipper ]; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ats2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ats2/default.nix index c75600b534..e8c3af5d7e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ats2/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ats2/default.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; + # Disable parallel build, errors: + # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. + enableParallelBuilding = false; + setupHook = with lib; let hookFiles = diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 330cf851ab..4ac820b7e0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -32,9 +32,11 @@ let x86_64-linux = "linux-x86_64"; i686-linux = "linux-i686"; x86_64-darwin = "darwin-x86_64"; + aarch64-darwin = "darwin-universal"; }; arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); + isAarch64Darwin = stdenv.system == "aarch64-darwin"; checkInputs = [ git gmp openssl readline libxml2 libyaml ]; @@ -53,6 +55,8 @@ let tar --strip-components=1 -C $out -xf ${src} patchShebangs $out/bin/crystal ''; + + meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; }; commonBuildInputs = extraBuildInputs: [ @@ -206,7 +210,8 @@ let homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; - platforms = builtins.attrNames archs; + platforms = let archNames = builtins.attrNames archs; in + if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; broken = lib.versionOlder version "0.36.1" && stdenv.isDarwin; }; }) @@ -223,6 +228,13 @@ rec { }; }; + binaryCrystal_1_2 = genericBinary { + version = "1.2.0"; + sha256s = { + aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; + }; + }; + crystal_1_0 = generic { version = "1.0.0"; sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; @@ -238,10 +250,8 @@ rec { crystal_1_2 = generic { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = crystal_1_1; + binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; }; crystal = crystal_1_2; - - crystal2nix = callPackage ./crystal2nix.nix { }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix index a91105adc3..6f6130c367 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -4,20 +4,20 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.8.0"; + version = "2.10.0"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.15.0"; + dartVersion = "2.16.0"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-U1V1OPmFeNZCdBxFy7yqAbAE0cxh9f2UqKQmreJu9YA="; + sha256 = "sha256-n+hr3iMt5S0iEeR/X9zBQ86TbjCajaG0RyE+Ij1/aNM="; }; }; }; @@ -29,7 +29,7 @@ in { pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; - sha256 = "sha256-sSz/owGdCMB5b9+cAWvLkrfFcIIq5665Xopd4JKv1G4="; + sha256 = "sha256-4ZEpZPGVnisnK9QT1o4G2G6CiflYElh+e3+X8odnx1U="; }; patches = getPatches ./patches; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index d0fd363d3c..e799f6e155 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index be9320210e..6eb50aae95 100644 +index 05cba4393b..2a775bf24f 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -218,8 +218,6 @@ function shared::execute() { +@@ -217,8 +217,6 @@ function shared::execute() { # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" @@ -12,19 +12,19 @@ index be9320210e..6eb50aae95 100644 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 550a75bc65..c98a4591cc 100644 +index 396756808e..d324a6df59 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner { +@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner { globals.flutterUsage.suppressAnalytics = true; } - globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults['machine'] as bool; + final bool machineFlag = topLevelResults['machine'] as bool? ?? false; final bool ci = await globals.botDetector.isRunningOnBot; final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner { - final bool versionCheckFlag = topLevelResults['version-check'] as bool; +@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner { + final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false; final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; - if (topLevelResults.command?.name != 'upgrade' && @@ -33,4 +33,4 @@ index 550a75bc65..c98a4591cc 100644 - } // See if the user specified a specific device. - globals.deviceManager.specifiedDeviceId = topLevelResults['device-id'] as String; + globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch index 701cab54d8..a81d2def24 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch @@ -1,5 +1,5 @@ diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index ed42baea29..fee2fb1d62 100644 +index ed42baea29..12941f733a 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -11,11 +11,11 @@ import 'base/file_system.dart'; @@ -25,7 +25,7 @@ index ed42baea29..fee2fb1d62 100644 entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 7870c7807f..3fcf92f20d 100644 +index defc86cc20..7fdf14d112 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -22,6 +22,7 @@ import 'base/user_messages.dart'; @@ -36,7 +36,7 @@ index 7870c7807f..3fcf92f20d 100644 const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) -@@ -302,8 +303,13 @@ class Cache { +@@ -322,8 +323,13 @@ class Cache { return; } assert(_lock == null); @@ -51,7 +51,17 @@ index 7870c7807f..3fcf92f20d 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -453,7 +459,7 @@ class Cache { +@@ -382,8 +388,7 @@ class Cache { + + String get devToolsVersion { + if (_devToolsVersion == null) { +- const String devToolsDirPath = 'dart-sdk/bin/resources/devtools'; +- final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false); ++ final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools')); + if (!devToolsDir.existsSync()) { + throw Exception('Could not find directory at ${devToolsDir.path}'); + } +@@ -536,7 +541,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); } else { diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix index 5cd0609960..5ddaa7c429 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ libqt5pas qtbase ]; + # Disable parallel build, errors: + # Fatal: (1018) Compilation aborted + enableParallelBuilding = false; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional withQt wrapQtAppsHook; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix b/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix new file mode 100644 index 0000000000..fc7b5ffa98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gforth/boot-forth.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl, m4 }: + +let + version = "0.7.3"; +in +stdenv.mkDerivation { + pname = "gforth-boot"; + inherit version; + src = fetchurl { + url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; + sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; + }; + + buildInputs = [ m4 ]; + + configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + + meta = { + description = "The Forth implementation of the GNU project (outdated version used to bootstrap)"; + homepage = "https://www.gnu.org/software/gforth/"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix index bdf172cb9b..3b60d9fb17 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gforth/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, m4 }: +{ lib, stdenv, fetchFromGitHub, callPackage +, autoreconfHook, texinfo, libffi +}: let - version = "0.7.3"; -in -stdenv.mkDerivation { + swig = callPackage ./swig.nix { }; + bootForth = callPackage ./boot-forth.nix { }; +in stdenv.mkDerivation rec { + pname = "gforth"; - inherit version; - src = fetchurl { - url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; - sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; + version = "0.7.9_20220127"; + + src = fetchFromGitHub { + owner = "forthy42"; + repo = "gforth"; + rev = version; + sha256 = "sha256-3+ObHhsPvW44UFiN0GWOhwo7aiqhjwxNY8hw2Wv4MK0="; }; - buildInputs = [ m4 ]; + nativeBuildInputs = [ + autoreconfHook texinfo bootForth swig + ]; + buildInputs = [ + libffi + ]; + + passthru = { inherit bootForth; }; configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; @@ -22,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "The Forth implementation of the GNU project"; - homepage = "https://www.gnu.org/software/gforth/"; + homepage = "https://github.com/forthy42/gforth"; license = lib.licenses.gpl3; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gforth/swig.nix b/third_party/nixpkgs/pkgs/development/compilers/gforth/swig.nix new file mode 100644 index 0000000000..8de29407cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gforth/swig.nix @@ -0,0 +1,16 @@ +{ swig3, fetchFromGitHub }: + +## for updating to swig4, see +## https://github.com/GeraldWodni/swig/pull/6 +swig3.overrideDerivation (old: { + version = "3.0.9-forth"; + src = fetchFromGitHub { + owner = "GeraldWodni"; + repo = "swig"; + rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a"; + sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0="; + }; + configureFlags = old.configureFlags ++ [ + "--enable-forth" + ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix index d21ac4411f..a8f05d6f15 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix @@ -212,6 +212,15 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; }) + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./cabal-paths.patch ]; postPatch = "patchShebangs ."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix index 8ca5df0851..56b16c5d48 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix @@ -20,9 +20,10 @@ # build-time dependency too. buildTargetLlvmPackages, llvmPackages -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -61,7 +62,7 @@ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: -assert !enableIntegerSimple -> gmp != null; +assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. @@ -98,7 +99,7 @@ let '' HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -114,7 +115,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (!enableNativeBignum) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? @@ -152,7 +153,7 @@ let # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableIntegerSimple "-integer-simple") + (lib.optionalString enableNativeBignum "-native-bignum") ]; in @@ -251,7 +252,7 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix index 4714a19a53..75c728510e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix @@ -21,9 +21,10 @@ # build-time dependency too. buildTargetLlvmPackages, llvmPackages -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -62,7 +63,7 @@ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: -assert !enableIntegerSimple -> gmp != null; +assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. @@ -99,7 +100,7 @@ let '' HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -115,7 +116,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (!enableNativeBignum) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? @@ -153,7 +154,7 @@ let # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. variantSuffix = lib.concatStrings [ (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableIntegerSimple "-integer-simple") + (lib.optionalString enableNativeBignum "-native-bignum") ]; in @@ -252,7 +253,7 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/cabal-paths.patch b/third_party/nixpkgs/pkgs/development/compilers/ghc/cabal-paths.patch new file mode 100644 index 0000000000..19adcf5388 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/cabal-paths.patch @@ -0,0 +1,99 @@ +diff --git a/Cabal/Distribution/Simple/Build/PathsModule.hs b/Cabal/Distribution/Simple/Build/PathsModule.hs +index 5e660e8d6..1ae603c94 100644 +--- a/libraries/Cabal/Cabal/Distribution/Simple/Build/PathsModule.hs ++++ b/libraries/Cabal/Cabal/Distribution/Simple/Build/PathsModule.hs +@@ -37,6 +37,9 @@ import System.FilePath ( pathSeparator ) + -- * Building Paths_.hs + -- ------------------------------------------------------------ + ++splitPath :: FilePath -> [ String ] ++splitPath = unintersperse pathSeparator ++ + generatePathsModule :: PackageDescription -> LocalBuildInfo -> ComponentLocalBuildInfo -> String + generatePathsModule pkg_descr lbi clbi = + let pragmas = +@@ -78,12 +81,44 @@ generatePathsModule pkg_descr lbi clbi = + "import System.Environment (getExecutablePath)\n" + | otherwise = "" + ++ dirs = [ (flat_libdir, "LibDir") ++ , (flat_dynlibdir, "DynLibDir") ++ , (flat_datadir, "DataDir") ++ , (flat_libexecdir, "LibexecDir") ++ , (flat_sysconfdir, "SysconfDir") ]; ++ ++ shouldEmitPath p ++ | (splitPath flat_prefix) `isPrefixOf` (splitPath flat_bindir) = True ++ | (splitPath flat_prefix) `isPrefixOf` (splitPath p) = False ++ | otherwise = True ++ ++ shouldEmitDataDir = shouldEmitPath flat_datadir ++ ++ nixEmitPathFn (path, name) = let ++ varName = toLower <$> name ++ fnName = "get"++name ++ in if shouldEmitPath path then ++ varName ++ " :: FilePath\n"++ ++ varName ++ " = " ++ show path ++ ++ "\n" ++ fnName ++ " :: IO FilePath" ++ ++ "\n" ++ fnName ++ " = " ++ mkGetEnvOr varName ("return " ++ varName)++"\n" ++ else "" ++ ++ absBody = intercalate "\n" $ nixEmitPathFn <$> dirs ++ ++ warnPragma = case filter (not . shouldEmitPath . fst) dirs of ++ [] -> "" ++ omittedDirs -> "{-# WARNING \"The functions: "++omittedFns++" Have been omitted by the Nix build system.\" #-}" ++ where omittedFns = intercalate ", " $ map snd omittedDirs ++ ++ importList = intercalate ", " $ ("get" ++) . snd <$> filter (shouldEmitPath . fst) dirs ++ + header = + pragmas++ +- "module " ++ prettyShow paths_modulename ++ " (\n"++ +- " version,\n"++ +- " getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,\n"++ +- " getDataFileName, getSysconfDir\n"++ ++ "module " ++ prettyShow paths_modulename ++ " " ++ warnPragma ++ " (\n"++ ++ " version, getBinDir,\n"++ ++ (if shouldEmitDataDir then " getDataFileName, \n" else "\n")++ ++ " " ++ importList ++"\n"++ + " ) where\n"++ + "\n"++ + foreign_imports++ +@@ -136,26 +171,18 @@ generatePathsModule pkg_descr lbi clbi = + "\n"++ + filename_stuff + | absolute = +- "\nbindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath\n"++ ++ "\nbindir :: FilePath\n"++ + "\nbindir = " ++ show flat_bindir ++ +- "\nlibdir = " ++ show flat_libdir ++ +- "\ndynlibdir = " ++ show flat_dynlibdir ++ +- "\ndatadir = " ++ show flat_datadir ++ +- "\nlibexecdir = " ++ show flat_libexecdir ++ +- "\nsysconfdir = " ++ show flat_sysconfdir ++ + "\n"++ +- "\ngetBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath\n"++ ++ "\ngetBinDir :: IO FilePath\n"++ + "getBinDir = "++mkGetEnvOr "bindir" "return bindir"++"\n"++ +- "getLibDir = "++mkGetEnvOr "libdir" "return libdir"++"\n"++ +- "getDynLibDir = "++mkGetEnvOr "dynlibdir" "return dynlibdir"++"\n"++ +- "getDataDir = "++mkGetEnvOr "datadir" "return datadir"++"\n"++ +- "getLibexecDir = "++mkGetEnvOr "libexecdir" "return libexecdir"++"\n"++ +- "getSysconfDir = "++mkGetEnvOr "sysconfdir" "return sysconfdir"++"\n"++ +- "\n"++ +- "getDataFileName :: FilePath -> IO FilePath\n"++ +- "getDataFileName name = do\n"++ +- " dir <- getDataDir\n"++ +- " return (dir ++ "++path_sep++" ++ name)\n" ++ absBody ++ "\n"++ ++ (if shouldEmitDataDir then ++ "getDataFileName :: FilePath -> IO FilePath\n"++ ++ "getDataFileName name = do\n"++ ++ " dir <- getDataDir\n"++ ++ " return (dir ++ "++path_sep++" ++ name)\n" ++ else "\n") + | otherwise = + "\nprefix, bindirrel :: FilePath" ++ + "\nprefix = " ++ show flat_prefix ++ diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix rename to third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix index 5cba6be889..c0823e3b5a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix @@ -13,11 +13,11 @@ , cacert , Security , Foundation +, xcbuild , mailcap , runtimeShell , buildPackages , pkgsBuildTarget -, fetchpatch , callPackage }: @@ -40,8 +40,11 @@ let "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; - "powerpc64le" = "ppc64le"; "mips" = "mips"; + "mipsel" = "mipsle"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "powerpc64le" = "ppc64le"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); # We need a target compiler which is still runnable at build time, @@ -51,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.15"; + version = "1.18beta2"; src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w="; + url = "https://go.dev/dl/go${version}.src.tar.gz"; + sha256 = "sha256-PLFOLILaNm9zk8mI8fP8LBa3GlSSvT1J01iGzfJ6nRM="; }; # perl is used for testing go vet @@ -64,6 +67,8 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -158,27 +163,14 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.11.patch - ./ssl-cert-file-1.15.patch + ./ssl-cert-file-1.16.patch ./remove-test-pie-1.15.patch ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests-1.15.patch + ./skip-chown-tests-1.16.patch + ./skip-external-network-tests-1.16.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch - ./go_no_vendor_checks.patch - - # support TZ environment variable starting with colon - (fetchpatch { - name = "tz-support-colon.patch"; - url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch"; - sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f"; - }) - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) + ./go_no_vendor_checks-1.16.patch ]; postPatch = '' @@ -207,7 +199,7 @@ stdenv.mkDerivation rec { null; GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = 387; # from Arch: don't assume sse2 on i686 + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; # Hopefully avoids test timeouts on Hydra GO_TEST_TIMEOUT_SCALE = 3; @@ -279,6 +271,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks.patch b/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks.patch deleted file mode 100644 index 45ff4360f0..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index 71f68efbcc..3c566d04dd 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { -+ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/skip-chown-tests-1.16.patch b/third_party/nixpkgs/pkgs/development/compilers/go/skip-chown-tests-1.16.patch new file mode 100644 index 0000000000..783446cdf3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/skip-chown-tests-1.16.patch @@ -0,0 +1,42 @@ +From 9a6718a6355d89b73011fbd1eb1bba8dcfa021e6 Mon Sep 17 00:00:00 2001 +From: regnat +Date: Wed, 3 Nov 2021 10:17:28 +0100 +Subject: [PATCH] Disable the chown tests + +See https://github.com/golang/go/issues/42525 and +https://github.com/NixOS/nix/issues/3245 +--- + os/os_unix_test.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/os/os_unix_test.go b/os/os_unix_test.go +index 51693fd..0936542 100644 +--- a/src/os/os_unix_test.go ++++ b/src/os/os_unix_test.go +@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) { + } + + func TestChown(t *testing.T) { ++ t.Skipf("https://github.com/golang/go/issues/42525") + // Use TempDir() to make sure we're on a local file system, + // so that the group ids returned by Getgroups will be allowed + // on the file. On NFS, the Getgroups groups are +@@ -83,6 +84,7 @@ func TestChown(t *testing.T) { + } + + func TestFileChown(t *testing.T) { ++ t.Skipf("https://github.com/golang/go/issues/42525") + // Use TempDir() to make sure we're on a local file system, + // so that the group ids returned by Getgroups will be allowed + // on the file. On NFS, the Getgroups groups are +@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) { + } + + func TestLchown(t *testing.T) { ++ t.Skipf("https://github.com/golang/go/issues/42525") + // Use TempDir() to make sure we're on a local file system, + // so that the group ids returned by Getgroups will be allowed + // on the file. On NFS, the Getgroups groups are +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch b/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch deleted file mode 100644 index 0ea1050cd8..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index 01582489de..5b5faa5424 100644 ---- a/src/net/dial_test.go -+++ b/src/net/dial_test.go -@@ -990,6 +990,8 @@ func TestDialerControl(t *testing.T) { - // except that it won't skip testing on non-mobile builders. - func mustHaveExternalNetwork(t *testing.T) { - t.Helper() -+ t.Skipf("Nix sandbox does not have networking") -+ - mobile := runtime.GOOS == "android" || runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" - if testenv.Builder() == "" || mobile { - testenv.MustHaveExternalNetwork(t) diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch deleted file mode 100644 index 1884c681ca..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.15.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go -index ce88de025e..258ecc45d1 100644 ---- a/src/crypto/x509/root_darwin_amd64.go -+++ b/src/crypto/x509/root_darwin_amd64.go -@@ -10,6 +10,7 @@ import ( - "bytes" - macOS "crypto/x509/internal/macos" - "fmt" -+ "io/ioutil" - "os" - "strings" - ) -@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - var trustedRoots []*Certificate - untrustedRoots := make(map[string]bool) - -diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go -index 5ecc4911b3..14b4205c00 100644 ---- a/src/crypto/x509/root_darwin_ios.go -+++ b/src/crypto/x509/root_darwin_ios.go -@@ -6,6 +6,11 @@ - - package x509 - -+import ( -+ "io/ioutil" -+ "os" -+) -+ - func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { - return nil, nil - } -@@ -14,6 +19,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - p := NewCertPool() - p.AppendCertsFromPEM([]byte(systemRootsPEM)) - return p, nil -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index b48e618a65..195c1ff25a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { diff --git a/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix index 62d8f65ff8..5a7e9dd5a5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix @@ -16,7 +16,7 @@ , makeWrapper , numactl , perl -, python2 +, python3 , rocclr , rocm-comgr , rocm-device-libs @@ -56,7 +56,7 @@ let substituteInPlace bin/hip_embed_pch.sh \ --replace '$LLVM_DIR/bin/' "" - sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py + sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \ @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE="; }; - nativeBuildInputs = [ cmake python2 makeWrapper perl ]; + nativeBuildInputs = [ cmake python3 makeWrapper perl ]; buildInputs = [ libxml2 numactl libglvnd libX11 ]; propagatedBuildInputs = [ clang diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index e36dedf3c8..bfff07aabc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,13 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11_0_11-b1504.13"; + version = "11_0_13-b1751.25"; + src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - sha256 = "1xpgsgmmj5jp5qyw98hqmik6a7z3hfwmij023ij3qqymyj3nhm2i"; + sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI="; }; patches = []; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix index dab58674f9..788825d90b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.7.1"; + version = "1.7.2"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "04czipzai5628v1npa2y2xff0bd4rj8d2fcjnnsvkqj5gff8wra4"; + sha256 = "15dsfdcxvx0wizkkn85ldz0mg0h7cjziz1lw4kky0b9v9xr48lm7"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix index 30dc3f4f20..3ddcb79975 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -23,12 +23,6 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; 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 ddf51d9a2f..0ce73ed97a 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 @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix index bedfd5afee..0ddf28909b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix b/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix index ec0b96bbf2..b91e6c7480 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation { buildInputs = [mltonBootstrap gmp]; + # build fails otherwise + enableParallelBuilding = false; + preBuild = '' find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" sed -i "s|/tmp|$TMPDIR|" bin/regression diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix index 1d829450a1..009802b292 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix @@ -23,7 +23,7 @@ let zuluVersion = "8.54.0.21"; jdkVersion = "8.0.292"; sha256 = - if enableJavaFX then "1b05b2e40f707a151b063ebba821270fa930ebfc05712bc1f5a8a112395731a6" + if enableJavaFX then "8e901075cde2c31f531a34e8321ea4201970936abf54240a232e9389952afe84" else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c"; }; }."${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index e977d2b002..ff243372b4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4, python2, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix index 26c16895c5..3feda519b0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg, python3, ruby }: +, ffmpeg_4, python3, ruby }: let major = "15"; @@ -21,7 +21,7 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_57.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_58.nix similarity index 58% rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_57.nix rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_58.nix index f6b9d3c72a..c854bfdd37 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_57.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_58.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.57.0"; - rustcSha256 = "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"; + rustcVersion = "1.58.1"; + rustcSha256 = "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; @@ -37,24 +37,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.56.1"; + bootstrapVersion = "1.57.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "84db34603ce22d93312ff8bccd5580fe112e932bbeb0361e7cc37668a9803a27"; - x86_64-unknown-linux-gnu = "a6be5d045183a0b12dddf0d81633e2a64e63e4c2dfa44eb7593970c1ef93a98f"; - x86_64-unknown-linux-musl = "3c09058d104d9a88943fb343af1fb70422f9c4a987e6703666ee8a8051211190"; - arm-unknown-linux-gnueabihf = "c445706d109bb74de4c889687ae08a48af5808676fda15b84b7ef5970a82a5f6"; - armv7-unknown-linux-gnueabihf = "29ec65af502370c0c1a49faecd7131f1243fe3005b419ead4b40b267af2b2db0"; - aarch64-unknown-linux-gnu = "69792887357c8dd78c5424f0b4a624578296796d99edf6c30ebe2acc2b939aa3"; - aarch64-unknown-linux-musl = "971d13d41657e50e3ac54f17f52b4198c3d8bc25ec489a6a9e6d12c18226dda5"; - x86_64-apple-darwin = "8d65ef02a123c23be00101fb204d28b60498b9145dd2ee8edabf0afde6e01e55"; - aarch64-apple-darwin = "e71c14c1368048a22e4d1851f301872ac2e6f4c574f04d2a7ae4d64b0e7c7235"; - powerpc64le-unknown-linux-gnu = "fa78b28fe1ef3cd4add9ec151e5eab756dfc83c8bc3e5a576a6eddd350c4de7a"; - riscv64gc-unknown-linux-gnu = "5ec327d1bd3ba8d00afbe9be4a1f0fb8ab845063fcf9be479be9493c52a4dbb6"; + i686-unknown-linux-gnu = "7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa"; + x86_64-unknown-linux-gnu = "ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda"; + x86_64-unknown-linux-musl = "56876ebca0e46236208c8bd3c3425dba553abe49639e1040ee8b95bc66a45d33"; + arm-unknown-linux-gnueabihf = "b4448f7a96da4feee99a2c4b16b5738b99ab7e86e22d284ea6f7dca5921bca9b"; + armv7-unknown-linux-gnueabihf = "577682b1405e8901f971839407daaad06d8ae68ad370305b75d569ba293c4fb4"; + aarch64-unknown-linux-gnu = "d66847f7cf7b548ecb328c400ac4f691ee2aea6ff5cd9286ad8733239569556c"; + aarch64-unknown-linux-musl = "91c8e5171e5715261f7f635142a10a9415a4e5ba55374daf76f0b713c8b08132"; + x86_64-apple-darwin = "15ceffc4743434c19d08f73fb4edd6642b7fd8162ed7101d3e6ca2c691fcb699"; + aarch64-apple-darwin = "7511075e28b715e2d9c7ee74221779f8444681a4bb60ac3a0270a5fdf08bdd5a"; + powerpc64le-unknown-linux-gnu = "3ddc1abed6b7535c4150bf54291901fa856806c948bc21b711e24a3c8d810be7"; + riscv64gc-unknown-linux-gnu = "f809df1c6ac0adc9bd37eb871dfb0d9809f3ed7f61ba611f9305e9eb8f8c9226"; }; - selectRustPackage = pkgs: pkgs.rust_1_57; + selectRustPackage = pkgs: pkgs.rust_1_58; rustcPatches = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix index 7ebdaa474a..a3597e9feb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix @@ -20,10 +20,6 @@ rustPlatform.buildRustPackage { # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) doCheck = false; - preBuild = '' - export CARGO_TARGET_DIR="$(pwd)/target" - ''; - preFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix index b5009195ba..a72ae7d52a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -36,26 +36,50 @@ }: let - version = "5.4.2"; + # The Swift toolchain script builds projects with separate repos. By convention, some of them share + # the same version with the main Swift compiler project per release. We fetch these with + # `fetchSwiftRelease`. The rest have their own versions locked to each Swift release, as defined in the + # Swift compiler repo: + # utils/update_checkout/update_checkout-config.json. + # + # ... among projects listed in that file, we provide our own: + # - CMake + # - ninja + # - icu + # + # ... we'd like to include the following in the future: + # - stress-tester + # - integration-tests - # These dependency versions can be found in utils/update_checkout/update-checkout-config.json. - swiftArgumentParserVersion = "0.3.0"; - yamsVersion = "3.0.1"; - swiftFormatVersion = "0.50400.0"; + versions = { + swift = "5.5.2"; + yams = "4.0.2"; + argumentParser = "0.4.3"; + format = "swift-5.5-branch"; + crypto = "1.1.5"; + }; + + fetchAppleRepo = { repo, rev, sha256 }: + fetchFromGitHub { + owner = "apple"; + inherit repo rev sha256; + name = "${repo}-${rev}-src"; + }; fetchSwiftRelease = { repo, sha256, fetchSubmodules ? false }: fetchFromGitHub { owner = "apple"; inherit repo sha256 fetchSubmodules; - rev = "swift-${version}-RELEASE"; - name = "${repo}-${version}-src"; + rev = "swift-${versions.swift}-RELEASE"; + name = "${repo}-${versions.swift}-src"; }; - # Sources based on utils/update_checkout/update_checkout-config.json. sources = { + # Projects that share `versions.swift` for each release. + swift = fetchSwiftRelease { repo = "swift"; - sha256 = "0qrkqkwpmk312fi12kwwyihin01qb7sphhdz5c6an8j1rjfd9wbv"; + sha256 = "1a9ja3r6ap4cappbvlk18krlvwi0q75z21j5yx5rhbnw4ihh7lda"; }; cmark = fetchSwiftRelease { repo = "swift-cmark"; @@ -63,75 +87,73 @@ let }; llbuild = fetchSwiftRelease { repo = "swift-llbuild"; - sha256 = "0d7sj5a9b5c1ry2209cpccic5radf9s48sp1lahqzmd1pdx3n7pi"; - }; - argumentParser = fetchFromGitHub { - owner = "apple"; - repo = "swift-argument-parser"; - rev = swiftArgumentParserVersion; - sha256 = "15vv7hnffa84142q97dwjcn196p2bg8nfh89d6nnix0i681n1qfd"; - name = "swift-argument-parser-${swiftArgumentParserVersion}"; + sha256 = "1xmiv7yp9r9iscx3fc3zdp25mriz134k9ny2rchxzi4kifz8h0zc"; }; driver = fetchSwiftRelease { repo = "swift-driver"; - sha256 = "1j08273haqv7786rkwsmw7g103glfwy1d2807490id9lagq3r66z"; + sha256 = "1pb7fidgdqxzragqkillkv03vdilrwmcx6x2r4czqvdqj37gy6b6"; }; toolsSupportCore = fetchSwiftRelease { repo = "swift-tools-support-core"; - sha256 = "07gm28ki4px7xzrplvk9nd1pp5r9nyi87l21i0rcbb3r6wrikxb4"; + sha256 = "0a63193nycir4lffvmb3ky8cfly5kdr2libki2gx4fn6fxmb3a2f"; }; swiftpm = fetchSwiftRelease { repo = "swift-package-manager"; - sha256 = "05linnzlidxamzl3723zhyrfm24pk2cf1x66a3nk0cxgnajw0vzx"; + sha256 = "0hdjvb2asfi6h3x9bjssxkc3bgjn3idlmyga3dl3lscfq88hjxr9"; }; syntax = fetchSwiftRelease { repo = "swift-syntax"; - sha256 = "1y9agx9bg037xjhkwc28xm28kjyqydgv21s4ijgy5l51yg1g0daj"; + sha256 = "0kdgh9a8n28yh12hj8lbz2j66ag83l0lcfyfdg7zdr614zs6i3p1"; }; - # TODO: possibly re-add stress-tester. corelibsXctest = fetchSwiftRelease { repo = "swift-corelibs-xctest"; - sha256 = "00c68580yr12yxshl0hxyhp8psm15fls3c7iqp52hignyl4v745r"; + sha256 = "12fp3xzsqwcrmyc55h91d3dm64wn3wln47x2fl7sj0s8cn7q12b3"; }; corelibsFoundation = fetchSwiftRelease { repo = "swift-corelibs-foundation"; - sha256 = "1jyadm2lm7hhik8n8wacfiffpdwqsgnilwmcw22qris5s2drj499"; + sha256 = "1f7qcdx8597gwqa9pwl38d31w6w4d84c5hadj4ycj99msrm2f32x"; }; corelibsLibdispatch = fetchSwiftRelease { repo = "swift-corelibs-libdispatch"; - sha256 = "1s46c0hrxi42r43ff5f1pq2imb3hs05adfpwfxkilgqyb5svafsp"; + sha256 = "1bim5x9z9bqfgs6gdm4nlz1zrwl2x7xh4dn6i5md9ygsplr4ibzf"; fetchSubmodules = true; }; - # TODO: possibly re-add integration-tests. - # Linux does not support Xcode playgrounds. - # We provide our own ninja. - # We provider our own icu. - yams = fetchFromGitHub { - owner = "jpsim"; - repo = "Yams"; - rev = yamsVersion; - sha256 = "13md54y7lalrpynrw1s0w5yw6rrjpw46fml9dsk2m3ph1bnlrqrq"; - name = "Yams-${yamsVersion}"; - }; - # We provide our own CMake. indexstoreDb = fetchSwiftRelease { repo = "indexstore-db"; - sha256 = "1ap3hiq2jd3cn10d8d674xysq27by878mvq087a80681r8cdivn3"; + sha256 = "1l1xlzf5kx7x80kf4b7r36glv0jc64d08d1688kmzjq1cfgn6gm2"; }; sourcekitLsp = fetchSwiftRelease { repo = "sourcekit-lsp"; - sha256 = "02m9va0lsn2hnwkmgrbgj452sbyaswwmq14lqvxgnb7gssajv4gc"; - }; - format = fetchFromGitHub { - owner = "apple"; - repo = "swift-format"; - rev = swiftFormatVersion; - sha256 = "0skmmggsh31f3rnqcrx43178bc7scrjihibnwn68axagasgbqn4k"; - name = "swift-format-${swiftFormatVersion}-src"; + sha256 = "00fcmd7x5v62n6ajsc0dmzwz6nzy2p72mcs9w6p90adcx7pffqkn"; }; llvmProject = fetchSwiftRelease { repo = "llvm-project"; - sha256 = "166hd9d2i55zj70xjb1qmbblbfyk8hdb2qv974i07j6cvynn30lm"; + sha256 = "1gvqps5f9jh6lbhcjh1fyzp3bc0h9chbljzaspcrdi2qp878prlx"; + }; + + # Projects that have their own versions during each release + + argumentParser = fetchAppleRepo { + repo = "swift-argument-parser"; + rev = "${versions.argumentParser}"; + sha256 = "1jkq72fphxzsnynjxk72azp0iz5r2ji7adxrz6w1y2a19pgjdqrp"; + }; + format = fetchAppleRepo { + repo = "swift-format"; + rev = "${versions.format}"; + sha256 = "1hg888ps3fk23q2zf6djkvxyk6zndqvwypmy0s800hmnyf0hzgv4"; + }; + crypto = fetchAppleRepo { + repo = "swift-crypto"; + rev = "${versions.crypto}"; + sha256 = "0918pj3x3wgli3bnrjbvpzck2n6qz5n6f4yc5kljky45wd15f34g"; + }; + yams = fetchFromGitHub { + owner = "jpsim"; + repo = "Yams"; + rev = versions.yams; + sha256 = "1nk9b7l6m3wwjkl81npl2l1iwpsxaxb9za53jpwwsbbi1h1h4fbi"; + name = "Yams-${versions.yams}-src"; }; }; @@ -160,7 +182,7 @@ let in stdenv.mkDerivation { - name = "swift-${version}"; + name = "swift-${versions.swift}"; nativeBuildInputs = [ autoconf @@ -207,15 +229,14 @@ stdenv.mkDerivation { cp -r ${sources.toolsSupportCore} swift-tools-support-core cp -r ${sources.swiftpm} swiftpm cp -r ${sources.syntax} swift-syntax - # TODO: possibly re-add stress-tester. cp -r ${sources.corelibsXctest} swift-corelibs-xctest cp -r ${sources.corelibsFoundation} swift-corelibs-foundation cp -r ${sources.corelibsLibdispatch} swift-corelibs-libdispatch - # TODO: possibly re-add integration-tests. cp -r ${sources.yams} yams cp -r ${sources.indexstoreDb} indexstore-db cp -r ${sources.sourcekitLsp} sourcekit-lsp cp -r ${sources.format} swift-format + cp -r ${sources.crypto} swift-crypto cp -r ${sources.llvmProject} llvm-project chmod -R u+w . @@ -378,7 +399,7 @@ stdenv.mkDerivation { meta = with lib; { description = "The Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = with maintainers; [ dtzWill trepetti ]; + maintainers = with maintainers; [ dtzWill trepetti dduan ]; license = licenses.asl20; # Swift doesn't support 32-bit Linux, unknown on other platforms. platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix new file mode 100644 index 0000000000..f440208e94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "uasm"; + version = "2.53"; + + src = fetchFromGitHub { + owner = "Terraspace"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Aohwrcb/KTKUFFpfmqVDPNjJh1dMYSNnBJ2eFaP20pM="; + }; + + # https://github.com/Terraspace/UASM/pull/154 + patches = [ + # fix `invalid operands to binary - (have 'char *' and 'uint_8 *' {aka 'unsigned char *'})` + (fetchpatch { + name = "fix_pointers_compare.patch"; + url = "https://github.com/clouds56/UASM/commit/9cd3a400990e230571e06d4c758bd3bd35f90ab6.patch"; + sha256 = "sha256-8mY36dn+g2QNJ1JbWt/y4p0Ha9RSABnOE3vlWANuhsA="; + }) + # fix `dbgcv.c:*:*: fatal error: direct.h: No such file or directory` + (fetchpatch { + name = "fix_build_dbgcv_c_on_unix.patch"; + url = "https://github.com/clouds56/UASM/commit/806d54cf778246c96dcbe61a4649bf0aebcb0eba.patch"; + sha256 = "sha256-uc1LaizdYEh1Ry55Cq+6wrCa1OeBPFo74H5iBpmteAE="; + }) + ]; + + enableParallelBuilding = true; + + makefile = "gccLinux64.mak"; + + installPhase = '' + runHook preInstall + + install -Dt "$out/bin" -m0755 GccUnixR/uasm + install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/* + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.terraspace.co.uk/uasm.html"; + description = "A free MASM-compatible assembler based on JWasm"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thiagokokada ]; + license = licenses.watcom; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix index 025fc8c3fa..d027898cf9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://unisonweb.org/"; license = with licenses; [ mit bsd3 ]; maintainers = [ maintainers.virusdave ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 9adcbaaa8c..6e67bdd465 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -6,6 +6,7 @@ with builtins; with lib; let { case = "8.12"; out = { version = "1.12.0"; };} { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} + { case = "8.15"; out = { version = "1.13.7"; };} ] {}); in mkCoqDerivation { pname = "elpi"; @@ -13,11 +14,13 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.15"; out = "1.12.1"; } { case = "8.14"; out = "1.11.2"; } { case = "8.13"; out = "1.11.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY="; release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4"; release."1.11.1".sha256 = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc"; release."1.10.1".sha256 = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix index cbbddeffff..3b8b23618d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -10,7 +10,7 @@ with lib; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.1.0"; } + { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index d8d189ed5c..82fb6c536d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -9,6 +9,7 @@ mkCoqDerivation { repo = "coq-dpdgraph"; inherit version; defaultVersion = switch coq.coq-version [ + { case = "8.15"; out = "1.0+8.15"; } { case = "8.14"; out = "1.0+8.14"; } { case = "8.13"; out = "1.0+8.13"; } { case = "8.12"; out = "0.6.8"; } @@ -21,6 +22,7 @@ mkCoqDerivation { { case = "8.5"; out = "0.6"; } ] null; + release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7"; release."1.0+8.14".sha256 = "sha256:01pmi7jcc77431jii6x6nd4m8jg4vycachiyi1h6dx9rp3a2508s"; release."1.0+8.13".sha256 = "sha256:0f8lj8b99n8nsq2jf5m0snblfs8yz50hmlqqq9nlw4qklq7j4z5z"; release."0.6.9".sha256 = "11mbydpcgk7y8pqzickbzx0ig7g9k9al71i9yfrcscd2xj8fwj8z"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix index c78c6ca03f..58c6caa9e6 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix @@ -10,12 +10,14 @@ with lib; inherit version; defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [ + { cases = [(isGe "8.11") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; releaseRev = v: "v${v}"; + release."0.3.1".sha256 = "sha256-KcuG/11Yq5ACem4FyVnQqHKvy3tNK7hd0ir2SJzzMN0="; release."0.3.0".sha256 = "sha256:14rm0726f1732ldds495qavg26gsn30w6dfdn36xb12g5kzavp38"; release."0.2.2".sha256 = "sha256:1clzza73gccy6p6l95n6gs0adkqd3h4wgl4qg5l0qm4q140grvm7"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix index 1ac76b38c7..ca82bbbed0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix @@ -7,9 +7,10 @@ with lib; mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.7" "8.14"; out = "3.4.2"; } + { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."3.4.3".sha256 = "sha256-YTdWlEmFJjCcHkl47jSOgrGqdXoApJY4u618ofCaCZE="; release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw"; release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz"; release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 84cd739ed6..19d35b4c97 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -7,9 +7,12 @@ mkCoqDerivation { release."1.2.3".rev = "v1.2.3"; release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4="; + release."1.2.4".rev = "v1.2.4"; + release."1.2.4".sha256 = "sha256-iSW2O1kuunvOqTolmGGXmsYTxo2MJYCdW3BnEhp6Ksg="; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.11") (isGe "1.11.0") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index e950741d81..1f5a616bb5 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,10 +5,12 @@ with lib; let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.15"; out = "1.2.1"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.2.1".sha256 = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0="; release."1.2.0".sha256 = "0sk01rvvk652d86aibc8rik2m8iz7jn6mw9hh6xkbxlsvh50719d"; release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q="; release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp"; 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 117eafae92..b608f3d020 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -6,11 +6,12 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.8" "8.14"; out = "4.3.0"; } + { case = isGe "8.8"; out = "4.4.0"; } { 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.4.0".sha256 = "sha256-0+9AatTIEsjul0RXoOw6zWGEbGDVmuy7XuyrZNBZ8Kk="; release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko="; release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE="; release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix index 2ada5ee1c9..06cfd12b07 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (range "1.12.0" "1.13.0") ]; out = "1.2.0"; } + { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 5901fe2bb3..f842bc3b6d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -8,6 +8,7 @@ let mca = mkCoqDerivation { pname = "analysis"; owner = "math-comp"; + release."0.3.13".sha256 = "sha256-Yaztew79KWRC933kGFOAUIIoqukaZOdNOdw4XszR1Hg="; release."0.3.10".sha256 = "sha256-FBH2c8QRibq5Ycw/ieB8mZl0fDiPrYdIzZ6W/A3pIhI="; release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4="; release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; @@ -18,6 +19,7 @@ let mca = mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "0.3.13"; } { cases = [ (range "8.11" "8.14") (isGe "1.12.0") ]; out = "0.3.10"; } { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 6a72f73a01..744d5ea985 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.10") (range "1.11" "1.13") ]; out = "1.5.1"; } + { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.4.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix index b7f613ccfc..67f4c4ef78 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.12" "8.14") (range "1.12" "1.13") ]; out = "1.0"; } + { cases = [ (range "8.12" "8.14") (isGe "1.12") ]; out = "1.0"; } ] null; propagatedBuildInputs = [ mathcomp.algebra ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 562d1f9492..5b41d62d77 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,8 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.14"; out = "1.13.0"; } + { case = isGe "8.11"; out = "1.14.0"; } + { case = range "8.11" "8.15"; out = "1.13.0"; } { case = range "8.10" "8.13"; out = "1.12.0"; } { case = range "8.7" "8.12"; out = "1.11.0"; } { case = range "8.7" "8.11"; out = "1.10.0"; } @@ -29,6 +30,7 @@ let { case = range "8.5" "8.7"; out = "1.6.4"; } ] null; release = { + "1.14.0".sha256 = "07yamlp1c0g5nahkd2gpfhammcca74ga2s6qr7a3wm6y6j5pivk9"; "1.13.0".sha256 = "0j4cz2y1r1aw79snkcf1pmicgzf8swbaf9ippz0vg99a572zqzri"; "1.12.0".sha256 = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp"; "1.11.0".sha256 = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index c29669625a..a74ee17f1c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.5.4"; } + { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } @@ -17,6 +17,7 @@ with lib; mkCoqDerivation { { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "1.5.5".sha256 = "sha256-VdXA51vr7DZl/wT/15YYMywdD7Gh91dMP9t7ij47qNQ="; "1.5.4".sha256 = "0s4sbh4y88l125hdxahr56325hdhxxdmqmrz7vv8524llyv3fciq"; "1.5.3".sha256 = "1462x40y2qydjd2wcg8r6qr8cx3xv4ixzh2h8vp9h7arylkja1qd"; "1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix index 912d523d3b..2009034063 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix @@ -5,11 +5,14 @@ mkCoqDerivation { pname = "odd-order"; owner = "math-comp"; + release."1.13.0".rev = "mathcomp-odd-order.1.13.0"; + release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0="; release."1.12.0".rev = "mathcomp-odd-order.1.12.0"; release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM="; inherit version; defaultVersion = with versions; switch mathcomp.character.version [ + { case = (range "1.12.0" "1.14.0"); out = "1.13.0"; } { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix index 6b2c6203a3..71f3c88486 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -79,33 +79,33 @@ let in stdenv.mkDerivation rec { pname = (if withTeensyduino then "teensyduino" else "arduino") + lib.optionalString (!withGui) "-core"; - version = "1.8.16"; + version = "1.8.19"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; + sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ="; }; - teensyduino_version = "155"; + teensyduino_version = "156"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U="; - linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ="; - linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q="; - linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4="; + linux64 = "sha256-4DbhmmYrx+rCBpDrYFaC0A88Qv9UEeNlQAkFi3zAstk="; + linux32 = "sha256-DlRPOtDxmMPv2Qzhib7vNZdKNZCxmm9YmVNnwUKXK/E="; + linuxarm = "sha256-d+DbpER/4lFPcPDFeMG5f3WaUGn8pFchdIDo7Hm0XWs="; + linuxaarch64 = "sha256-8keQzhWq7QlAGIbfHEe3lfxpJleMMvBORuPaNrLmM6Y="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po="; - linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE="; - linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM="; - linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ="; + linux64 = "sha256-62i93B0cASC+L8oTUKA+40Uxzzf1GEeyEhC25wVFvJs="; + linux32 = "sha256-wSxtx3BqXMQCeWQDK8PHkWLlQqQM1Csao8bIk98FrFg="; + linuxarm = "sha256-lJ/R1ePq7YtDk3bvloFcn8jswrJH+L63tvH5QpTqfXs="; + linuxaarch64 = "sha256-gm8cDjLKNfpcaeO7fw6Kyv1TnWV/ZmH4u++nun9X6jo="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix deleted file mode 100644 index ead08ce023..0000000000 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gconf -, glib -, gnome_vfs -, gtk2 -, guile -, guile-cairo -, guile-lib -, gwrap -, libglade -, libgnome -, libgnomecanvas -, libgnomeui -, pango -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-gnome-platform"; - version = "2.16.4"; - - src = fetchurl { - url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM="; - }; - - nativeBuildInputs = [ - pkg-config - texinfo - ]; - buildInputs = [ - gconf - glib - gnome_vfs - gtk2 - guile - guile-cairo - gwrap - libglade - libgnome - libgnomecanvas - libgnomeui - pango - ] ++ lib.optional doCheck guile-lib; - - # The test suite tries to open an X display, which fails. - doCheck = false; - - makeFlags = [ - "GUILE_AUTO_COMPILE=0" - ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/guile-gnome/"; - description = "GNOME bindings for GNU Guile"; - longDescription = '' - GNU guile-gnome brings the power of Scheme to your graphical application. - guile-gnome modules support the entire Gnome library stack: from Pango to - GnomeCanvas, GTK to GStreamer, Glade to GtkSourceView, you will find in - guile-gnome a comprehensive environment for developing modern - applications. - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; -} 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 72066313ec..ba66635be5 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,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , guile , pkg-config , texinfo @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { pname = "guile-xcb"; version = "1.3"; - src = fetchurl { - url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz"; - hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE="; + src = fetchFromGitHub { + owner = "mwitmer"; + repo = pname; + rev = version; + hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs="; }; nativeBuildInputs = [ @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + homepage = "https://github.com/mwitmer/guile-xcb"; description = "XCB bindings for Guile"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix index 9e95e0bdad..2ea0f56634 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix @@ -96,6 +96,9 @@ self: super: { hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; hls-brittany-plugin = dontCheck super.hls-brittany-plugin; + hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin; + hls-class-plugin = dontCheck super.hls-class-plugin; + hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; # Similar RTS issue in test suite: # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 4fc26f4403..e99d653d83 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -77,7 +77,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "14zzs4j9dpc6rdnna80m0vi7s1awlz0mrmwfh8l4zvglx75avpw5"; + sha256 = "11idvicisp4wnw15lk7f9fs0kqpssngs1j8f98050f3jrqsccj0j"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -2038,13 +2038,13 @@ self: super: { # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; - # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) + # 2021-09-13: hls 1.6 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) # (hls is nearly the only consumer, but consists of 18 packages, so we bump lsp globally.) - lsp = doDistribute self.lsp_1_2_0_1; - lsp-types = doDistribute self.lsp-types_1_3_0_1; + lsp = doDistribute self.lsp_1_4_0_0; + lsp-types = doDistribute self.lsp-types_1_4_0_1; # Not running the "example" test because it requires a binary from lsps test # suite which is not part of the output of lsp. - lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_1); + lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_2); # 2021-09-14: Tests are flaky. hls-splice-plugin = dontCheck super.hls-splice-plugin; @@ -2101,7 +2101,7 @@ self: super: { # Needs brick > 0.64 nix-tree = super.nix-tree.override { - brick = self.brick_0_66_1; + brick = self.brick_0_67; }; # build newer version for `pkgs.shellcheck` diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 558e43469d..c628fe95f7 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -60,6 +60,7 @@ self: super: { lukko = doJailbreak super.lukko; parallel = doJailbreak super.parallel; primitive = doJailbreak (dontCheck super.primitive); + primitive-extras = doDistribute (self.primitive-extras_0_10_1_4); regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; @@ -71,8 +72,8 @@ self: super: { vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; weeder = self.weeder_2_3_0; - generic-lens-core = self.generic-lens-core_2_2_0_0; - generic-lens = self.generic-lens_2_2_0_0; + generic-lens-core = self.generic-lens-core_2_2_1_0; + generic-lens = self.generic-lens_2_2_1_0; th-desugar = self.th-desugar_1_13; # 2021-11-08: Fixed in autoapply-0.4.2 autoapply = doJailbreak self.autoapply_0_4_1_1; @@ -83,7 +84,7 @@ self: super: { }); # Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130 - generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0; + generic-lens_2_2_1_0 = dontCheck super.generic-lens_2_2_1_0; # Apply patches from head.hackage. alex = appendPatch (pkgs.fetchpatch { @@ -149,23 +150,14 @@ self: super: { # Fixes a bug triggered on GHC 9.0.1 text-short = self.text-short_0_1_5; - # 2021-09-18: The following plugins don‘t work yet on ghc9. - haskell-language-server = appendConfigureFlags [ - "-f-tactic" - "-f-splice" - "-f-refineimports" - "-f-class" + fourmolu = doJailbreak self.fourmolu_0_4_0_0; - "-f-fourmolu" + # 2022-02-05: The following plugins don‘t work yet on ghc9. + # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html + haskell-language-server = appendConfigureFlags [ "-f-brittany" "-f-stylishhaskell" ] (super.haskell-language-server.override { - hls-tactics-plugin = null; # No upstream support, generic-lens-core fail - hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5 - hls-refine-imports-plugin = null; # same issue es splice-plugin - hls-class-plugin = null; # No upstream support - - hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release hls-stylish-haskell-plugin = null; # No upstream support hls-brittany-plugin = null; # Dependencies don't build with 9.0.1 }); diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index bb2527b2e1..49bfd64324 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -112,6 +112,7 @@ self: super: { libraryHaskellDepends = [ self.fail self.ordered-containers + self.data-default ] ++ drv.libraryHaskellDepends or []; }) super.ghc-exactprint; ghc-lib = self.ghc-lib_9_2_1_20220109; @@ -137,7 +138,7 @@ self: super: { quickcheck-instances = super.quickcheck-instances_0_3_27; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; - retrie = doDistribute self.retrie_1_2_0_1; + retrie = doDistribute (dontCheck self.retrie_1_2_0_1); semialign = super.semialign_1_2_0_1; singleton-bool = doJailbreak super.singleton-bool; scientific = doJailbreak super.scientific; @@ -188,11 +189,6 @@ self: super: { sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }) (doJailbreak super.language-haskell-extract); - haskell-src-meta = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch"; - sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp"; - }) (doJailbreak super.haskell-src-meta); - # Tests depend on `parseTime` which is no longer available hourglass = dontCheck super.hourglass; @@ -245,4 +241,37 @@ self: super: { # need bytestring >= 0.11 which is only bundled with GHC >= 9.2 regex-rure = doDistribute (markUnbroken super.regex-rure); jacinda = doDistribute super.jacinda; + some = doJailbreak super.some; + fourmolu = super.fourmolu_0_5_0_1; + implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; + lucid = doJailbreak super.lucid; + hashtables = doJailbreak super.hashtables; + primitive-extras = super.primitive-extras_0_10_1_4; + hiedb = doJailbreak super.hiedb; + + # 2022-02-05: The following plugins don‘t work yet on ghc9.2. + # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html + haskell-language-server = appendConfigureFlags [ + "-f-alternateNumberFormat" + "-f-class" + "-f-eval" + "-f-haddockComments" + "-f-hlint" + "-f-retrie" + "-f-splice" + "-f-tactics" + "-f-brittany" + "-f-stylish-haskell" + ] (super.haskell-language-server.override { + hls-alternate-number-format-plugin = null; + hls-class-plugin = null; + hls-eval-plugin = null; + hls-haddock-comments-plugin = null; + hls-hlint-plugin = null; + hls-retrie-plugin = null; + hls-splice-plugin = null; + hls-tactics-plugin = null; + hls-brittany-plugin = null; + hls-stylish-haskell-plugin = null; + }); } 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 a46ff40c95..c1c584e05e 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 @@ -201,6 +201,7 @@ broken-packages: - arrow-list - arrowp - arrowp-qq + - arrow-utils - ArrowVHDL - artery - artifact @@ -829,8 +830,8 @@ broken-packages: - ContextAlgebra - context-free-grammar - context-stack - - contiguous - contiguous-checked + - contiguous-fft - continue - Contract - control-iso @@ -1132,6 +1133,7 @@ broken-packages: - doctest-discover-configurator - doctest-parallel - doctest-prop + - docusign-base - docusign-example - docvim - doi @@ -2377,6 +2379,7 @@ broken-packages: - hsns - hsnsq - hsntp + - hs-opentelemetry-instrumentation-persistent - hsoptions - hsoz - hsparql @@ -2726,6 +2729,7 @@ broken-packages: - katydid - kawaii - kawhi + - kazura-queue - kdesrc-build-extra - kd-tree - keccak @@ -2998,6 +3002,7 @@ broken-packages: - lye - lz4-frame-conduit - lzip + - lzlib - lzma-streams - lzo - maam @@ -3893,6 +3898,7 @@ broken-packages: - PrimitiveArray-Pretty - primitive-atomic - primitive-checked + - primitive-containers - primitive-convenience - primitive-foreign - primitive-indexed @@ -4198,6 +4204,7 @@ broken-packages: - riemann - riff - ring-buffer + - ring-buffers - riscv-isa - Ritt-Wu - rivers @@ -5379,6 +5386,7 @@ broken-packages: - wavefront-obj - weak-bag - weather-api + - web3-polkadot - webapi - webapp - webauthn 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 72c6cebb7b..56a6cb41cb 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 @@ -82,8 +82,6 @@ default-package-overrides: - reflex-dom-pandoc < 1.0.0.0 # 2021-09-07: pin to our current GHC version - ghc-api-compat == 8.10.7 - # 2021-09-14: Pin hiedb to version needed by ghcide - - hiedb == 0.4.0.* # 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes - weeder < 2.3.0 # 2021-10-10: taskwarrior 0.4 requires aeson > 2.0.1.0 @@ -169,10 +167,7 @@ extra-packages: - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2 - # 2022-01-08 hls-plugin-api 1.2.0.2 needs lsp < 1.3, but newer than stackage - - lsp < 1.3 - - lsp-types < 1.4 - - lsp-test < 0.14.0.2 + - fourmolu == 0.4.* # 2022-02-05: for HLS with GHC 9.0.2 package-maintainers: abbradar: diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e037891b80..7be9c09e48 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -474,10 +474,8 @@ dont-distribute-packages: - atomic-primops-foreign - atp - attoparsec-enumerator - - attoparsec-ip - attoparsec-iteratee - attoparsec-text-enumerator - - attoparsec-uri - atuin - audiovisual - aura @@ -637,7 +635,6 @@ dont-distribute-packages: - bv-sized-lens - bytehash - bytelog - - bytesmith - bytestring-read - c0check - cabal-bounds @@ -716,7 +713,6 @@ dont-distribute-packages: - chr-core - chr-lang - chromatin - - chronos_1_1_3 - chu2 - chuchu - chunks @@ -729,7 +725,9 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc + - clash-ghc_1_4_7 - clash-lib + - clash-lib_1_4_7 - clash-multisignal - clash-prelude-quickcheck - clash-shake @@ -752,6 +750,7 @@ dont-distribute-packages: - clckwrks-theme-clckwrks - clckwrks-theme-geo-bootstrap - cless + - cleveland - click-clack - clifford - clippings @@ -814,7 +813,6 @@ dont-distribute-packages: - consumers - container - containers-accelerate - - contiguous-fft - continuum - continuum-client - control @@ -837,6 +835,7 @@ dont-distribute-packages: - coroutine-iteratee - couch-simple - couchdb-enumerator + - cpkg - cprng-aes-effect - cql-io-tinylog - cqrs-example @@ -1195,7 +1194,7 @@ dont-distribute-packages: - funnyprint - funsat - fused-effects-squeal - - futhark_0_21_4 + - futhark_0_21_5 - fwgl-glfw - fwgl-javascript - fxpak @@ -1626,6 +1625,7 @@ dont-distribute-packages: - hreader-lens - hreq-client - hreq-conduit + - hriemann - hs-blake2 - hs-brotli - hs-duktape @@ -1771,6 +1771,7 @@ dont-distribute-packages: - indentation-trifecta - indexation - indieweb-algorithms + - indigo - infernu - inline-java - inspector-wrecker @@ -1787,7 +1788,6 @@ dont-distribute-packages: - invertible-hlist - invertible-hxt - ion - - ip - ipatch - ipc - ipld-cid @@ -2092,7 +2092,6 @@ dont-distribute-packages: - markdown-pap - markdown2svg - markov-processes - - markup - marmalade-upload - marquise - marvin @@ -2161,6 +2160,8 @@ dont-distribute-packages: - moo - moo-nad - morley + - morley-client + - morley-upgradeable - morloc - morpheus-graphql-client_0_18_0 - morpheus-graphql_0_18_0 @@ -2174,7 +2175,6 @@ dont-distribute-packages: - mpretty - mprover - mps - - mptcp - mptcpanalyzer - msgpack-aeson - msgpack-idl @@ -2310,7 +2310,7 @@ dont-distribute-packages: - pairing - panda - pandoc-japanese-filters - - pandoc_2_17_0_1 + - pandoc_2_17_1_1 - papa - papa-base - papa-base-implement @@ -2433,8 +2433,6 @@ dont-distribute-packages: - prednote-test - presto-hdbc - preview - - primitive-containers - - primitive-sort - primula-board - primula-bot - proc @@ -2627,7 +2625,6 @@ dont-distribute-packages: - ribosome-root - ribosome-test - ridley-extras - - ring-buffers - rio-process-pool - riot - ripple @@ -2701,7 +2698,6 @@ dont-distribute-packages: - scholdoc - scholdoc-citeproc - scholdoc-texmath - - scientific-notation - scion - scion-browser - scope @@ -2804,7 +2800,6 @@ dont-distribute-packages: - smallstring - smartword - smcdel - - smith - smith-cli - smith-client - smtlib2-debug @@ -3144,8 +3139,6 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - url-bytes - - urlpath - usb - usb-enumerator - usb-hid @@ -3157,7 +3150,6 @@ dont-distribute-packages: - uu-cco-examples - uu-cco-hut-parsing - uu-cco-uu-parsinglib - - uuid-bytes - uuid-crypto - uvector-algorithms - v4l2 @@ -3205,7 +3197,6 @@ dont-distribute-packages: - wai-middleware-cache - wai-middleware-cache-redis - wai-middleware-consul - - wai-middleware-content-type - wai-middleware-rollbar - wai-middleware-route - wai-session-tokyocabinet @@ -3221,6 +3212,7 @@ dont-distribute-packages: - web-routes-regular - web-routing - web3 + - web3-ethereum - webcrank-wai - webdriver-w3c - webserver @@ -3246,7 +3238,6 @@ dont-distribute-packages: - wrecker-ui - wright - writer-cps-full - - ws - wss-client - wtk-gtk - wu-wei @@ -3274,7 +3265,6 @@ dont-distribute-packages: - xml-push - xml-query-xml-conduit - xml-query-xml-types - - xml-syntax - xml-tydom-conduit - xml2x - xmltv diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 48ef3d1515..40db78d426 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -209,16 +209,6 @@ self: super: builtins.intersectAttrs super { # Help the test suite find system timezone data. tz = overrideCabal (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - patches = [ - # Fix tests failing with libSystem, musl etc. due to a lack of - # support for glibc's non-POSIX TZDIR environment variable. - # https://github.com/nilcons/haskell-tz/pull/29 - (pkgs.fetchpatch { - name = "support-non-glibc-tzset.patch"; - url = "https://github.com/sternenseemann/haskell-tz/commit/64928f1a50a1a276a718491ae3eeef63abcdb393.patch"; - sha256 = "1f53w8k1vpy39hzalyykpvm946ykkarj2714w988jdp4c2c4l4cf"; - }) - ] ++ (drv.patches or []); }) super.tz; # Nix-specific workaround @@ -605,21 +595,6 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoWithPatches = appendPatch ( - # Spago needs a small patch to work with versions-5.0.0: - # https://github.com/purescript/spago/pull/798 - # This can probably be removed with >spago-0.20.3. - pkgs.fetchpatch { - url = "https://github.com/purescript/spago/commit/dd4bf4413d9675c1c8065d24d0ed7b345c7fa5dd.patch"; - sha256 = "1i1r3f4n9mlkckx15bfrdy5m7gjf0zx7ycwyqra6qn34zpcbzpmf"; - } - ) super.spago; - - spagoWithOverrides = spagoWithPatches.override { - # spago has not yet been updated for the latest dhall. - dhall = self.dhall_1_38_1; - }; - spagoDocs = overrideCabal (drv: { postUnpack = (drv.postUnpack or "") + '' # Spago includes the following two files directly into the binary @@ -645,7 +620,7 @@ self: super: builtins.intersectAttrs super { "$sourceRoot/templates/docs-search-app-0.0.11.js" \ "$sourceRoot/templates/purescript-docs-search-0.0.11" ''; - }) spagoWithOverrides; + }) super.spago; # Tests require network access. spagoWithoutChecks = dontCheck spagoDocs; @@ -824,90 +799,11 @@ self: super: builtins.intersectAttrs super { '' + drv.postInstall or ""; }) super.hlint; - hls-brittany-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-brittany-plugin; - hls-class-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-class-plugin; - hls-ormolu-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-ormolu-plugin; - hls-fourmolu-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-fourmolu-plugin; - hls-module-name-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-module-name-plugin; - hls-rename-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - '' + (drv.preCheck or ""); - }) super.hls-rename-plugin; - hls-splice-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-splice-plugin; - hls-floskell-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-floskell-plugin; - hls-pragmas-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-pragmas-plugin; - hls-hlint-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-hlint-plugin; hiedb = overrideCabal (drv: { preCheck = '' export PATH=$PWD/dist/build/hiedb:$PATH ''; }) super.hiedb; - hls-call-hierarchy-plugin = overrideCabal (drv: { - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-call-hierarchy-plugin; - # Tests have file permissions expections that don‘t work with the nix store. - hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; - hls-haddock-comments-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-haddock-comments-plugin; - hls-eval-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-eval-plugin; taglib = overrideCabal (drv: { librarySystemDepends = [ @@ -1072,4 +968,35 @@ self: super: builtins.intersectAttrs super { install -Dm644 test/examples/*.jac -t "$docDir/examples" ''; }) super.jacinda; + +# haskell-language-server plugins all use the same test harness so we give them what we want in this loop. +} // pkgs.lib.mapAttrs + (_: overrideCabal (drv: { + testToolDepends = (drv.testToolDepends or [ ]) ++ [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + '' + (drv.preCheck or ""); + })) +{ + inherit (super) + hls-brittany-plugin + hls-call-hierarchy-plugin + hls-class-plugin + hls-eval-plugin + hls-floskell-plugin + hls-fourmolu-plugin + hls-module-name-plugin + hls-ormolu-plugin + hls-pragmas-plugin + hls-rename-plugin + hls-selection-range-plugin + hls-splice-plugin; + # Tests have file permissions expections that don‘t work with the nix store. + hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; + + # Flaky tests + hls-hlint-plugin = dontCheck super.hls-hlint-plugin; + hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin; + hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin; + hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 8822a77d5f..811e94c772 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -30117,6 +30117,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "amqp_0_22_1" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, connection + , containers, data-binary-ieee754, hspec, hspec-expectations + , monad-control, network, network-uri, split, stm, text, vector + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.22.1"; + sha256 = "0z1w35ar0bswbjzgana52nh4ilxbidnfkvli29w2zr7cak9dgzg1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -33694,16 +33722,16 @@ self: { }: mkDerivation { pname = "arrow-utils"; - version = "0.1.0.0"; - sha256 = "1l8njh623a00hvfd3cczvb4ngh7c39z6f0kfhr8hr6xhbkrgwqnc"; - revision = "1"; - editedCabalFile = "1jdl1jmr8hbjiybrjnfr8rraqdf95l4qia3nna3nh9pvh8c69jln"; + version = "0.1.1"; + sha256 = "112g74g844lnqfphkxqmp8ysnvi11iii9gcn70ml1ag6m5bdr7lc"; libraryHaskellDepends = [ base vector-sized ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; description = "functions for working with arrows"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "arrowapply-utils" = callPackage @@ -35773,7 +35801,6 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -35926,7 +35953,6 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-varword" = callPackage @@ -36190,6 +36216,26 @@ self: { license = lib.licenses.mit; }) {}; + "authenticate_1_3_5_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, containers, html-conduit, http-conduit + , http-types, network-uri, resourcet, text, transformers + , unordered-containers, xml-conduit + }: + mkDerivation { + pname = "authenticate"; + version = "1.3.5.1"; + sha256 = "1rhbvdgwdr68gp13p5piddfdqf3l9lmx4w7k249lc98y23780c3x"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring case-insensitive + conduit containers html-conduit http-conduit http-types network-uri + resourcet text transformers unordered-containers xml-conduit + ]; + description = "Authentication methods for Haskell web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "authenticate-kerberos" = callPackage ({ mkDerivation, base, process, text }: mkDerivation { @@ -36903,7 +36949,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "avro_0_6_0_0" = callPackage + "avro_0_6_0_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -36915,8 +36961,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.6.0.0"; - sha256 = "056nd6cgl9lqv0ij8a2s0rca1f0qcxr2mfr0i8pkh84h9y84nzv9"; + version = "0.6.0.1"; + sha256 = "1kl7dp0vm2klvijszjhwj2x9m4bmw044s085fyq86cszqrsrrn6w"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -40179,8 +40225,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.9.2.0"; - sha256 = "1b1xk4pi9j49fmh9lywgqcg61gbd6i7905gv5prnf0799iqz68g9"; + version = "0.9.2.1"; + sha256 = "0js10ai2dqdv6fm99ni6ckiq1rbq1wm82s73h81hln0qf1xnk3ra"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -40201,8 +40247,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.1.1"; - sha256 = "1amfm0lzy220blpkpvdh3b9kiypxz9gbvz2f20abfrvh6vdcd3hv"; + version = "0.5.1.2"; + sha256 = "1h1nb5y6lzc5zclkz925kr446kc05sdj94hbvpf41lypx0b133xv"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -40259,8 +40305,8 @@ self: { }: mkDerivation { pname = "beam-postgres"; - version = "0.5.2.0"; - sha256 = "1n3hpya8g7lx0y0nmz5fhcdjzq5qaxnn3hbnnzaf9kk5v6xw7qd5"; + version = "0.5.2.1"; + sha256 = "028aqd7r49avmwlf97612f98a5maw01l0d5vlbg0nj7kqi03ghj4"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -40285,8 +40331,8 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.5.1.1"; - sha256 = "1kzn8d7xjp8grkjqdzj1hqckfibrw6apa8ki078zhpszl787ffql"; + version = "0.5.1.2"; + sha256 = "0d5s6r54aamkr91ji3z05cn7vjmbl0xaysnx3dmalx75r5jhmhzq"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable monad-control mtl network-uri scientific sqlite-simple @@ -46866,7 +46912,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "brick_0_66_1" = callPackage + "brick_0_67" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -46875,8 +46921,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.66.1"; - sha256 = "04acisnnrhhq0xh470wfqjyyym8wjv5zv93pmwklz84ypzfdw60a"; + version = "0.67"; + sha256 = "02f8qmc3y2pyqysc9qan2l05vk3ryvlc7mgs8hdh18fp96x88669"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48795,7 +48841,6 @@ self: { ]; description = "Nonresumable byte parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring_0_11_2_0" = callPackage @@ -48949,10 +48994,8 @@ self: { }: mkDerivation { pname = "bytestring-encoding"; - version = "0.1.1.0"; - sha256 = "0m2w1nvj5izmb4j08c57lk89i3rnhhb0n0rz511pb6s75ijqrb71"; - revision = "1"; - editedCabalFile = "0vfigz5181rpk6lcajdbljvsrip3nlwxly1pflc6isn24wcd2jn1"; + version = "0.1.2.0"; + sha256 = "1j1gli2aa7kflirvnaqdwg212s85v4j2fak5qy79y8zsb3l62p44"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring deepseq QuickCheck tasty tasty-hunit @@ -57002,6 +57045,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-ghc_1_4_7" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.4.7"; + sha256 = "06r97diqy6px1pf06dbnvf6ns0kmqy5gc5mr6k9xam1d2pk37xwd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory exceptions extra + filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring @@ -57045,6 +57119,49 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_4_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, pretty-show, prettyprinter + , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.4.7"; + sha256 = "03wj0i926x8lc09nwgwh48plqxc49i5zzwil88bgnxdcwv9ncv18"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers pretty-show prettyprinter + primitive process reducers template-haskell temporary terminal-size + text text-show time transformers trifecta unordered-containers + utf8-string vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -57102,6 +57219,48 @@ self: { broken = true; }) {}; + "clash-prelude_1_4_7" = callPackage + ({ mkDerivation, array, arrows, base, bifunctors, binary + , bytestring, Cabal, cabal-doctest, constraints, containers + , criterion, data-binary-ieee754, data-default-class, deepseq + , doctest, extra, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, half, hashable + , hedgehog, hint, integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, text-show, th-abstraction + , th-lift, th-orphans, time, transformers, type-errors, uniplate + , vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.4.7"; + sha256 = "1ba7w8d9532gd6ahvmdbxsby2rx9wpxblkgmkrn6df1xdp3aqi9w"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array arrows base bifunctors binary bytestring constraints + containers data-binary-ieee754 data-default-class deepseq extra + ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise half hashable integer-gmp interpolate + lens QuickCheck recursion-schemes reflection singletons + template-haskell text text-show th-abstraction th-lift th-orphans + time transformers type-errors uniplate vector + ]; + testHaskellDepends = [ + base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -57725,6 +57884,30 @@ self: { broken = true; }) {}; + "cleff" = callPackage + ({ mkDerivation, atomic-primops, base, containers, exceptions + , extra, hspec, lifted-base, microlens, monad-control, primitive + , QuickCheck, template-haskell, th-abstraction, transformers + , transformers-base, unliftio + }: + mkDerivation { + pname = "cleff"; + version = "0.1.0.0"; + sha256 = "16fd1ly5299an0wlmnc3f6asikbr8n8b8vzkmvd2jq86sk0x5z1n"; + libraryHaskellDepends = [ + atomic-primops base containers exceptions microlens monad-control + primitive template-haskell th-abstraction transformers + transformers-base unliftio + ]; + testHaskellDepends = [ + atomic-primops base containers exceptions extra hspec lifted-base + microlens monad-control primitive QuickCheck template-haskell + th-abstraction transformers transformers-base unliftio + ]; + description = "Fast and concise extensible effects"; + license = lib.licenses.bsd3; + }) {}; + "cless" = callPackage ({ mkDerivation, base, highlighting-kate, optparse-applicative , process, terminfo, wl-pprint-extras, wl-pprint-terminfo @@ -57744,6 +57927,51 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "cleveland" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base-noprelude + , bimap, bytestring, constraints, containers, criterion, cryptonite + , data-default, directory, either, exceptions, file-embed, filepath + , first-class-families, fmt, gauge, hedgehog, hex-text, hspec + , hspec-expectations, HUnit, lens, lorentz, megaparsec, MonadRandom + , morley, morley-client, morley-prelude, mtl, named, o-clock + , optparse-applicative, safe-exceptions, servant-client + , servant-client-core, silently, singletons, spoon, statistics, syb + , tagged, tasty, tasty-ant-xml, tasty-discover, tasty-hedgehog + , tasty-hspec, tasty-hunit-compat, template-haskell, text, time + , type-spec, unordered-containers, vinyl, with-utf8 + }: + mkDerivation { + pname = "cleveland"; + version = "0.1.0"; + sha256 = "0px16j08fakmxzsf6rgx9gs91g61ygxzkf7sngj06a76yzfj4hlw"; + libraryHaskellDepends = [ + aeson base-noprelude constraints containers criterion cryptonite + data-default directory either exceptions file-embed fmt hedgehog + hex-text hspec hspec-expectations HUnit lens lorentz MonadRandom + morley morley-client morley-prelude mtl named o-clock + optparse-applicative safe-exceptions servant-client-core singletons + statistics tagged tasty tasty-ant-xml tasty-hedgehog + tasty-hunit-compat template-haskell text time with-utf8 + ]; + testHaskellDepends = [ + aeson aeson-pretty aeson-qq base-noprelude bimap bytestring + constraints containers data-default directory either filepath + first-class-families fmt hedgehog hex-text hspec hspec-expectations + HUnit lens lorentz megaparsec morley morley-client morley-prelude + mtl named o-clock servant-client silently singletons spoon syb + tasty tasty-hedgehog tasty-hspec tasty-hunit-compat text time + type-spec unordered-containers vinyl with-utf8 + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base-noprelude data-default gauge megaparsec morley morley-prelude + with-utf8 + ]; + description = "Testing framework for Morley"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "clevercss" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -61081,6 +61309,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "commutative-semigroups" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "commutative-semigroups"; + version = "0.0.1.0"; + sha256 = "0vpg3vl84pwv7rnrmh0g6dzg0x61w919c84bry6gpmdkil55zlll"; + libraryHaskellDepends = [ base ]; + description = "Commutative semigroups"; + license = lib.licenses.bsd3; + }) {}; + "comonad" = callPackage ({ mkDerivation, base, containers, distributive , indexed-traversable, tagged, transformers, transformers-compat @@ -64529,6 +64768,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_13_3" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, transformers, transformers-compat + , type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.13.3"; + sha256 = "0jhdix263zxsiki0pmdpyrg7vcfxx2x9w7pjiypva3wsr9agdjzr"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -65009,8 +65268,6 @@ self: { ]; description = "Unified interface for primitive arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "contiguous-checked" = callPackage @@ -65036,6 +65293,7 @@ self: { description = "dft of contiguous memory structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "continue" = callPackage @@ -65938,15 +66196,15 @@ self: { license = lib.licenses.mit; }) {}; - "core-data_0_3_0_2" = callPackage + "core-data_0_3_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, prettyprinter, scientific, text, unordered-containers , vector }: mkDerivation { pname = "core-data"; - version = "0.3.0.2"; - sha256 = "0rfx7086ilv2rld2nnq96jkygvxxsnfs81mh4b4nmb4drdw02jl0"; + version = "0.3.1.1"; + sha256 = "0i11m2k1xb97f0plvp9g7l4zhp9d1njn9z7xfhcmghbvlkk82vx2"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable prettyprinter scientific text unordered-containers vector @@ -65994,7 +66252,7 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_4_2_0" = callPackage + "core-program_0_4_4_0" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-text, directory, exceptions, filepath, fsnotify, hashable , hourglass, mtl, prettyprinter, safe-exceptions, stm @@ -66003,8 +66261,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.4.2.0"; - sha256 = "1xbfshfy6h7afpnlaafyq4mj3x0q4i83sxk6720k0dd0hhszb6b0"; + version = "0.4.4.0"; + sha256 = "1mp694llk3b04yqv8gr7i2rwcld99xmx1m55f5fhk1vgks816kih"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -66019,17 +66277,17 @@ self: { "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams - , locators, mtl, random, safe-exceptions, scientific, stm - , template-haskell, text, unix, uuid + , mtl, network-info, random, safe-exceptions, scientific, stm + , template-haskell, text, unix }: mkDerivation { pname = "core-telemetry"; - version = "0.1.8.1"; - sha256 = "024npp0cm5f3v1h70iw03hv2lj0r2ylsp7w2pm1iv6zr8j63k1iy"; + version = "0.1.9.1"; + sha256 = "11b106gs96l20zb0lyr0qw49bnm8wxfc4wcncjaip6mdvgcc8cza"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-program - core-text exceptions http-streams io-streams locators mtl random - safe-exceptions scientific stm template-haskell text unix uuid + core-text exceptions http-streams io-streams mtl network-info + random safe-exceptions scientific stm template-haskell text unix ]; description = "Advanced telemetry"; license = lib.licenses.mit; @@ -66584,6 +66842,7 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cplex-hs" = callPackage @@ -75043,6 +75302,8 @@ self: { pname = "dependent-monoidal-map"; version = "0.1.1.2"; sha256 = "11qcrxji3lvq4blzh1qk9wkhhzjkvz3maxfv63zgby98dpmkxa2x"; + revision = "1"; + editedCabalFile = "0149hmhqlj69pjg325p3da1z96czbjc18vp4i4acrvzbjh060nd4"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -75534,17 +75795,17 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, lifted-base, monad-control, mtl - , transformers, transformers-base + ({ mkDerivation, base, monad-control, mtl, transformers + , transformers-base }: mkDerivation { pname = "deriving-trans"; - version = "0.1.0.0"; - sha256 = "1yphl0wjp67b7hc3ys6snlvzk67by070p5vfmwcv7ic688vh1dw4"; + version = "0.2.2.0"; + sha256 = "1v2iamc375i6gqavb2s644mbb99wlnv0nk07dmbyaw522svp20y4"; libraryHaskellDepends = [ - base lifted-base monad-control mtl transformers transformers-base + base monad-control mtl transformers transformers-base ]; - description = "Derive transformer type classes with DerivingVia"; + description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; }) {}; @@ -76619,8 +76880,8 @@ self: { pname = "dhall-recursive-adt"; version = "0.1.0.1"; sha256 = "09s3m86vflj5im2walab8d0wpvihsvxc5mzy55m10pfzr3gxsd11"; - revision = "1"; - editedCabalFile = "0phfa1y6fic6wyvm3bp56z4sj43wbf75rzggzgf763vivlnvc7xw"; + revision = "2"; + editedCabalFile = "14a524zh3vi06cnf5glhd1kdl4wsmzsaqgvsvxg5096kzn6cijqx"; libraryHaskellDepends = [ base data-fix dhall recursion-schemes ]; testHaskellDepends = [ base dhall either hedgehog recursion-schemes tasty tasty-hedgehog @@ -76990,8 +77251,8 @@ self: { }: mkDerivation { pname = "diagrams-braille"; - version = "0.1.0.2"; - sha256 = "1jrhc8k0n9jabhg6rz22js9k3nj3v6r6klxskiksf6ajbqbzqg69"; + version = "0.1.1"; + sha256 = "1h9j1hrhpzl5rqhjnwp92sv0shc9i7yhnzpbs1dxfpyn8baws7mc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77048,10 +77309,8 @@ self: { }: mkDerivation { pname = "diagrams-cairo"; - version = "1.4.1.1"; - sha256 = "0vyd2yr55n7x71194i18lnbcshdjpnqw4qyq7vj5zx377rsz711k"; - revision = "3"; - editedCabalFile = "16jm9g9rfc7d1dy2kwq3n9wfgcj8l6c0d54lym1r6b0arc7yjqlb"; + version = "1.4.2"; + sha256 = "094vavgsfn7hxn2h7phvmx82wdhw51vqqv29p8hsvmijf1gxa7c1"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -78626,20 +78885,22 @@ self: { }) {}; "directory-contents" = callPackage - ({ mkDerivation, base, containers, directory, filepath, text - , transformers, witherable + ({ mkDerivation, base, containers, coquina, directory, filepath + , here, process, text, transformers, witherable }: mkDerivation { pname = "directory-contents"; - version = "0.2.0.0"; - sha256 = "15irmkg3ll6s3dqwl4hn7mmr5kygcl11slba3mzkdhlyg567is6x"; + version = "0.2.0.1"; + sha256 = "12c157lxqn910x7x3jwzv70fhb01bszxp0r00107igddrd6dqffv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath text transformers witherable ]; executableHaskellDepends = [ base filepath text ]; - testHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base coquina directory filepath here process text + ]; description = "Recursively build, navigate, and operate on a tree of directory contents"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -81214,6 +81475,8 @@ self: { ]; description = "Low-level bindings to the DocuSign API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "docusign-base-minimal" = callPackage @@ -81786,6 +82049,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "double-conversion_2_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "double-conversion"; + version = "2.0.4.1"; + sha256 = "1hrpqh8lbw0kkryqsya95mfnnnj0pj7zswxrn6kvfy4rf7z8v2d4"; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + description = "Fast conversion between single and double precision floating point and text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "double-extra" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, deepseq , double-conversion, rawstring-qm, text @@ -84848,10 +85129,8 @@ self: { }: mkDerivation { pname = "eflint"; - version = "3.0.0.1"; - sha256 = "1cij1g1mrw41dn4c63bzkahya3li9v7pkzisj0v129p6ckypv7cc"; - revision = "1"; - editedCabalFile = "10bi07ilvvmglbgsc1xf2fq4vsndrqh9d6c823d897s4didcv8rk"; + version = "3.0.0.2"; + sha256 = "14rhc9kmsb9krf5h8a8041pirp8mnlfc6kxidmdz2d4r4pd8yd8k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91965,36 +92244,36 @@ self: { license = lib.licenses.bsd3; }) {}; - "fakedata_1_0_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , directory, exceptions, fakedata-parser, filepath, gauge, hashable - , hspec, hspec-discover, QuickCheck, random, regex-tdfa + "fakedata_1_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , deepseq, directory, exceptions, fakedata-parser, filepath, gauge + , hashable, hspec, hspec-discover, QuickCheck, random, regex-tdfa , string-random, template-haskell, text, time, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "fakedata"; - version = "1.0.1"; - sha256 = "08z3qhj93smpd2ksix3i7wcxqkz5533pkx9xf4xjq60qm99scmw6"; + version = "1.0.2"; + sha256 = "1xbp0wif3dfk4880f8lr8zj07jdqhbxalqm7bfpw6r0cv354w3l8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base bytestring containers directory exceptions + aeson attoparsec base bytestring containers directory exceptions fakedata-parser filepath hashable random string-random template-haskell text time transformers unordered-containers vector yaml ]; testHaskellDepends = [ - attoparsec base bytestring containers directory exceptions + aeson attoparsec base bytestring containers directory exceptions fakedata-parser filepath hashable hspec QuickCheck random regex-tdfa string-random template-haskell text time transformers unordered-containers vector yaml ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - attoparsec base bytestring containers deepseq directory exceptions - fakedata-parser filepath gauge hashable random string-random - template-haskell text time transformers unordered-containers vector - yaml + aeson attoparsec base bytestring containers deepseq directory + exceptions fakedata-parser filepath gauge hashable random + string-random template-haskell text time transformers + unordered-containers vector yaml ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; @@ -94982,6 +95261,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "fingertree_0_1_5_0" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "fingertree"; + version = "0.1.5.0"; + sha256 = "0wdzpli8bpgk8lrsp105zb0y5gn1r2029laclvhz264bza93q9pk"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Generic finger-tree structure, with example instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fingertree-psqueue" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -98046,6 +98343,8 @@ self: { pname = "formatting"; version = "7.1.3"; sha256 = "1vrc2i1b6lxx2aq5hysfl3gl6miq2wbhxc384axvgrkqjbibnqc0"; + revision = "1"; + editedCabalFile = "046cm1jvxmsmpclrwmwc1pj90f2qdhd5ysya0ckzqrc3ls6fgcxz"; libraryHaskellDepends = [ base clock double-conversion ghc-prim old-locale scientific text time transformers @@ -98441,6 +98740,40 @@ self: { license = lib.licenses.bsd3; }) {}; + "fourmolu_0_4_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , containers, Diff, directory, dlist, exceptions, filepath + , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML + , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb + , temporary, text + }: + mkDerivation { + pname = "fourmolu"; + version = "0.4.0.0"; + sha256 = "1mq0h6nsl7ssfwh6zqhyja7w212vn8msmlm5iwwimca279hzwywb"; + revision = "1"; + editedCabalFile = "03bwhqj547brmgk191gy3k9xayi6fqqk2f5sbz3ail1bk7b73xnq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal containers Diff directory + dlist exceptions filepath ghc-lib-parser HsYAML HsYAML-aeson mtl + syb text + ]; + executableHaskellDepends = [ + base directory filepath ghc-lib-parser gitrev optparse-applicative + text + ]; + testHaskellDepends = [ + base containers directory filepath hspec path path-io temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fourmolu_0_5_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath @@ -101148,7 +101481,7 @@ self: { license = lib.licenses.isc; }) {}; - "futhark_0_21_4" = callPackage + "futhark_0_21_5" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base16-bytestring, binary, blaze-html, bmp, bytestring , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 @@ -101163,8 +101496,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.4"; - sha256 = "0ij7sc9zq3l8i100kf7acwvrmqnq3f6x78wv5a7r8mfmb8bs51b3"; + version = "0.21.5"; + sha256 = "1an0xk4hqma5hd5jq3m00l0f2kkh8mpg01ww488xsbh1976jm1dy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106590,6 +106923,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-source-gen_0_4_3_0" = callPackage + ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "ghc-source-gen"; + version = "0.4.3.0"; + sha256 = "1lhqsklibgiv51hs8mnrkn784rc5sxf5z8cfv8hf9jqlny50720f"; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ + base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Constructs Haskell syntax trees for the GHC API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-srcspan-plugin" = callPackage ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { @@ -106815,6 +107165,8 @@ self: { pname = "ghc-typelits-extra"; version = "0.4.3"; sha256 = "06g40q0n2d10c2zksx5rrjkvm5ywi3rh41hbiwy4zs28x9idsv18"; + revision = "1"; + editedCabalFile = "0m6z24zmi169zifz1jg4zri0izr5z37qx33c9mphy74vd6ds3zzz"; libraryHaskellDepends = [ base containers ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp @@ -107134,46 +107486,46 @@ self: { "ghcide" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, binary, bytestring, bytestring-encoding - , case-insensitive, containers, cryptohash-sha1, data-default - , deepseq, dependent-map, dependent-sum, Diff, directory, dlist - , exceptions, extra, filepath, fingertree, fuzzy, ghc, ghc-boot - , ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths - , ghc-trace-events, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-graph, hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types - , monoid-subclasses, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unliftio-core, unordered-containers, utf8-string, vector - , vector-algorithms, yaml + , base16-bytestring, binary, bytestring, case-insensitive + , containers, cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, exceptions, extra + , filepath, fingertree, focus, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens + , list-t, lsp, lsp-test, lsp-types, monoid-subclasses, mtl + , network-uri, opentelemetry, optparse-applicative, parallel + , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, random, record-dot-preprocessor + , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe + , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple + , stm, stm-containers, syb, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time + , transformers, unix, unliftio, unliftio-core, unordered-containers + , utf8-string, vector, vector-algorithms, yaml }: mkDerivation { pname = "ghcide"; - version = "1.5.0.1"; - sha256 = "0z6fq9p6wikcgacnqg8brq0bkphd14h7g5absw53ya047vgp02gc"; + version = "1.6.0.0"; + sha256 = "0clmpgkywzrgsnmawi5l1n2hgymrkyijpqkqc38xsgxf8nsvmh8c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async base base16-bytestring binary - bytestring bytestring-encoding case-insensitive containers - cryptohash-sha1 data-default deepseq dependent-map dependent-sum - Diff directory dlist exceptions extra filepath fingertree fuzzy ghc - ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths - ghc-trace-events Glob haddock-library hashable heapsize hie-bios - hie-compat hiedb hls-graph hls-plugin-api hslogger - implicit-hie-cradle lens lsp lsp-types monoid-subclasses mtl - network-uri opentelemetry optparse-applicative parallel - prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie + bytestring case-insensitive containers cryptohash-sha1 data-default + deepseq dependent-map dependent-sum Diff directory dlist exceptions + extra filepath fingertree focus fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + haddock-library hashable heapsize hie-bios hie-compat hiedb + hls-graph hls-plugin-api hslogger implicit-hie-cradle lens list-t + lsp lsp-types monoid-subclasses mtl network-uri opentelemetry + optparse-applicative parallel prettyprinter + prettyprinter-ansi-terminal random regex-tdfa retrie rope-utf16-splay safe safe-exceptions sorted-list sqlite-simple stm - syb text time transformers unix unliftio unliftio-core - unordered-containers utf8-string vector vector-algorithms + stm-containers syb text time transformers unix unliftio + unliftio-core unordered-containers utf8-string vector + vector-algorithms ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra @@ -107184,11 +107536,12 @@ self: { testHaskellDepends = [ aeson async base binary bytestring containers data-default directory extra filepath ghc ghc-typelits-knownnat haddock-library - hls-graph hls-plugin-api lens lsp lsp-test lsp-types network-uri - optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay - safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text unordered-containers + hls-graph hls-plugin-api lens list-t lsp lsp-test lsp-types + network-uri optparse-applicative process QuickCheck + quickcheck-instances random record-dot-preprocessor record-hasfield + regex-tdfa rope-utf16-splay safe safe-exceptions shake + sqlite-simple stm stm-containers tasty tasty-expected-failure + tasty-hunit tasty-quickcheck tasty-rerun text unordered-containers ]; testToolDepends = [ implicit-hie ]; benchmarkHaskellDepends = [ @@ -109974,8 +110327,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20211231"; - sha256 = "0cpa3rl8vcm0arima8x9m5q0a9r05z0851ibr1vcria2z0mmwmi7"; + version = "10.20220127"; + sha256 = "06s80fa91cnn2r5n6d52lqqp3hpc4ksag82razs7sj19iwixan2w"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -116073,10 +116426,8 @@ self: { }: mkDerivation { pname = "graph-trace-dot"; - version = "0.1.1.1"; - sha256 = "11hwxccy7yaz3mwixp1gjlpdfi9525ydqlbmpgyasg9ndg7dvl8i"; - revision = "1"; - editedCabalFile = "0caa9xcxwrqzqwsl76kmwv3fq9klsnm7wamrwjs8lrliyxcriwl6"; + version = "0.1.1.2"; + sha256 = "0wq6addzcigp21f5caljszzwcr8rhws49s93yr156c35nlcw98jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123133,8 +123484,8 @@ self: { }: mkDerivation { pname = "has-transformers"; - version = "0.1.0.3"; - sha256 = "0mrz11hxm7nyxyirfz8f63w1mxf3snprrxvh2vvhmmi8p3wlay6n"; + version = "0.1.0.4"; + sha256 = "1wm8dwgcg1m2104lzgk3vdvng5mvh4xcn736nyarb9q6p99i0bq3"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec operational ]; testToolDepends = [ hspec-discover ]; @@ -124839,29 +125190,31 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base , base16-bytestring, binary, bytestring, containers , cryptohash-sha1, data-default, deepseq, directory, extra - , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev, hashable - , hie-bios, hiedb, hls-brittany-plugin, hls-call-hierarchy-plugin - , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin - , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph - , hls-haddock-comments-plugin, hls-hlint-plugin - , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api - , hls-pragmas-plugin, hls-refine-imports-plugin, hls-retrie-plugin - , hls-splice-plugin, hls-stylish-haskell-plugin, hls-tactics-plugin - , hls-test-utils, hslogger, hspec-expectations, lens, lsp, lsp-test + , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, githash, gitrev + , hashable, hie-bios, hiedb, hls-alternate-number-format-plugin + , hls-brittany-plugin, hls-call-hierarchy-plugin, hls-class-plugin + , hls-eval-plugin, hls-explicit-imports-plugin, hls-floskell-plugin + , hls-fourmolu-plugin, hls-graph, hls-haddock-comments-plugin + , hls-hlint-plugin, hls-module-name-plugin, hls-ormolu-plugin + , hls-plugin-api, hls-pragmas-plugin + , hls-qualify-imported-names-plugin, hls-refine-imports-plugin + , hls-retrie-plugin, hls-selection-range-plugin, hls-splice-plugin + , hls-stylish-haskell-plugin, hls-tactics-plugin, hls-test-utils + , hslogger, hspec-expectations, lens, lens-aeson, lsp, lsp-test , lsp-types, mtl, optparse-applicative, optparse-simple, process - , regex-tdfa, safe-exceptions, sqlite-simple, temporary, text + , regex-tdfa, safe-exceptions, sqlite-simple, stm, temporary, text , transformers, unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.5.1.0"; - sha256 = "0aixq570sbrg9nnhaxlj8lv3k1dskbz53iwp5c1ljgrlmsz786ky"; + version = "1.6.1.0"; + sha256 = "1dc711b46kilb7dqr19m63hc20q2nzy5c6p5dzg3a4g5ixkaimwl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty async base base16-bytestring bytestring containers cryptohash-sha1 data-default directory extra filepath ghc ghcide - gitrev hie-bios hiedb hls-graph hls-plugin-api hslogger lsp + githash hie-bios hiedb hls-graph hls-plugin-api hslogger lsp optparse-applicative optparse-simple process safe-exceptions sqlite-simple text unordered-containers ]; @@ -124869,20 +125222,24 @@ self: { aeson async base base16-bytestring binary bytestring containers cryptohash-sha1 data-default deepseq directory extra filepath ghc ghc-boot-th ghc-paths ghcide gitrev hashable hie-bios hiedb - hls-brittany-plugin hls-call-hierarchy-plugin hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin hls-floskell-plugin - hls-fourmolu-plugin hls-graph hls-haddock-comments-plugin - hls-hlint-plugin hls-module-name-plugin hls-ormolu-plugin - hls-plugin-api hls-pragmas-plugin hls-refine-imports-plugin - hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin - hls-tactics-plugin hslogger lens lsp mtl optparse-applicative - optparse-simple process regex-tdfa safe-exceptions sqlite-simple - temporary text transformers unordered-containers + hls-alternate-number-format-plugin hls-brittany-plugin + hls-call-hierarchy-plugin hls-class-plugin hls-eval-plugin + hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin + hls-graph hls-haddock-comments-plugin hls-hlint-plugin + hls-module-name-plugin hls-ormolu-plugin hls-plugin-api + hls-pragmas-plugin hls-qualify-imported-names-plugin + hls-refine-imports-plugin hls-retrie-plugin + hls-selection-range-plugin hls-splice-plugin + hls-stylish-haskell-plugin hls-tactics-plugin hslogger lens lsp mtl + optparse-applicative optparse-simple process regex-tdfa + safe-exceptions sqlite-simple stm temporary text transformers + unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath ghcide hls-plugin-api hls-test-utils hspec-expectations - lens lsp-test lsp-types process text unordered-containers + lens lens-aeson lsp-test lsp-types process text + unordered-containers ]; testToolDepends = [ ghcide ]; description = "LSP server for GHC"; @@ -130667,8 +131024,8 @@ self: { pname = "hedgehog"; version = "1.0.5"; sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6"; - revision = "1"; - editedCabalFile = "0vqjjjvnbb601f6lwm90x80wb6rxhnvi4p8g04g15bfs3kxqw44z"; + revision = "2"; + editedCabalFile = "1p6vixwflgz2y1fc94kqxiv8s5jvq63xhp56cqwpw2s7d7g5chx1"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph monad-control @@ -130683,6 +131040,33 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "hedgehog_1_1_1" = callPackage + ({ mkDerivation, ansi-terminal, async, barbies, base, bytestring + , concurrent-output, containers, deepseq, directory, erf + , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show + , primitive, random, resourcet, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.1.1"; + sha256 = "1qx7bjcdgczvz5xhrqz25lray9rk3wrhzqfc5vpjnvgkzvnj3mny"; + libraryHaskellDepends = [ + ansi-terminal async barbies base bytestring concurrent-output + containers deepseq directory erf exceptions lifted-async mmorph + monad-control mtl pretty-show primitive random resourcet stm + template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show text transformers + ]; + description = "Release with confidence"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -130721,6 +131105,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.3"; sha256 = "1qanfnvciykm5hmiqyf0icn4xn16v6zvlfal98lphhcmym26m9x1"; + revision = "1"; + editedCabalFile = "0nq1qj1hmyihyvbj0l6hdbrpk8fjf2kn97abiap5v8hdvcnznhjy"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -130755,6 +131141,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "hedgehog-fakedata_0_0_1_5" = callPackage + ({ mkDerivation, base, containers, fakedata, hedgehog, random }: + mkDerivation { + pname = "hedgehog-fakedata"; + version = "0.0.1.5"; + sha256 = "00k26d83v0646klrg0k3cf94r4fnnx3ykxv7i8shjjgbkbzlzz78"; + libraryHaskellDepends = [ base fakedata hedgehog random ]; + testHaskellDepends = [ base containers fakedata hedgehog ]; + description = "Use 'fakedata' with 'hedgehog'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hedgehog-fn" = callPackage ({ mkDerivation, base, contravariant, hedgehog, transformers }: mkDerivation { @@ -130859,8 +131258,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; - revision = "1"; - editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh"; + revision = "2"; + editedCabalFile = "1n7icqychb94j7s8msmih3h573vf17pn1sq79nkqric3wwf74rdp"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = lib.licenses.bsd3; @@ -130918,23 +131317,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "hedis_0_15_0" = callPackage + "hedis_0_15_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit , mtl, network, network-uri, resource-pool, scanner, stm , test-framework, test-framework-hunit, text, time, tls - , unordered-containers, vector + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "hedis"; - version = "0.15.0"; - sha256 = "1wcsjvya9hnvgjl9vnimi3928fx2gy0glgdc30slfwnjpijs97n0"; - revision = "1"; - editedCabalFile = "0njy7nh5r935xb0za9r0hligqy0nzwlfnzlfqcvb1frkzxissydp"; + version = "0.15.1"; + sha256 = "1a09i21qmzjcx171452bm69cj188f1jha2gwj0yi7shimcqz3l8m"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm - text time tls unordered-containers vector + text time tls unliftio-core unordered-containers vector ]; testHaskellDepends = [ async base bytestring doctest HUnit mtl stm test-framework @@ -133881,8 +134278,8 @@ self: { }: mkDerivation { pname = "hie-compat"; - version = "0.2.1.0"; - sha256 = "0dl48y5ijr73dc1lrarvfz6bivxg42ll4y339saw1y5xmgw1c5w7"; + version = "0.2.1.1"; + sha256 = "054ll31b2j31a2yjcz7q7zxqyyszrkbaz4kzxhih4k84v9h0nhk6"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -133930,31 +134327,6 @@ self: { }) {}; "hiedb" = callPackage - ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base - , bytestring, containers, directory, extra, filepath, ghc - , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative - , process, sqlite-simple, temporary, terminal-size, text - }: - mkDerivation { - pname = "hiedb"; - version = "0.4.0.0"; - sha256 = "1frcl9mxmn97qc97l3kw21ksapyndn6jq7yfxxrr0fvzn7jji7wv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - algebraic-graphs ansi-terminal array base bytestring containers - directory extra filepath ghc hie-compat lucid mtl - optparse-applicative sqlite-simple terminal-size text - ]; - executableHaskellDepends = [ base ghc-paths ]; - testHaskellDepends = [ - base directory filepath ghc ghc-paths hspec process temporary - ]; - description = "Generates a references DB from .hie files"; - license = lib.licenses.bsd3; - }) {}; - - "hiedb_0_4_1_0" = callPackage ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base , bytestring, containers, directory, extra, filepath, ghc , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative @@ -133977,7 +134349,6 @@ self: { ]; description = "Generates a references DB from .hie files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hieraclus" = callPackage @@ -136611,19 +136982,41 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hls-alternate-number-format-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, filepath, ghc-boot-th + , ghcide, hie-compat, hls-graph, hls-plugin-api, hls-test-utils + , lens, lsp, mtl, QuickCheck, regex-tdfa, syb, tasty-quickcheck + , text, unordered-containers + }: + mkDerivation { + pname = "hls-alternate-number-format-plugin"; + version = "1.0.1.0"; + sha256 = "1xr4rizv1k6dx32mnny55s33cngmvy0a52sswpk17fl4zx3bd0pp"; + libraryHaskellDepends = [ + aeson base containers ghc-boot-th ghcide hie-compat hls-graph + hls-plugin-api lens lsp mtl regex-tdfa syb text + unordered-containers + ]; + testHaskellDepends = [ + base filepath hls-test-utils lsp QuickCheck regex-tdfa + tasty-quickcheck text + ]; + description = "Provide Alternate Number Formats plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hls-brittany-plugin" = callPackage - ({ mkDerivation, base, brittany, czipwith, extra, filepath, ghc + ({ mkDerivation, base, brittany, czipwith, extra, filepath , ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api , hls-test-utils, lens, lsp-types, text, transformers }: mkDerivation { pname = "hls-brittany-plugin"; - version = "1.0.1.1"; - sha256 = "09j40rh3nn5i8h8k5hpqy1vwjjmfma8n8lf59180ravia4pfddli"; + version = "1.0.2.0"; + sha256 = "0vxlhggmbrfmf81qgpxmrpsflmi32hafhy21dxain1as5hrnxw8g"; libraryHaskellDepends = [ - base brittany czipwith extra filepath ghc ghc-boot-th - ghc-exactprint ghcide hls-plugin-api lens lsp-types text - transformers + base brittany czipwith extra filepath ghc-boot-th ghc-exactprint + ghcide hls-plugin-api lens lsp-types text transformers ]; testHaskellDepends = [ base filepath hls-test-utils ]; description = "Integration with the Brittany code formatter"; @@ -136637,8 +137030,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "1.0.1.1"; - sha256 = "10faqaj4zhpl2aqlmqr8l96dij31x47vj2sfbpxhpcm5j3zxqwni"; + version = "1.0.2.0"; + sha256 = "0772kxdp6ww91a1b0c8lfxjlpvwr8smcf8ayvaxazw76hisxrrj5"; libraryHaskellDepends = [ aeson base bytestring containers extra ghc ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -136658,8 +137051,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.1.2"; - sha256 = "1ybg6dd3m8ynhkn80189nqc8ng2lfplk3xrq7cq4mdx4bgdnjbgq"; + version = "1.0.2.0"; + sha256 = "0drpxrazhwd228skgky7xdzcf22gi1pi2lby0dj0nzpzhrdl0pw0"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp text transformers @@ -136682,8 +137075,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.2.0.2"; - sha256 = "0nrlfs40hmbjjw6r01b3fcxwh01b4ap9v2ij6jyqrgkbs19qfp49"; + version = "1.2.1.0"; + sha256 = "18xjq664b8aj199gd1sswa7gndwikch77v3p1c36yshfa0rviwi8"; libraryHaskellDepends = [ aeson base containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-graph @@ -136725,8 +137118,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.1.2"; - sha256 = "12m0idqxx47ixyn6i03jzwp4z9xwnb5q0p0655ik03xhibwjja7d"; + version = "1.0.2.0"; + sha256 = "04v6sgzsjqk4qj586qzvfvq405z0zpc08xljxb12glmqghvi5xjg"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lsp text unordered-containers @@ -136742,8 +137135,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "1.0.0.2"; - sha256 = "0b9dil7sc334iv4kn1gbkvjg78pamlhrw12r6k2vsz57xkz1b7ls"; + version = "1.0.1.0"; + sha256 = "1slzv2c5lzxprh8yhfk8iabmmlhh3sx97m393nrnwrjcbpzq0vai"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; @@ -136758,8 +137151,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.0.1.2"; - sha256 = "1w7rnb18fn71aqzspq7wic0nd1qwh5r2vr9j2yiwvp95p42zxf0n"; + version = "1.0.2.0"; + sha256 = "0n9yk539wc046i6sx68gsbrc4jfmp1nsm2nir00q4sdcf7flcvff"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp text @@ -136771,19 +137164,19 @@ self: { "hls-graph" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , deepseq, directory, exceptions, extra, filepath, hashable - , js-dgtable, js-flot, js-jquery, primitive, time, transformers - , unordered-containers + , deepseq, directory, exceptions, extra, filepath, focus, hashable + , js-dgtable, js-flot, js-jquery, list-t, primitive, stm + , stm-containers, time, transformers, unordered-containers }: mkDerivation { pname = "hls-graph"; - version = "1.5.1.1"; - sha256 = "1ak6i03ch5xm6r4ym09k9vxfq7y5xwr9c6d84cgl8288g2i0fnpz"; + version = "1.6.0.0"; + sha256 = "0raz4gkfhxzbmg5rf65yp5p0i3mpd0rlraz90gwbvf5l1z9jlqml"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions - extra filepath hashable js-dgtable js-flot js-jquery primitive time - transformers unordered-containers + extra filepath focus hashable js-dgtable js-flot js-jquery list-t + primitive stm stm-containers time transformers unordered-containers ]; description = "Haskell Language Server internal graph API"; license = lib.licenses.asl20; @@ -136796,8 +137189,8 @@ self: { }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.0.4"; - sha256 = "0c4s10jmp5whi7k48llqs51vp22fav5ldzyxq1cv38ai1wqma3g8"; + version = "1.0.1.0"; + sha256 = "1jlz6vg5ff2j2vba4yg8nymxfs7vmg5h3kzjhsj6bs2jn8kh722r"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers @@ -136812,18 +137205,18 @@ self: { , containers, data-default, deepseq, Diff, directory, extra , filepath, ghc, ghc-exactprint, ghc-lib, ghc-lib-parser-ex, ghcide , hashable, hlint, hls-plugin-api, hls-test-utils, hslogger, lens - , lsp, lsp-types, regex-tdfa, temporary, text, transformers + , lsp, lsp-types, regex-tdfa, stm, temporary, text, transformers , unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.2.1"; - sha256 = "11a6gkz4af137zdg0m4bipjy2vn8bmarjd127sdrwli3vy7jzs3s"; + version = "1.0.3.0"; + sha256 = "0vzgsh6x8bjgi3l6nc9kfgbczxnd7fws5bmglac5khr0z042babb"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghc-lib ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api hslogger - lens lsp regex-tdfa temporary text transformers + lens lsp regex-tdfa stm temporary text transformers unordered-containers ]; testHaskellDepends = [ @@ -136841,8 +137234,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "1.0.0.3"; - sha256 = "0nymxfwvqalmwgv3a0a5a10vk8yi6k7r3gb1yyd0iz6vkz6k10p3"; + version = "1.0.1.0"; + sha256 = "108p9j01d2s14akbwgwmpwb2a5r5d14vqzy6lw8n5cymgfdlza4a"; libraryHaskellDepends = [ aeson base directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -136859,8 +137252,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "1.0.1.2"; - sha256 = "1kp63ydmczvjbwzkmxzd8m4fnm8yljzxraisa85sd7pagv2djh7q"; + version = "1.0.2.0"; + sha256 = "1jbh16z4yzl3lx9q7pcrkfrmip6rifif3rirfn7dvyj1q7cf1fk4"; libraryHaskellDepends = [ base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu text @@ -136872,37 +137265,41 @@ self: { "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, ghc, hashable - , hls-graph, hslogger, lens, lsp, opentelemetry - , optparse-applicative, process, regex-tdfa, text, unix + , dependent-map, dependent-sum, Diff, dlist, extra, ghc, hashable + , hls-graph, hslogger, lens, lens-aeson, lsp, lsp-types + , opentelemetry, optparse-applicative, process, regex-tdfa, tasty + , tasty-hunit, tasty-rerun, text, transformers, unix , unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.2.0.2"; - sha256 = "0mrfkqrkgvg53za026rfk6yqyyr1irk9k6k375dylaas7qlh0f0p"; + version = "1.3.0.0"; + sha256 = "0dkpamqgw2icx6zns79cpzsnsr33qg0i3ix66hvcl5fhhp363g9m"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist ghc hashable hls-graph hslogger lens lsp opentelemetry - optparse-applicative process regex-tdfa text unix - unordered-containers + dlist extra ghc hashable hls-graph hslogger lens lens-aeson lsp + opentelemetry optparse-applicative process regex-tdfa text + transformers unix unordered-containers + ]; + testHaskellDepends = [ + base lsp-types tasty tasty-hunit tasty-rerun ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; }) {}; "hls-pragmas-plugin" = callPackage - ({ mkDerivation, base, extra, filepath, fuzzy, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, text - , transformers, unordered-containers + ({ mkDerivation, base, containers, extra, filepath, fuzzy, ghc + , ghcide, hls-plugin-api, hls-test-utils, lens, lsp, lsp-types + , text, transformers, unordered-containers }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "1.0.1.1"; - sha256 = "1yy6avwff8swxrkhfcslckx6ql26w2chcv19z217s00y30z70xmq"; + version = "1.0.2.0"; + sha256 = "0bmifvjhcvwhivnx6s971nidjdb2ichphp70pahx72ai24ffqqx9"; libraryHaskellDepends = [ - base extra fuzzy ghcide hls-plugin-api lens lsp text transformers - unordered-containers + base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text + transformers unordered-containers ]; testHaskellDepends = [ base filepath hls-test-utils lens lsp-types text @@ -136911,6 +137308,24 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-qualify-imported-names-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, dlist, filepath + , ghc, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lsp, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hls-qualify-imported-names-plugin"; + version = "1.0.1.0"; + sha256 = "0h456cq3qvksrkzfzpq2qsabsl3vpg4gh2mwyxc39xh4qm7ifban"; + libraryHaskellDepends = [ + aeson base containers deepseq dlist ghc ghcide hls-graph + hls-plugin-api lsp text transformers unordered-containers + ]; + testHaskellDepends = [ base filepath hls-test-utils text ]; + description = "A Haskell Language Server plugin that qualifies imported names"; + license = lib.licenses.asl20; + }) {}; + "hls-refine-imports-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, filepath, ghc , ghcide, hls-explicit-imports-plugin, hls-graph, hls-plugin-api @@ -136918,8 +137333,8 @@ self: { }: mkDerivation { pname = "hls-refine-imports-plugin"; - version = "1.0.0.2"; - sha256 = "0spxczjf85z8zvkqyqrmwjacw9f44zminm8k8ygyn6b2wh9bzyqr"; + version = "1.0.1.0"; + sha256 = "10q5yjpny5aah245ivazqn2h05ak428qc9arpzlg5ks2n4n293lf"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text @@ -136954,23 +137369,45 @@ self: { }) {}; "hls-retrie-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie - , safe-exceptions, text, transformers, unordered-containers + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, extra, ghc, ghcide, hashable, hls-plugin-api, lsp + , lsp-types, retrie, safe-exceptions, stm, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.1.4"; - sha256 = "18ldvywi8zl08xfd1z4dhj84xhxa9kq0hdminv6d3xf470ghkrdv"; + version = "1.0.2.0"; + sha256 = "0w41di7rqy8xrcaavzlfhai73yw0whmnyqxhyfjwx93y1sy1l6zg"; libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - hls-plugin-api lsp lsp-types retrie safe-exceptions text - transformers unordered-containers + aeson base bytestring containers deepseq directory extra ghc ghcide + hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm + text transformers unordered-containers ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; + "hls-selection-range-plugin" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, extra + , filepath, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-test, mtl, semigroupoids, text, transformers + }: + mkDerivation { + pname = "hls-selection-range-plugin"; + version = "1.0.0.0"; + sha256 = "1pfgxz7nyqr8gaxxv7nc0d4rpfc4rbgdkafy1fpgcsbkqx9llkn0"; + libraryHaskellDepends = [ + aeson base containers extra ghcide hls-plugin-api lsp mtl + semigroupoids text transformers + ]; + testHaskellDepends = [ + base bytestring containers filepath hls-test-utils lens lsp + lsp-test text + ]; + description = "HLS Plugin to support smart selection range"; + license = lib.licenses.asl20; + }) {}; + "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, extra, filepath , foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api @@ -136979,8 +137416,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.6"; - sha256 = "0cnm0kaimbcyrjgphz61fhs9wg4wscv8bj9c09pxxwz6npf2r3wz"; + version = "1.0.1.0"; + sha256 = "07v4rgss140vfc4xqibccimm48ys4awz7yficr0wf440p6i83qdc"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie syb text transformers unliftio-core @@ -136998,8 +137435,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "1.0.0.4"; - sha256 = "0p6cqjslf9qnb2df6dvznyzily55mcs13f0kd0x64p8kf2chc6ic"; + version = "1.0.1.0"; + sha256 = "1f9g113xrb167cpdjifd2zp8ps1w2apvkghdiagc9rzw1fl0l7l4"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types stylish-haskell text @@ -137021,8 +137458,8 @@ self: { }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.5.0.1"; - sha256 = "1fji3m1dczswzsrvvsg00jflsq9h4jpgclyma91rcncdrl7j4ylz"; + version = "1.6.1.0"; + sha256 = "15ynxlafrs0hss5qcn4aj8iip8iy631hfgqql0irqskvf3x5yxlx"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide @@ -137049,8 +137486,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "1.1.0.2"; - sha256 = "1506438g4bzc05f8km5kcjq8hv1sk56bllbcnjkx3fdqdamr3piv"; + version = "1.2.0.0"; + sha256 = "1y3g101n7z78f5shfqfklg5zgl8gpkic0dwvpr5072dq1vvpfdvf"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api hspec @@ -138122,6 +138559,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hoauth2_2_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, exceptions + , hashable, http-conduit, http-types, microlens, text + , unordered-containers, uri-bytestring, uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "2.0.0"; + sha256 = "1052ibfliwjg6p0r9y32i5j25dankp2zcy9hjm6sxag0wjgqz3wb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring exceptions hashable http-conduit + http-types microlens text unordered-containers uri-bytestring + uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -140977,6 +141435,7 @@ self: { ]; description = "A Riemann Client for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hruby" = callPackage @@ -141642,6 +142101,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-instrumentation-persistent" = callPackage + ({ mkDerivation, base, hs-opentelemetry-api, mtl, persistent + , resourcet, text, unliftio, vault + }: + mkDerivation { + pname = "hs-opentelemetry-instrumentation-persistent"; + version = "0.0.1.0"; + sha256 = "0windpdg269g376mhza26swsvl32pfsfzqjrd9psybp9mdsw1lwq"; + libraryHaskellDepends = [ + base hs-opentelemetry-api mtl persistent resourcet text unliftio + vault + ]; + testHaskellDepends = [ + base hs-opentelemetry-api mtl persistent resourcet text unliftio + vault + ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hs-opentelemetry-instrumentation-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, hs-opentelemetry-api, iproute , network, postgresql-libpq, postgresql-simple, text, unliftio @@ -144051,7 +144531,7 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_2_0_1" = callPackage + "hslua_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-classes, hslua-core, hslua-marshalling , hslua-objectorientation, hslua-packaging, mtl, tasty, tasty-hslua @@ -144059,8 +144539,8 @@ self: { }: mkDerivation { pname = "hslua"; - version = "2.0.1"; - sha256 = "1qbxd2bsi7yybawjvisbkbqb6kl0jvlir53p37jq0ya1pqr5y9z0"; + version = "2.1.0"; + sha256 = "0adii64aaq20dmsxkrac8smgwa9vm1ld1rpzz3m33vyyp1yfsjka"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-classes hslua-core hslua-marshalling hslua-objectorientation hslua-packaging mtl text @@ -144096,27 +144576,26 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-aeson_2_0_1" = callPackage + "hslua-aeson_2_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable - , hslua-core, hslua-marshalling, ieee754, mtl, QuickCheck - , quickcheck-instances, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector + , hslua-core, hslua-marshalling, mtl, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-quickcheck, text + , unordered-containers, vector }: mkDerivation { pname = "hslua-aeson"; - version = "2.0.1"; - sha256 = "17j5gz8pjysq1dgvfqdzbcg3x7nrianzv707rrhj578661hg8h5h"; + version = "2.1.0"; + sha256 = "0x966djzb9blrs586407qx6lz8bh23s048jv9nbgzy99qwxm20db"; libraryHaskellDepends = [ aeson base bytestring containers hashable hslua-core hslua-marshalling mtl scientific text unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers hashable hslua-core - hslua-marshalling ieee754 mtl QuickCheck quickcheck-instances - scientific tasty tasty-hunit tasty-quickcheck text - unordered-containers vector + hslua-marshalling mtl QuickCheck quickcheck-instances scientific + tasty tasty-quickcheck text unordered-containers vector ]; - description = "Allow aeson data types to be used with lua"; + description = "Allow aeson data types to be used with Lua"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -144129,8 +144608,8 @@ self: { }: mkDerivation { pname = "hslua-classes"; - version = "2.0.0"; - sha256 = "1vnck29395dc4rcyr082vxyf8pz5llz73rpvkl3sq8029pj9jwsl"; + version = "2.1.0"; + sha256 = "0gz30ppa7fjm555mxmwfjq767wn6z60jkw36sdmryrby1raspz4s"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-core hslua-marshalling text @@ -144151,8 +144630,8 @@ self: { }: mkDerivation { pname = "hslua-core"; - version = "2.0.0.2"; - sha256 = "0hbabk6q3lfkj82v11aicnq52bibn8xnapmws8g639fnbslp66id"; + version = "2.1.0"; + sha256 = "1iaii879b13j8a8lgv78wja85ik2y5xlkv1mzckjl4nqn91968wq"; libraryHaskellDepends = [ base bytestring exceptions lua mtl text ]; @@ -144170,8 +144649,8 @@ self: { }: mkDerivation { pname = "hslua-examples"; - version = "2.0.0"; - sha256 = "12wkhs83yrragwfrgl7xdgzs4bgm3zawrkxkh16dxn619brh7n8z"; + version = "2.0.1"; + sha256 = "0llh0cq1qzy4yl03vmvyipjq83apfx5f01qnbs84a2dad9nd8bm7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144190,8 +144669,8 @@ self: { }: mkDerivation { pname = "hslua-marshalling"; - version = "2.0.1"; - sha256 = "1s64cpy220wnjb2s2y8v96jn3dqids7wny3hwmb35pjyffaykrwl"; + version = "2.1.0"; + sha256 = "0rp2bbk3smmx223c8x781311s29c0dhk0c5z3p8z1vxr3m3lhz1c"; libraryHaskellDepends = [ base bytestring containers hslua-core mtl text ]; @@ -144220,14 +144699,14 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-doclayout_1_0_0" = callPackage + "hslua-module-doclayout_1_0_1" = callPackage ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit , tasty-lua, text }: mkDerivation { pname = "hslua-module-doclayout"; - version = "1.0.0"; - sha256 = "1lzyb23bg0rjxlhz7q08r30yaqbx0h74869l212bimzq2df3fvmq"; + version = "1.0.1"; + sha256 = "05k4cpi3mpm9gialy0m8by808xl8nc6ccjwfqhh1sp4xm46zp0px"; libraryHaskellDepends = [ base doclayout hslua text ]; testHaskellDepends = [ base doclayout hslua tasty tasty-hunit tasty-lua @@ -144253,19 +144732,21 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-path_1_0_0" = callPackage - ({ mkDerivation, base, filepath, hslua, hslua-marshalling + "hslua-module-path_1_0_1" = callPackage + ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "hslua-module-path"; - version = "1.0.0"; - sha256 = "1yhalkvz2pyhv6fw1a5sd1a4zcd3qarrcbhfk6z80wh1j23cabzg"; + version = "1.0.1"; + sha256 = "1ffqfkyk4nqvk03mrdp5bz6miq0d06d1nwdklpchs55n6s95wl6x"; + revision = "1"; + editedCabalFile = "110bdz2pwnvcsnq1vlm17x91mdqfif839qgji2gjzddcj9q5pbqa"; libraryHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging text + base filepath hslua-core hslua-marshalling hslua-packaging text ]; testHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging tasty + base filepath hslua-core hslua-marshalling hslua-packaging tasty tasty-hunit tasty-lua text ]; description = "Lua module to work with file paths"; @@ -144291,15 +144772,17 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-system_1_0_0" = callPackage + "hslua-module-system_1_0_1" = callPackage ({ mkDerivation, base, directory, exceptions, hslua-core , hslua-marshalling, hslua-packaging, tasty, tasty-hunit, tasty-lua , temporary, text }: mkDerivation { pname = "hslua-module-system"; - version = "1.0.0"; - sha256 = "1qvc2200mi1pqckjhav3d488nc4bfh1qv4mgaqx35njda8an6l9q"; + version = "1.0.1"; + sha256 = "0mbp7yh1m167fpsvscpa1mhpdi9h2xpwghr2bxl6swg8ab4s2lzw"; + revision = "1"; + editedCabalFile = "14ixzwii8y1mab6z9c20w4p3q4in3zknffmarr02gmgl1ksrl2cw"; libraryHaskellDepends = [ base directory exceptions hslua-core hslua-marshalling hslua-packaging temporary text @@ -144330,14 +144813,16 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-text_1_0_0" = callPackage + "hslua-module-text_1_0_1" = callPackage ({ mkDerivation, base, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "hslua-module-text"; - version = "1.0.0"; - sha256 = "0ymmca9nmxhwghyrbs08g0d0k49zby5rrvqjzxz332yh2nvi2fg1"; + version = "1.0.1"; + sha256 = "0p6fw5vx77999yfbc2i77x5mnlxgi7bgwhx23017q5zbvs09c739"; + revision = "1"; + editedCabalFile = "18zvaqzdphqisisvpffpkwkms7mh556zxxbwp2n2h1bv2s8f0x5s"; libraryHaskellDepends = [ base hslua-core hslua-marshalling hslua-packaging text ]; @@ -144350,18 +144835,20 @@ self: { }) {}; "hslua-module-version" = callPackage - ({ mkDerivation, base, filepath, hslua, hslua-marshalling + ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "hslua-module-version"; - version = "1.0.0"; - sha256 = "1kbk0iva5g4garpx0d5l1gr6zlcfi565mscqr602dr88as87nfyn"; + version = "1.0.1"; + sha256 = "125kpfypq5hync80f1g1w618xrfqvi5bsqks9pg2rq1d57qxk5yc"; + revision = "1"; + editedCabalFile = "0gl9gn1pkpa3cg0sx971q45hj23kq9czcswli9yaz0mij5wqyh57"; libraryHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging text + base filepath hslua-core hslua-marshalling hslua-packaging text ]; testHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging tasty + base filepath hslua-core hslua-marshalling hslua-packaging tasty tasty-hunit tasty-lua text ]; description = "Lua module to work with version specifiers"; @@ -144378,8 +144865,8 @@ self: { }: mkDerivation { pname = "hslua-objectorientation"; - version = "2.0.1"; - sha256 = "15bz27fkfqbmqrqd0vv8z4a0yjby0s8mrkijp9d54ji9f5cbjbwd"; + version = "2.1.0"; + sha256 = "01ghqsaknl4b8l3f6src8q7b54r5crmja62mhfwhz8a35px3rzrx"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-core hslua-marshalling mtl text @@ -144400,8 +144887,8 @@ self: { }: mkDerivation { pname = "hslua-packaging"; - version = "2.0.0"; - sha256 = "0zb9cdbrsqs882r56vbxi9v6r34kqhacb4dwm85j5yhdmpdy0p7d"; + version = "2.1.0"; + sha256 = "0n8vhfi59q6dzcvi4fgsjp8w0slbl8l2s5l6rxgypb6vqgm759l9"; libraryHaskellDepends = [ base containers hslua-core hslua-marshalling hslua-objectorientation mtl text @@ -148522,6 +149009,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_3_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filepath, gauge, Glob, heaps, hspec + , hspec-discover, http-types, mwc-random, network + , network-byte-order, network-run, psqueues, stm, text + , time-manager, typed-process, unix-time, unordered-containers + , vector + }: + mkDerivation { + pname = "http2"; + version = "3.0.3"; + sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring + cryptonite directory filepath Glob hspec http-types network + network-byte-order network-run text typed-process + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -151760,6 +152282,17 @@ self: { broken = true; }) {}; + "hypergeometric" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hypergeometric"; + version = "0.1.0.0"; + sha256 = "0fpwn13bmx750k6ch79aa2alh2dhc2sjdj95272knhc3khp9zxi9"; + libraryHaskellDepends = [ base ]; + description = "Hypergeometric functions"; + license = lib.licenses.agpl3Only; + }) {}; + "hyperion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, clock , containers, deepseq, directory, exceptions, filepath @@ -151841,6 +152374,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hyperscript" = callPackage + ({ mkDerivation, base, megaparsec, text }: + mkDerivation { + pname = "hyperscript"; + version = "0.1.0.1"; + sha256 = "01rhw8i34j600x6i31z53ab4gzbdqry9src37vq51w2wk64ll7lb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base megaparsec text ]; + executableHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base megaparsec text ]; + description = "A parser for the _hyperscript programming language"; + license = lib.licenses.bsd3; + }) {}; + "hypertypes" = callPackage ({ mkDerivation, array, base, base-compat, binary, constraints , containers, criterion, deepseq, generic-constraints, generic-data @@ -154718,8 +155266,7 @@ self: { description = "Convenient imperative eDSL over Lorentz"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {cleveland = null;}; + }) {}; "inf-interval" = callPackage ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }: @@ -156922,7 +157469,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ip-quoter" = callPackage @@ -157253,6 +157799,8 @@ self: { pname = "ipynb"; version = "0.2"; sha256 = "1iwia4sxg40m4d290gys72wabqmkqx24ywsaranwzk2wx5s3sx4s"; + revision = "1"; + editedCabalFile = "0fl9x5amq0g5dg57dcgc0g4ir0r1fdbx06aldsqdwzdc9zs97v6k"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers text unordered-containers @@ -158790,26 +159338,30 @@ self: { }) {}; "jacinda" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, happy - , microlens, microlens-mtl, mtl, optparse-applicative - , prettyprinter, recursion, regex-rure, tasty, tasty-hunit, text + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, deepseq, directory, filepath, happy, microlens + , microlens-mtl, mtl, optparse-applicative, prettyprinter + , recursion, regex-rure, split, tasty, tasty-hunit, text , transformers, vector }: mkDerivation { pname = "jacinda"; - version = "0.2.1.0"; - sha256 = "0p7ng81dfilj277lq6sy6xb89jd8a0kr20wcndsqjg7pgp4rxpy2"; + version = "0.3.0.0"; + sha256 = "16m9gqswwqm66w1wynrivis51vhr6xh40gv12z6nf5w2dry8kljx"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring containers microlens microlens-mtl mtl - prettyprinter recursion regex-rure text transformers vector + array base bytestring containers directory filepath microlens + microlens-mtl mtl prettyprinter recursion regex-rure split text + transformers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring optparse-applicative ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; @@ -162823,6 +163375,8 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kbq-gu" = callPackage @@ -164365,8 +164919,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.6.1"; - sha256 = "1l2w0dcy4fcv865z27661j7jmfy3blf8q321mv18dn44f3wr0xax"; + version = "0.7"; + sha256 = "1gyg76fajs7qc7mr86i0hiz5m4a0y2lqmqk67cb0glgbg53z47b7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164641,20 +165195,15 @@ self: { }) {egl = null; inherit (pkgs) glew;}; "ktx-codec" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, shower, text, vector + ({ mkDerivation, base, binary, bytestring, containers, text, vector }: mkDerivation { pname = "ktx-codec"; - version = "0.0.1.3"; - sha256 = "0mm6lf8fm8zmi33s4zg8c3ar42aghdqmb3g7hv6qpcm1vc5krld4"; + version = "0.0.1.4"; + sha256 = "1n9vh7la5c359nczlla7jpf6qwbs6dx7n3fd9bnb4s2i6fpb5k0a"; libraryHaskellDepends = [ base binary bytestring containers text vector ]; - testHaskellDepends = [ - base binary bytestring containers directory filepath shower text - vector - ]; description = "Khronos texture format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -175898,8 +176447,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.13.1"; - sha256 = "1cg2y15nz193s1mwm0c6x1z8nmdwv9n8qljl1a2irh3z3nb33sd2"; + version = "0.13.2"; + sha256 = "1kb611xj1rl8jbx3bibcqdklv8kls3xkis77vix2vdf6y6fhjhfr"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley @@ -176067,8 +176616,8 @@ self: { ({ mkDerivation, base, lua, tasty, tasty-hunit }: mkDerivation { pname = "lpeg"; - version = "1.0.1"; - sha256 = "0zhg7d85s6rx1dh3mndpjjy3k8b5ixyz28wl6i8zvn2mxyx40y98"; + version = "1.0.2"; + sha256 = "0b1khwgmvlnvan6vp46mlvhzdrhawl5s1v971bm660aq0q8jjv1k"; libraryHaskellDepends = [ base lua ]; testHaskellDepends = [ base lua tasty tasty-hunit ]; description = "LPeg – Parsing Expression Grammars For Lua"; @@ -176205,39 +176754,6 @@ self: { license = lib.licenses.mit; }) {}; - "lsp_1_2_0_1" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, dependent-map, exceptions, filepath - , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl - , network-uri, QuickCheck, quickcheck-instances, random - , rope-utf16-splay, scientific, sorted-list, stm, text, time - , transformers, unliftio-core, unordered-containers, uuid - }: - mkDerivation { - pname = "lsp"; - version = "1.2.0.1"; - sha256 = "1bdgbxakdyhkrddj58f0al2wrx1mckp6hia7hk2wqjix20my8v49"; - revision = "1"; - editedCabalFile = "193y4b3l6agm83ng2c0ngvd0j9a71q237g9i5v57p502lhzfaag2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - dependent-map exceptions hashable hslogger lens lsp-types mtl - network-uri random scientific sorted-list stm text time - transformers unliftio-core unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base containers filepath hspec lens network-uri QuickCheck - quickcheck-instances rope-utf16-splay sorted-list text - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp_1_4_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, exceptions, filepath, hashable @@ -176296,34 +176812,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_14_0_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, extra, filepath, Glob, hspec, lens, lsp - , lsp-types, mtl, parser-combinators, process, some, text, time - , transformers, unix, unliftio, unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.14.0.1"; - sha256 = "0fr1812dnzv9hljb77khspaz666wqr6m1gj963v0z2j6xgvw2ipy"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath Glob - lens lsp-types mtl parser-combinators process some text time - transformers unix unordered-containers - ]; - testHaskellDepends = [ - aeson async base data-default directory filepath hspec lens lsp mtl - parser-combinators process text unliftio unordered-containers - ]; - testToolDepends = [ lsp ]; - benchmarkHaskellDepends = [ base extra lsp process ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp-test_0_14_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -176375,30 +176863,6 @@ self: { license = lib.licenses.mit; }) {}; - "lsp-types_1_3_0_1" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum, dependent-sum-template - , Diff, directory, dlist, filepath, hashable, hslogger, lens, mtl - , network-uri, rope-utf16-splay, scientific, some, template-haskell - , temporary, text, unordered-containers - }: - mkDerivation { - pname = "lsp-types"; - version = "1.3.0.1"; - sha256 = "05zgd99y7xnxnydisq5x24n1af2isar172p247hb5q0mp12hdd3z"; - revision = "1"; - editedCabalFile = "031b69fxi8m4fcwwgqb7cf4k806ikkmjqnn3wv6bn3sny1hn5gg7"; - libraryHaskellDepends = [ - aeson base binary bytestring containers data-default deepseq - dependent-sum dependent-sum-template Diff directory dlist filepath - hashable hslogger lens mtl network-uri rope-utf16-splay scientific - some template-haskell temporary text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp-types_1_4_0_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, Diff, directory, dlist, filepath, hashable @@ -176570,8 +177034,8 @@ self: { ({ mkDerivation, base, lua5_3, tasty, tasty-hunit }: mkDerivation { pname = "lua"; - version = "2.0.2"; - sha256 = "0hsbwws16p9xrpmx4j8f9hmz8lhjjz9b8ngb3y7pxi6lx08mypgw"; + version = "2.1.0"; + sha256 = "00fcx1by3b2bjb3sc86azr3gmy9jd1b0gilbz48pkbb7cw4p5z1c"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ lua5_3 ]; @@ -176586,6 +177050,8 @@ self: { pname = "lua-arbitrary"; version = "1.0.0"; sha256 = "13kfpiyln1i3d1a47fpf00lrcj4m9dyg80zrqclx7wzy9p8ixh7l"; + revision = "1"; + editedCabalFile = "19cc5vn27izx5cnpq1xj915ax16czvxaarvigggwi73cgk11hbf1"; libraryHaskellDepends = [ base lua QuickCheck ]; description = "Arbitrary instances for Lua types"; license = lib.licenses.mit; @@ -176742,12 +177208,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid-alpine_0_1_0_5" = callPackage + "lucid-alpine_0_1_0_7" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { pname = "lucid-alpine"; - version = "0.1.0.5"; - sha256 = "1prcr3rfpg3saybfjmfik9xznj0knvfxy5dwllkq6s5szi2bqyaz"; + version = "0.1.0.7"; + sha256 = "1p6cmjxbin7wj3b3cbg15gv43mcfqzm791swmhcwx0x41x41jygx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lucid text ]; @@ -176825,12 +177291,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid-htmx_0_1_0_4" = callPackage + "lucid-htmx_0_1_0_5" = callPackage ({ mkDerivation, base, lucid, servant, text }: mkDerivation { pname = "lucid-htmx"; - version = "0.1.0.4"; - sha256 = "0rq25ixsyvnp3zh3wsfmijlyv4dg94d1k1bhhwq8y624v819yg8r"; + version = "0.1.0.5"; + sha256 = "1zbk1fdril0cm4cs5scrvk1fvfkds8pgkwnb5c9vxawv5v3kgpl5"; libraryHaskellDepends = [ base lucid servant text ]; testHaskellDepends = [ base lucid servant text ]; description = "Use htmx in your lucid templates"; @@ -176838,6 +177304,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lucid-hyperscript" = callPackage + ({ mkDerivation, base, lucid, template-haskell, text }: + mkDerivation { + pname = "lucid-hyperscript"; + version = "0.1.0.2"; + sha256 = "1gf6q1ckxpswd550dgr8nr6ghd5hv0iz73scab2rgiv7fsjchcnl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base lucid template-haskell text ]; + executableHaskellDepends = [ base lucid template-haskell text ]; + testHaskellDepends = [ base lucid template-haskell text ]; + description = "Use _hyperscript with lucid"; + license = lib.licenses.bsd3; + }) {}; + "lucid-svg" = callPackage ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { @@ -177320,8 +177801,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "1.0.7.1"; - sha256 = "18y6diahfvqvv3qp6ch1jbi9jwz6li4xm1y1c5pi2895h4c51ljf"; + version = "1.0.7.2"; + sha256 = "00hjq15jc94bf3lgzh33w7ksf3daw2l7x1qljn11lbr48a8a2zmi"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -177332,6 +177813,8 @@ self: { ]; description = "lzlib bindings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lzma" = callPackage @@ -178873,8 +179356,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.5.0"; - sha256 = "1zq7kfs513zh7v5y4hafh5d6ly4jhmxsl3rfjavh2faw4i19fy3n"; + version = "0.5.6.0"; + sha256 = "1p58c83dqbpsl0a41s6xnnwbygk04gmsg51gfqprjkvzbgl2h7zq"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -179411,7 +179894,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -182064,6 +182546,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "memory-hexstring" = callPackage + ({ mkDerivation, aeson, base, bytestring, memory, scale + , template-haskell, text + }: + mkDerivation { + pname = "memory-hexstring"; + version = "1.0.0.0"; + sha256 = "1sm7jj75mv8p7f33h619zm10xbzyjg1jds87cg36mrj8hfb32q48"; + libraryHaskellDepends = [ + aeson base bytestring memory scale template-haskell text + ]; + description = "Hex-string type for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -188311,8 +188808,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.16.1"; - sha256 = "0kb4v5fwlxy80swqvjbrdc2qafiqrzw5zhihfjz4hc3vp5pcfizs"; + version = "1.16.2"; + sha256 = "1b236yp37pahx3njn0cwdbnkr7yj62ckhfsicgm2crb4l6sjkyas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188336,6 +188833,50 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "morley-client" = callPackage + ({ mkDerivation, aeson, aeson-casing, base-noprelude, binary + , bytestring, co-log, co-log-core, colourista, constraints + , containers, data-default, exceptions, fmt, hex-text + , hspec-expectations, http-client, http-client-tls, http-types + , HUnit, lens, lorentz, megaparsec, memory, morley, morley-prelude + , mtl, named, optparse-applicative, process, random + , safe-exceptions, scientific, servant, servant-client + , servant-client-core, singletons, syb, tasty, tasty-ant-xml + , tasty-discover, tasty-hunit-compat, template-haskell, text + , th-reify-many, time, universum, unliftio, vector + }: + mkDerivation { + pname = "morley-client"; + version = "0.1.0"; + sha256 = "1xhmksv745dvf8axbihbdn9r9402na381czckab844whkdmnag0y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base-noprelude binary bytestring co-log + co-log-core colourista constraints containers data-default fmt + hex-text http-client http-client-tls http-types lens lorentz + megaparsec memory morley morley-prelude mtl named + optparse-applicative process random safe-exceptions scientific + servant servant-client servant-client-core singletons syb + template-haskell text th-reify-many time universum unliftio vector + ]; + executableHaskellDepends = [ + aeson base-noprelude data-default fmt morley morley-prelude + optparse-applicative safe-exceptions + ]; + testHaskellDepends = [ + aeson base-noprelude bytestring co-log co-log-core containers + exceptions fmt hex-text hspec-expectations http-types HUnit lens + lorentz memory morley morley-prelude safe-exceptions + servant-client-core singletons syb tasty tasty-ant-xml + tasty-hunit-compat template-haskell time + ]; + testToolDepends = [ tasty-discover ]; + description = "Client to interact with the Tezos blockchain"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morley-prelude" = callPackage ({ mkDerivation, base-noprelude, int-cast, lens, universum }: mkDerivation { @@ -188377,8 +188918,7 @@ self: { description = "Upgradeability infrastructure based on Morley"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {cleveland = null; morley-client = null;}; + }) {}; "morloc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory @@ -189386,7 +189926,6 @@ self: { testHaskellDepends = [ base hspec ip text ]; description = "Datastructures to describe TCP and MPTCP connections"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "mptcp-pm" = callPackage @@ -191152,6 +191691,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "multistate_0_8_0_4" = callPackage + ({ mkDerivation, base, hspec, monad-control, mtl, tagged + , transformers, transformers-base + }: + mkDerivation { + pname = "multistate"; + version = "0.8.0.4"; + sha256 = "0y42c21ha0chqhrn40a4bikdbirsw7aqg4i866frpagz1ivr915q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base monad-control mtl tagged transformers transformers-base + ]; + testHaskellDepends = [ base hspec transformers ]; + description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "multivariant" = callPackage ({ mkDerivation, base, containers, free, HUnit, invertible , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty @@ -191716,6 +192274,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "mustache_2_4_0" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, filepath, hspec, lens, mtl + , parsec, process, scientific, tar, template-haskell, temporary + , text, th-lift, unordered-containers, vector, wreq, yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.4.0"; + sha256 = "0g7bwfc1yx59lk2l12wbh67ydk4rnwam2kv6ypc85qxd0pjbcd4n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath mtl parsec + scientific template-haskell text th-lift unordered-containers + vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + description = "A mustache template parser library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -195079,6 +195666,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-info_0_2_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "network-info"; + version = "0.2.1"; + sha256 = "015lm3b8n8sb16qsffjxz1jvijyy0z600ch0sm8h6a685wqqhbcv"; + libraryHaskellDepends = [ base ]; + description = "Access the local computer's basic network configuration"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-interfacerequest" = callPackage ({ mkDerivation, base, bytestring, ioctl, network }: mkDerivation { @@ -199181,7 +199780,7 @@ self: { license = lib.licenses.asl20; }) {}; - "nvim-hs_2_1_0_7" = callPackage + "nvim-hs_2_2_0_0" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit , containers, data-default, deepseq, foreign-store, hslogger, hspec , hspec-discover, HUnit, megaparsec, messagepack, mtl, network @@ -199194,8 +199793,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.1.0.7"; - sha256 = "0vbqlrjwfg5pl4f9xymdlx0k01jziqrmqf8m0vm7iiy0vnjzx19j"; + version = "2.2.0.0"; + sha256 = "196szwcd156029hsg0ql3m4zphz3hnz09yic3037hj12yp87fdzf"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -200721,7 +201320,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_8_0_1" = callPackage + "opaleye_0_9_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -200731,8 +201330,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.8.0.1"; - sha256 = "1py950js9k80manm3xj1sfls0xnw1kd609hw268wr9izd0syfva4"; + version = "0.9.0.0"; + sha256 = "0i2ncvgx7pdq4q7i1fxnpxya3jb9jnzz7d6hcd5s0lrc2flv6rxd"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -200829,8 +201428,8 @@ self: { }: mkDerivation { pname = "opc-xml-da-client"; - version = "0.1"; - sha256 = "0wi2qv4594fz3z6jqdmqnxv17w1yp5ds8xwflnxawb6lpadprskp"; + version = "0.1.1"; + sha256 = "15mc3i7j2pjxd7gw7ba8nlvkbp8j161vphbsg3iqbjqaqivfzivl"; libraryHaskellDepends = [ acc attoparsec attoparsec-data base base64 bytestring containers data-default domain domain-optics hashable hashable-time @@ -204661,7 +205260,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "pandoc_2_17_0_1" = callPackage + "pandoc_2_17_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -204681,8 +205280,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.17.0.1"; - sha256 = "1xh5vwwnwwrxdkqm72qcd67hc0a1ffhkki1f1ls9bm1mhgq6fr17"; + version = "2.17.1.1"; + sha256 = "1l8spmsyg2c5j16q7a7fd5i6kcvkyipq4jrhrv2k0ca1s4lcb7k4"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -205029,8 +205628,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.1.3.1"; - sha256 = "04q433gpqkydyy2gx6jhyvv7lahx186b1d90clkggach1x0rg8ii"; + version = "0.1.4"; + sha256 = "09l601d50h4ymnfcspwf1sl6hks8skvd1wpb9j3y2znyciq2pdkq"; libraryHaskellDepends = [ base bytestring containers exceptions hslua hslua-marshalling lua pandoc-types safe text @@ -208547,15 +209146,15 @@ self: { license = lib.licenses.asl20; }) {}; - "pcre2_2_0_4" = callPackage + "pcre2_2_0_5" = callPackage ({ mkDerivation, base, containers, criterion, hspec, microlens , microlens-platform, mtl, pcre-light, regex-pcre-builtin , template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "2.0.4"; - sha256 = "15zbwsv4kic58znngw1ff8vxqjqqglsds9xnn1s4f9hnzd87vwx2"; + version = "2.0.5"; + sha256 = "11rggirpd02rx9xyfd1yigglzyqzn8vx0knszgrbbvj0cmzb20fn"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -209830,6 +210429,43 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "persistent_2_13_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, criterion, deepseq + , fast-logger, file-embed, hspec, http-api-data, lift-type + , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances + , resource-pool, resourcet, scientific, shakespeare, silently + , template-haskell, text, th-lift-instances, time, transformers + , unliftio, unliftio-core, unordered-containers, vault, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.13.3.0"; + sha256 = "059y0wyd74rb0aa32b54vj9n0g5pz9nfcbx2h3iil2qbgjvzvw9w"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vault vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data monad-logger mtl + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq file-embed template-haskell text + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -210014,6 +210650,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-lens" = callPackage + ({ mkDerivation, base, lens, persistent }: + mkDerivation { + pname = "persistent-lens"; + version = "1.0.0"; + sha256 = "1pmk79m3p71sbcnzz27ji7305v4s8pbqghphl6nmkviswdy430xl"; + libraryHaskellDepends = [ base lens persistent ]; + description = "lens helpers for persistent"; + license = lib.licenses.mit; + }) {}; + "persistent-map" = callPackage ({ mkDerivation, base, binary, containers, directory, EdisonAPI , EdisonCore, filepath, LRU, mtl, stm-io-hooks @@ -210162,6 +210809,33 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-mysql_2_13_1_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.13.1.0"; + sha256 = "16balbklf4800pqivmvnamjhy3xvnr9939fz3qkicfs4ba68m62k"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers fast-logger hspec + http-api-data HUnit monad-logger mysql path-pieces persistent + persistent-qq persistent-test QuickCheck quickcheck-instances + resourcet text time transformers unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -210284,6 +210958,40 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_13_4_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vault, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.4.0"; + sha256 = "1hvk7fvknq27nfpyv32b7062cs4c3h2s62ssr133abq78ymcfcll"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core vault + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-postgresql-streaming" = callPackage ({ mkDerivation, base, conduit, monad-logger, mtl, persistent , persistent-postgresql, postgresql-simple, resourcet, text @@ -210469,6 +211177,39 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_13_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.13.1.0"; + sha256 = "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + mtl persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions fast-logger hspec + HUnit microlens monad-logger mtl persistent persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -210527,6 +211268,30 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-test_2_13_1_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, http-api-data + , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent + , QuickCheck, quickcheck-instances, random, resourcet, text, time + , transformers, transformers-base, unliftio, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-test"; + version = "2.13.1.0"; + sha256 = "1ccv9rrnjngwf8av3zyq28myd1iyb6831nnqjpllwlyrpgnmafvr"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations http-api-data HUnit monad-control + monad-logger mtl path-pieces persistent QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers + ]; + description = "Tests for Persistent"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-typed-db" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec , hspec-discover, http-api-data, monad-logger, path-pieces @@ -211439,8 +212204,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.16.2.2"; - sha256 = "0s8n0nds142nlp2p9h9i78i31822akyyd0zm38hfc4ygkhpgzpkm"; + version = "0.16.3.0"; + sha256 = "12hqxk3fga9k6xw8wns834n12wcpmxki2cbyq03jgz22n00css0f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211476,8 +212241,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.4.1.0"; - sha256 = "158v8x7i4h4z60xckpav14p9b0hhhz5jqp48glq1wscrp94qqpjv"; + version = "0.4.2.0"; + sha256 = "05ghrqxjlpgdxdcfzj5l0shwmria2c9xkkbps1j1vdsn2qlwihxy"; libraryHaskellDepends = [ base heaps phonetic-languages-constraints-array phonetic-languages-ukrainian-array @@ -211656,8 +212421,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.9.1.0"; - sha256 = "0m20ifxzdycmcymkrhm5c7x4ccq63znfwa4jvbxyvgxnp6bd92aa"; + version = "0.9.2.0"; + sha256 = "0x0llv91r0837qiajnxhln6ddf8qyc7m13rc87x8rg7f5rqpzqip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; @@ -218604,8 +219369,8 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.2.1"; - sha256 = "09amgmzyypjilz6armsvyjjxj8frx48aq3nq8vjkp30j2xs7a7a4"; + version = "0.2.2"; + sha256 = "05znwk4s6b60rz4qf63b75y84a0yljyiynmkxj4sjafd810cbnwc"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq servant servant-client servant-client-core text time @@ -220245,6 +221010,7 @@ self: { description = "containers backed by arrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "primitive-convenience" = callPackage @@ -220395,7 +221161,6 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "primitive-stablename" = callPackage @@ -223039,6 +223804,77 @@ self: { license = lib.licenses.bsd3; }) {}; + "ptera" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , enummapset-th, hspec, hspec-discover, membership, ptera-core + , QuickCheck, unordered-containers + }: + mkDerivation { + pname = "ptera"; + version = "0.2.0.0"; + sha256 = "0lf9d2mcigrmn4asr6cjh5hbp1yl048v57a7az8aszhpsz4k8vkp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers enummapset-th membership ptera-core + unordered-containers + ]; + testHaskellDepends = [ + base containers doctest enummapset-th hspec membership ptera-core + QuickCheck unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "ptera-core" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, enummapset-th, hashable, hspec, hspec-discover + , membership, QuickCheck, transformers, unordered-containers + }: + mkDerivation { + pname = "ptera-core"; + version = "0.1.0.0"; + sha256 = "1bpgnd68c070i1azig6r0ck843hvxjcg17yhmy3nizm1bx4nppk1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers enummapset-th hashable membership + transformers unordered-containers + ]; + testHaskellDepends = [ + array base containers doctest enummapset-th hashable hspec + membership QuickCheck transformers unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "ptera-th" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, enummapset-th, ghc-prim, hspec, hspec-discover + , membership, ptera, ptera-core, QuickCheck, template-haskell + , unordered-containers + }: + mkDerivation { + pname = "ptera-th"; + version = "0.2.0.0"; + sha256 = "15djvwgivi2gxqhq65j3qkfh2w9z07yjh4nrg42ydv6n3ps4s9i8"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers enummapset-th ghc-prim membership ptera + ptera-core template-haskell unordered-containers + ]; + testHaskellDepends = [ + array base containers doctest enummapset-th ghc-prim hspec + membership ptera ptera-core QuickCheck template-haskell + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + "pthread" = callPackage ({ mkDerivation, base, generic-deriving, hspec, hspec-discover }: mkDerivation { @@ -225733,8 +226569,8 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.4.0"; - sha256 = "08ikiqgzhizg4acv9kba6glwa47xzpdzrpzcz95kcw7b90q9qqp9"; + version = "0.1.4.2"; + sha256 = "1r03w9ypvc063fhcd7sqs654gg0sz66jfll84bwg5709ws3y9bh6"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -231780,8 +232616,8 @@ self: { }: mkDerivation { pname = "regex-rure"; - version = "0.1.1.0"; - sha256 = "1ap1cpm82dv9q9w8y6cf0rp9f5zvspnql9zr35fknaxaskr86zgj"; + version = "0.1.2.0"; + sha256 = "1my3rmj2766bd00qg25wijgvw7ffk8fq965y2b97s5v00fjds33r"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ rure ]; libraryToolDepends = [ c2hs ]; @@ -231801,8 +232637,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.1"; sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi"; - revision = "2"; - editedCabalFile = "06zs654j7lrap69fqvmsas7f9x50kbxba7qzq4yihd94f03ba911"; + revision = "3"; + editedCabalFile = "11c7kqjf86jmm6pcxypbvlqb3iim5rcv9gxy1046iappasapampd"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -232440,7 +233276,7 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; - "rel8_1_2_2_0" = callPackage + "rel8_1_3_0_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , case-insensitive, comonad, containers, contravariant, hasql , hasql-transaction, hedgehog, mmorph, opaleye, pretty @@ -232450,8 +233286,8 @@ self: { }: mkDerivation { pname = "rel8"; - version = "1.2.2.0"; - sha256 = "1jbss5liyz8r747yzva1ciadacd63lida1gzrw9g7075hsawfwjf"; + version = "1.3.0.0"; + sha256 = "00iw5fzfx81j7phzjqzmk2bfxvg9q21sn3gw42a3xbnqk1ivrhjy"; libraryHaskellDepends = [ aeson base bifunctors bytestring case-insensitive comonad contravariant hasql opaleye pretty product-profunctors profunctors @@ -233828,8 +234664,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.2.2.1"; - sha256 = "0xc8ffz46m3hn7v9vjslh5z7yzqcbyijqfk8wl629539nishgsl9"; + version = "0.2.2.2"; + sha256 = "12p2mb215n7f0smczr5cfxkd89blchyyp5dsl6yzfij1ykf0yr9x"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -234893,15 +235729,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "retry_0_9_0_0" = callPackage + "retry_0_9_1_0" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers }: mkDerivation { pname = "retry"; - version = "0.9.0.0"; - sha256 = "0n304r6vyx238558z62kz7nii8y58h2z4iyx54gbkxmz9dsck4ff"; + version = "0.9.1.0"; + sha256 = "1scrkd6bd061h8s4d7sjs21m2ydz2mxiw95gs72rliikh2k3cj7v"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -234995,6 +235831,17 @@ self: { broken = true; }) {}; + "reverse-list" = callPackage + ({ mkDerivation, base, containers, contiguous, deepseq }: + mkDerivation { + pname = "reverse-list"; + version = "0.2.0"; + sha256 = "0r4bjrc1vksx3j61qb0g1a7nngkzvsybr0v0admls3ffqf3y4zgh"; + libraryHaskellDepends = [ base containers contiguous deepseq ]; + description = "reversed lists/snoc lists"; + license = lib.licenses.bsd3; + }) {}; + "reversi" = callPackage ({ mkDerivation, array, base, process }: mkDerivation { @@ -235798,6 +236645,7 @@ self: { description = "mutable ring buffers with atomic updates in GHC Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rings" = callPackage @@ -236012,8 +236860,8 @@ self: { }: mkDerivation { pname = "risc386"; - version = "0.0.20210812"; - sha256 = "0fxwmah8f4jhs480hrvbvchkmxgfmnsswg0d5zlbdgsiqfln42qv"; + version = "0.0.20220128"; + sha256 = "01bmmz6l5fq825ni1dk5d38x0p8k5fw2ingc3gzj8yzjmhfwp318"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; @@ -240335,6 +241183,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "scale" = callPackage + ({ mkDerivation, base, bitvec, bytestring, cereal, data-default + , generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, template-haskell, text, vector + }: + mkDerivation { + pname = "scale"; + version = "1.0.0.0"; + sha256 = "1c1khgy83402lqfqdvq5amf9pgn5a6m4m5zmqkkw6iw0wbjw7p3a"; + libraryHaskellDepends = [ + base bitvec bytestring cereal data-default generics-sop memory + template-haskell text vector + ]; + testHaskellDepends = [ + base bitvec bytestring cereal data-default generics-sop hspec + hspec-contrib hspec-discover hspec-expectations memory + template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "SCALE v2.0 codec for Haskell Web3 library."; + license = lib.licenses.asl20; + }) {}; + "scaleimage" = callPackage ({ mkDerivation, base, filepath, gd }: mkDerivation { @@ -241091,7 +241962,6 @@ self: { ]; description = "Scientific notation intended for tokenization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "scion" = callPackage @@ -245358,6 +246228,21 @@ self: { broken = true; }) {}; + "servant-htmx" = callPackage + ({ mkDerivation, base, servant-server, text }: + mkDerivation { + pname = "servant-htmx"; + version = "0.1.0.1"; + sha256 = "1plqqaa3vhmwg37bai6xpi415fd772fx6rf0dr919mc79ms0zcfx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base servant-server text ]; + executableHaskellDepends = [ base servant-server text ]; + testHaskellDepends = [ base servant-server text ]; + description = "A library for using htmx with servant"; + license = lib.licenses.bsd3; + }) {}; + "servant-http-streams" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , case-insensitive, containers, deepseq, entropy, exceptions, hspec @@ -247400,6 +248285,8 @@ self: { pname = "set-monad"; version = "0.3.0.0"; sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1"; + revision = "1"; + editedCabalFile = "1wlg93dx439kvwd5ndsgcyb6v4yqp3w3ql3md62far7cvajrfylc"; libraryHaskellDepends = [ base containers deepseq ]; description = "Set monad"; license = lib.licenses.bsd3; @@ -248082,15 +248969,16 @@ self: { "shake-bench" = callPackage ({ mkDerivation, aeson, base, Chart, Chart-diagrams , diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg - , directory, extra, filepath, shake, text + , directory, extra, filepath, lens, lens-aeson, shake, text }: mkDerivation { pname = "shake-bench"; - version = "0.1.0.2"; - sha256 = "14p9887qa2i34pbwfg2v2zzvdsbcpzf1d0mr0y2rzjy703356xsm"; + version = "0.1.0.3"; + sha256 = "04pngr9a1g7dr7kb0xp9k2yrbg6vqk3lfpksz6bbyydbmypix3ay"; libraryHaskellDepends = [ aeson base Chart Chart-diagrams diagrams-contrib diagrams-core - diagrams-lib diagrams-svg directory extra filepath shake text + diagrams-lib diagrams-svg directory extra filepath lens lens-aeson + shake text ]; description = "Build rules for historical benchmarking"; license = lib.licenses.asl20; @@ -249038,8 +249926,8 @@ self: { pname = "shelly"; version = "1.9.0"; sha256 = "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday"; - revision = "2"; - editedCabalFile = "0d08dlfgwi2m3wvcmcrcsn2g8lpqzkmxwxw74sysh94qb1gasr0y"; + revision = "3"; + editedCabalFile = "0jgd4jx16sm055riacqfvccnm3r5mz33ynxf41ckvkx42wxd98hp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249057,6 +249945,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "shelly_1_10_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , text, time, transformers, transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.10.0"; + sha256 = "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath lifted-async lifted-base monad-control mtl + process text time transformers transformers-base unix-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec hspec-contrib HUnit + lifted-async mtl text transformers unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -253303,7 +254217,6 @@ self: { libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "smith-cli" = callPackage @@ -256813,8 +257726,8 @@ self: { pname = "special-values"; version = "0.1.0.0"; sha256 = "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w"; - revision = "1"; - editedCabalFile = "10pbx4px4kmg6nwb78bayi26dlzbzvji5zv9fa6f45rk19p2sdlc"; + revision = "2"; + editedCabalFile = "1vv5gydjd65jniifl3mnch8bzvpvdahi913gsa3kv5zijwhad699"; libraryHaskellDepends = [ base bytestring ieee754 scientific text ]; @@ -262407,8 +263320,8 @@ self: { }: mkDerivation { pname = "streamly-examples"; - version = "0.1.0"; - sha256 = "0ny22z33wwkg9bbziwcj77k6gb8lwj1v0y5z6mw8sw20k4ca93q3"; + version = "0.1.1"; + sha256 = "174283sarx0ccjzzxill9l06hi7g9jz76sxwlb4fyc03db5q027i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -262457,14 +263370,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) lmdb;}; - "streamly-lmdb_0_3_0" = callPackage + "streamly-lmdb_0_4_0" = callPackage ({ mkDerivation, async, base, bytestring, directory, lmdb , QuickCheck, streamly, tasty, tasty-quickcheck, temporary }: mkDerivation { pname = "streamly-lmdb"; - version = "0.3.0"; - sha256 = "1da87rbmh9sgffjy5367pzy1d80f7zlxhszi9sq87jfws4i20pk7"; + version = "0.4.0"; + sha256 = "10749fl4dgm89z1d6sas1ngwxkkfl385465yxnrhxcc63wz53p5d"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -263175,6 +264088,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "string-random_0_1_4_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , optparse-applicative, pcre-heavy, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "string-random"; + version = "0.1.4.2"; + sha256 = "0rqh0cwywlzg4xyb1s80mghl3kq3sngg8xjbh4g9x4p8fc6maiw9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers random text transformers + ]; + executableHaskellDepends = [ base optparse-applicative text ]; + testHaskellDepends = [ + base bytestring pcre-heavy QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "A library for generating random string from a regular experession"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "string-similarity" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck , suffixtree @@ -264156,6 +265093,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "subcategories_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, foldl + , hashable, inspection-testing, mono-traversable, pointed + , primitive, QuickCheck, reflection, semialign, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, these + , unordered-containers, vector, vector-algorithms, vector-builder + }: + mkDerivation { + pname = "subcategories"; + version = "0.2.0.0"; + sha256 = "0qxiccv9xpl6ms8j9lfvl8jps9gr979ya441fghy1jvfza0fxd1x"; + libraryHaskellDepends = [ + base containers data-default foldl hashable mono-traversable + pointed primitive reflection semialign template-haskell text these + unordered-containers vector vector-algorithms vector-builder + ]; + testHaskellDepends = [ + base bytestring containers data-default foldl hashable + inspection-testing mono-traversable pointed primitive QuickCheck + reflection semialign tasty tasty-expected-failure tasty-hunit + tasty-quickcheck template-haskell text these unordered-containers + vector vector-algorithms vector-builder + ]; + testToolDepends = [ tasty-discover ]; + description = "Subcategories induced by class constraints"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "subhask" = callPackage ({ mkDerivation, approximate, array, base, bloomfilter, bytes , bytestring, cassava, containers, criterion, deepseq, erf, gamma @@ -269338,8 +270305,8 @@ self: { pname = "tasty-hedgehog"; version = "1.1.0.0"; sha256 = "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb"; - revision = "1"; - editedCabalFile = "0zn29qgsb5v4y7s4lrrhav9wqaz6pm97rcj1gl88qvvvi000jjbx"; + revision = "3"; + editedCabalFile = "1i7i2yws3bdmsg2hl7dh65zvh9sna3gnlv0l4m1sqqdx5dji1a3w"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -269377,8 +270344,8 @@ self: { }: mkDerivation { pname = "tasty-hslua"; - version = "1.0.0"; - sha256 = "07il3h282lj7m9y7cgc2w0gbffzndibwgxqfdv5m2n4kf1c3finl"; + version = "1.0.1"; + sha256 = "1zmxvhmmj6f0jw19v25pkhschrvzhwfr20jqg1sxdg15aaa3gjf7"; libraryHaskellDepends = [ base bytestring hslua-core tasty tasty-hunit ]; @@ -269640,20 +270607,22 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-lua_1_0_0" = callPackage + "tasty-lua_1_0_1" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath - , hslua-core, hslua-marshalling, tasty, tasty-hunit, text + , hslua-core, hslua-marshalling, lua-arbitrary, QuickCheck, tasty + , tasty-hunit, text }: mkDerivation { pname = "tasty-lua"; - version = "1.0.0"; - sha256 = "1ykl3by81ivz59zy3cqd6xsa4g8g7axwr9hajdbvmwn1b5y4h880"; + version = "1.0.1"; + sha256 = "0izkj9miws0w8320mfaxhj2bnwri3x338qvdz73wbzmbjwibmg23"; libraryHaskellDepends = [ - base bytestring file-embed hslua-core hslua-marshalling tasty text + base bytestring file-embed hslua-core hslua-marshalling + lua-arbitrary QuickCheck tasty text ]; testHaskellDepends = [ - base directory filepath hslua-core hslua-marshalling tasty - tasty-hunit + base bytestring directory filepath hslua-core hslua-marshalling + lua-arbitrary QuickCheck tasty tasty-hunit ]; description = "Write tests in Lua, integrate into tasty"; license = lib.licenses.mit; @@ -283587,22 +284556,21 @@ self: { "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion - , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, thyme, time, timezone-olson, timezone-series - , tzdata, vector + , data-default, deepseq, HUnit, lens, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, thyme + , time, timezone-olson, timezone-series, tzdata, vector }: mkDerivation { pname = "tz"; - version = "0.1.3.5"; - sha256 = "1svqcpcpy5mydkmf42a78khxa053jxbvrbdh5jzprh2b7g0dpvlb"; + version = "0.1.3.6"; + sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector ]; testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th time tzdata + base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th + time tzdata ]; benchmarkHaskellDepends = [ base criterion lens thyme time timezone-olson timezone-series @@ -283634,6 +284602,26 @@ self: { license = lib.licenses.asl20; }) {}; + "tzdata_0_2_20211021_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, HUnit + , tasty, tasty-hunit, tasty-th, unix, vector + }: + mkDerivation { + pname = "tzdata"; + version = "0.2.20211021.0"; + sha256 = "0x1pqdlbhh8qhbbfpc01jlcamk2ihwxbs9m8kgm8abd9fk0bwa0a"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq vector + ]; + testHaskellDepends = [ + base bytestring HUnit tasty tasty-hunit tasty-th unix + ]; + description = "Time zone database (as files and as a module)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "u2f" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-types, base , base64-bytestring, binary, bytestring, cryptohash, cryptonite @@ -286119,6 +287107,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_20_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.20.1"; + sha256 = "13fv7wfq7g1pilpk1vprbf2mbdj7qfm2y9v8glwr6dqyswv8z9dn"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -287128,7 +288142,6 @@ self: { ]; description = "Memory efficient url type and parser"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "url-decoders" = callPackage @@ -287247,7 +288260,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "urn" = callPackage @@ -288027,7 +289039,6 @@ self: { ]; description = "UUID parsing using byteverse packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "uuid-crypto" = callPackage @@ -289641,8 +290652,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.4"; - sha256 = "0aiycxljvwakvfigbm9wbg7b4jahd3ijckzgrfwdjpnxcqhjr0p9"; + version = "0.2.6"; + sha256 = "08zf1h6inqziy52q2nmgkvnaccpbg389pz41yyg6h0drsg5x8r4h"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -290248,8 +291259,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { pname = "versioning"; - version = "0.3.1.0"; - sha256 = "0m5hgl6n8znxn63pkvv7yb2nx7is4wivbzvbyh698cv5d92jb7cp"; + version = "0.3.2.0"; + sha256 = "0lwhcyb4g2j7wz16b7qp6vzmawlxx8k0xfvr9sdw5maljir0hykx"; libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; @@ -290300,23 +291311,23 @@ self: { }) {}; "vessel" = callPackage - ({ mkDerivation, aeson, aeson-gadt-th, base, bifunctors - , constraints, constraints-extras, containers, dependent-map - , dependent-monoidal-map, dependent-sum + ({ mkDerivation, aeson, aeson-gadt-th, base, base-orphans + , bifunctors, constraints, constraints-extras, containers + , dependent-map, dependent-monoidal-map, dependent-sum , dependent-sum-aeson-orphans, dependent-sum-template, lens , markdown-unlit, monoidal-containers, mtl, patch, reflex , semialign, text, these, witherable }: mkDerivation { pname = "vessel"; - version = "0.2.0.0"; - sha256 = "04zdcl4pbqf4b9nvgp7dnv91i1mbm60lnldxijgpnmlhrrff2dd4"; + version = "0.2.1.0"; + sha256 = "04pvn5rs3pgi917m0rsfmjxc035ns8sd79vza72qh0skvsg81pq6"; libraryHaskellDepends = [ - aeson aeson-gadt-th base bifunctors constraints constraints-extras - containers dependent-map dependent-monoidal-map dependent-sum - dependent-sum-aeson-orphans dependent-sum-template lens - markdown-unlit monoidal-containers mtl patch reflex semialign text - these witherable + aeson aeson-gadt-th base base-orphans bifunctors constraints + constraints-extras containers dependent-map dependent-monoidal-map + dependent-sum dependent-sum-aeson-orphans dependent-sum-template + lens markdown-unlit monoidal-containers mtl patch reflex semialign + text these witherable ]; libraryToolDepends = [ markdown-unlit ]; doHaddock = false; @@ -292288,6 +293299,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-logger_2_4_0" = callPackage + ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest + , doctest, fast-logger, http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.4.0"; + sha256 = "02i9jsy5gdglqwwk5gcvax8y498lz9flrfp4v9nrv8rmrmd66zh5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + testHaskellDepends = [ base doctest ]; + description = "A logging system for WAI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -292603,7 +293632,6 @@ self: { ]; description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-crowd" = callPackage @@ -294499,45 +295527,185 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, base58string - , basement, bitvec, bytestring, cereal, cryptonite, data-default - , errors, exceptions, generics-sop, hspec, hspec-contrib - , hspec-discover, hspec-expectations, http-client, http-client-tls - , http-media, http-types, machines, memory, microlens - , microlens-aeson, microlens-mtl, microlens-th, mtl, network - , OneTuple, parsec, random, relapse, servant, servant-client, split - , stm, tagged, tar, template-haskell, text, time, transformers - , unordered-containers, uuid-types, vector, vinyl, websockets + ({ mkDerivation, base, web3-ethereum, web3-polkadot, web3-provider }: mkDerivation { pname = "web3"; - version = "0.9.1.0"; - sha256 = "12nx9hgwx61yj44iym7na9jxf05jry3aa82j2s8l5rpw3qdv7dis"; + version = "1.0.0.0"; + sha256 = "0bnamwvdxl3i1p8bflnhaxxpn0bqcnf174gwplqjkxdc9pzfhiig"; libraryHaskellDepends = [ - aeson async attoparsec base base58string basement bitvec bytestring - cereal cryptonite data-default errors exceptions generics-sop hspec - http-client http-client-tls http-media http-types machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl network - OneTuple parsec relapse servant servant-client tagged tar - template-haskell text transformers unordered-containers uuid-types - vector vinyl websockets + base web3-ethereum web3-polkadot web3-provider + ]; + description = "Haskell Web3 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "web3-bignum" = callPackage + ({ mkDerivation, base, cereal, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, memory-hexstring, scale, wide-word + }: + mkDerivation { + pname = "web3-bignum"; + version = "1.0.0.0"; + sha256 = "140qv8y6b63by81z0k5by8vqr7x0gc106a67r35qbhdfmbhv71n0"; + libraryHaskellDepends = [ + base cereal memory memory-hexstring scale wide-word ]; testHaskellDepends = [ - aeson async attoparsec base base58string basement bitvec bytestring - cereal cryptonite data-default errors exceptions generics-sop hspec - hspec-contrib hspec-discover hspec-expectations http-client - http-client-tls http-media http-types machines memory microlens - microlens-aeson microlens-mtl microlens-th mtl network OneTuple - parsec random relapse servant servant-client split stm tagged tar - template-haskell text time transformers unordered-containers - uuid-types vector vinyl websockets + base cereal hspec hspec-contrib hspec-discover hspec-expectations + memory memory-hexstring scale wide-word ]; testToolDepends = [ hspec-discover ]; - description = "Web3 API for Haskell"; - license = lib.licenses.bsd3; + description = "Fixed size big integers for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-crypto" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory + , memory-hexstring, text, uuid-types, vector + }: + mkDerivation { + pname = "web3-crypto"; + version = "1.0.0.0"; + sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; + libraryHaskellDepends = [ + aeson base bytestring containers cryptonite memory memory-hexstring + text uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers cryptonite hspec hspec-contrib + hspec-discover hspec-expectations memory memory-hexstring text + uuid-types vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Cryptograhical primitives for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-ethereum" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, exceptions + , generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, jsonrpc-tinyclient, machines, memory + , memory-hexstring, microlens, microlens-aeson, mtl, OneTuple + , relapse, tagged, template-haskell, text, transformers, vinyl + , web3-crypto, web3-solidity + }: + mkDerivation { + pname = "web3-ethereum"; + version = "1.0.0.0"; + sha256 = "1vsvxhl6w6hjiv6b61sn8f2bnj6p55b4qyvblrfpk60k7pqq774c"; + libraryHaskellDepends = [ + aeson base bytestring data-default exceptions generics-sop + jsonrpc-tinyclient machines memory memory-hexstring microlens + microlens-aeson mtl OneTuple relapse tagged template-haskell text + transformers vinyl web3-crypto web3-solidity + ]; + testHaskellDepends = [ + aeson base bytestring data-default exceptions generics-sop hspec + hspec-contrib hspec-discover hspec-expectations jsonrpc-tinyclient + machines memory memory-hexstring microlens microlens-aeson mtl + OneTuple relapse tagged template-haskell text transformers vinyl + web3-crypto web3-solidity + ]; + testToolDepends = [ hspec-discover ]; + description = "Ethereum support for Haskell Web3 library"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; + "web3-ipfs" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-media + , http-types, mtl, servant, servant-client, tar, text + , unordered-containers + }: + mkDerivation { + pname = "web3-ipfs"; + version = "1.0.0.0"; + sha256 = "0m6rqk5vd53gl7mykwzzqblhgdqrjzjyqb5mqkagb1z0llwqxafg"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-media http-types mtl servant + servant-client tar text unordered-containers + ]; + description = "IPFS support for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-polkadot" = callPackage + ({ mkDerivation, aeson, animalcase, base, base58-bytestring + , bytestring, containers, cryptonite, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations + , hspec-expectations-json, jsonrpc-tinyclient, memory + , memory-hexstring, microlens, microlens-mtl, microlens-th, mtl + , parsec, scale, text, web3-bignum, web3-crypto + }: + mkDerivation { + pname = "web3-polkadot"; + version = "1.0.0.0"; + sha256 = "0sx9lj7px6m5ag4bk4imllh4bmy7kfgkfy1zb9hqjkdmjwn2i2w5"; + libraryHaskellDepends = [ + aeson animalcase base base58-bytestring bytestring containers + cryptonite generics-sop jsonrpc-tinyclient memory memory-hexstring + microlens microlens-mtl microlens-th mtl parsec scale text + web3-bignum web3-crypto + ]; + testHaskellDepends = [ + aeson animalcase base base58-bytestring bytestring containers + cryptonite generics-sop hspec hspec-contrib hspec-discover + hspec-expectations hspec-expectations-json jsonrpc-tinyclient + memory memory-hexstring microlens microlens-mtl microlens-th mtl + parsec scale text web3-bignum web3-crypto + ]; + testToolDepends = [ hspec-discover ]; + description = "Polkadot support for Haskell Web3 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "web3-provider" = callPackage + ({ mkDerivation, async, base, data-default, exceptions, http-client + , jsonrpc-tinyclient, mtl, network, text, transformers, websockets + }: + mkDerivation { + pname = "web3-provider"; + version = "1.0.0.0"; + sha256 = "03c892xj7yxwbb4r1vpqzwgsf4fyk9389rqivpr6bwklnx9230ic"; + libraryHaskellDepends = [ + async base data-default exceptions http-client jsonrpc-tinyclient + mtl network text transformers websockets + ]; + description = "Node connection provider for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-solidity" = callPackage + ({ mkDerivation, aeson, base, basement, bytestring, cereal + , data-default, generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, memory-hexstring, microlens, OneTuple + , parsec, tagged, template-haskell, text, web3-crypto + }: + mkDerivation { + pname = "web3-solidity"; + version = "1.0.0.0"; + sha256 = "1n5jf9vdxps8sxcaa3k2a4m3qn5w3kphvvn7f4jy0dh0zkr7i5nm"; + libraryHaskellDepends = [ + aeson base basement bytestring cereal data-default generics-sop + memory memory-hexstring microlens OneTuple parsec tagged + template-haskell text web3-crypto + ]; + testHaskellDepends = [ + aeson base basement bytestring cereal data-default generics-sop + hspec hspec-contrib hspec-discover hspec-expectations memory + memory-hexstring microlens OneTuple parsec tagged template-haskell + text web3-crypto + ]; + testToolDepends = [ hspec-discover ]; + description = "Solidity language for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers @@ -294593,29 +295761,28 @@ self: { "webauthn" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-parse, asn1-types, base , base16-bytestring, base64-bytestring, binary, bytestring, cborg - , containers, cryptonite, deriving-aeson, directory, file-embed - , filepath, hashable, hourglass, hspec, hspec-expectations-json - , jose, lens, memory, monad-time, mtl, pem, QuickCheck - , quickcheck-instances, serialise, singletons, text, time - , unordered-containers, uuid, validation, x509, x509-store - , x509-validation + , containers, cryptonite, directory, file-embed, filepath, hashable + , hourglass, hspec, hspec-expectations-json, jose, lens, memory + , monad-time, mtl, pem, QuickCheck, quickcheck-instances, serialise + , singletons, text, time, unordered-containers, uuid, validation + , x509, x509-store, x509-validation }: mkDerivation { pname = "webauthn"; - version = "0.1.1.0"; - sha256 = "1zjkx57k2j998gxi7gylq0d8djiwdi4b4b486msn4q998jn2h8qy"; + version = "0.2.0.0"; + sha256 = "0vdx1rlc2mb9nnxyzw94vw1kpjxd5qg9nqg1bh4wkdrxqqb3n7aj"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite - deriving-aeson file-embed hashable hourglass jose lens memory - monad-time mtl serialise singletons text time unordered-containers - uuid validation x509 x509-store x509-validation + file-embed hashable hourglass jose lens memory monad-time mtl + serialise singletons text time unordered-containers uuid validation + x509 x509-store x509-validation ]; testHaskellDepends = [ aeson asn1-encoding base bytestring containers cryptonite directory filepath hourglass hspec hspec-expectations-json memory mtl pem - QuickCheck quickcheck-instances serialise singletons text uuid - validation x509 x509-store + QuickCheck quickcheck-instances serialise singletons text + unordered-containers uuid validation x509 x509-store ]; description = "Relying party (server) implementation of the WebAuthn 2 specification"; license = lib.licenses.asl20; @@ -297817,7 +298984,6 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ws-chans" = callPackage @@ -297944,27 +299110,29 @@ self: { "wstunnel" = callPackage ({ mkDerivation, async, base, base64-bytestring, binary, bytestring - , classy-prelude, cmdargs, connection, hslogger, hspec, iproute - , mtl, network, network-conduit-tls, streaming-commons, text - , unordered-containers, websockets + , case-insensitive, classy-prelude, cmdargs, connection, hslogger + , hspec, iproute, mtl, network, network-conduit-tls + , streaming-commons, text, unordered-containers, websockets }: mkDerivation { pname = "wstunnel"; - version = "0.3.1.0"; - sha256 = "14f790bya156ffdp2rrxzibz54yd714p59h56amfnsakrn8ygghy"; + version = "0.4.1.0"; + sha256 = "022x4g1ya5676v7q0q3rzwn6rzlnz74f8xwwp3mnvyih025cx770"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base64-bytestring binary bytestring classy-prelude - connection hslogger iproute mtl network network-conduit-tls - streaming-commons text unordered-containers websockets + async base base64-bytestring binary bytestring case-insensitive + classy-prelude connection hslogger iproute mtl network + network-conduit-tls streaming-commons text unordered-containers + websockets ]; executableHaskellDepends = [ - async base bytestring classy-prelude cmdargs hslogger text + async base bytestring case-insensitive classy-prelude cmdargs + hslogger text ]; testHaskellDepends = [ - async base binary bytestring classy-prelude hspec network - network-conduit-tls streaming-commons text + async base binary bytestring case-insensitive classy-prelude hspec + network network-conduit-tls streaming-commons text ]; description = "Tunneling program over websocket protocol"; license = lib.licenses.bsd3; @@ -298799,6 +299967,8 @@ self: { pname = "xhb"; version = "0.6.2015.8.1"; sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb"; + revision = "1"; + editedCabalFile = "0f2vhak11kijd74il1r27h1zbcsj36yyv5x02h3kq6vdx0h0zyd9"; libraryHaskellDepends = [ base binary byteorder bytestring containers network parsec stm Xauth @@ -299591,8 +300761,8 @@ self: { }: mkDerivation { pname = "xml-prettify-text"; - version = "1.0.0.2"; - sha256 = "02rnglx1fm4xirpl1y0g3q34k593cbijg33hh77nzsp78qcnvfr9"; + version = "1.0.0.3"; + sha256 = "1bxp9dvy3js7az1c1kbrgjhhp4ssg7mb1gxgfj2qcaggv2b97v7i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -299701,7 +300871,6 @@ self: { ]; description = "Parse XML from bytes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "xml-to-json" = callPackage @@ -301920,8 +303089,8 @@ self: { pname = "yasi"; version = "0.1.2.1"; sha256 = "0647z79wva7apkp0swj7gax780vqmhr5czxrvg88gl3bi03wcapl"; - revision = "3"; - editedCabalFile = "0laibkj367wqnq95jiw1rca9b2jb5hanhvlclsdflyzg8kfknmhc"; + revision = "4"; + editedCabalFile = "0vljbnfrcscb468mcqx62r0xcdnz73glam67v73jqq6g4vhyaimr"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit text @@ -306051,6 +307220,18 @@ self: { broken = true; }) {}; + "zigzag" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }: + mkDerivation { + pname = "zigzag"; + version = "0.0.1.0"; + sha256 = "1gy2hv4ggxfwrxg9v3qyxpfrm1j5sixckc2j3h37ckzsh5v06mga"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + description = "Zigzag encoding of integers into unsigned integers"; + license = lib.licenses.bsd3; + }) {}; + "zim-parser" = callPackage ({ mkDerivation, array, base, base-compat, binary, binary-conduit , bytestring, conduit, conduit-extra, hspec, lzma diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix index 3c645999a1..7c7add6167 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -164,5 +164,20 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; + + # Inform users about backwards incompatibilities with <= 21.05 + override = _: throw '' + The ghc.withPackages wrapper itself can now be overridden, but no longer + the result of calling it (as before). Consequently overrides need to be + adjusted: Instead of + + (ghc.withPackages (p: [ p.my-package ])).override { withLLLVM = true; } + + use + + (ghc.withPackages.override { useLLVM = true; }) (p: [ p.my-package ]) + + Also note that withLLVM has been renamed to useLLVM for consistency with + the GHC Nix expressions.''; }; } diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/default.nix b/third_party/nixpkgs/pkgs/development/idris-modules/default.nix index d6fb1ac78b..ea8697482d 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let +{ pkgs, config, idris-no-deps, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; /* Taken from haskell-modules/default.nix, should probably abstract this away */ @@ -145,8 +145,6 @@ posix = callPackage ./posix.nix {}; - protobuf = callPackage ./protobuf.nix {}; - quantities = callPackage ./quantities.nix {}; rationals = callPackage ./rationals.nix {}; @@ -207,5 +205,8 @@ yampa = callPackage ./yampa.nix {}; - } // builtins_; + } // builtins_ // pkgs.lib.optionalAttrs (config.allowAliases or true) { + # removed packages + protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06 + }; in fix' (extends overrides idrisPackages) diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/protobuf.nix b/third_party/nixpkgs/pkgs/development/idris-modules/protobuf.nix deleted file mode 100644 index ebfc3c2750..0000000000 --- a/third_party/nixpkgs/pkgs/development/idris-modules/protobuf.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ build-idris-package -, fetchFromGitHub -, lightyear -, lib -}: -build-idris-package { - name = "protobuf"; - version = "2017-08-12"; - - idrisDeps = [ lightyear ]; - - src = fetchFromGitHub { - owner = "artagnon"; - repo = "idris-protobuf"; - rev = "c21212534639518453d16ae1b0f07d94464ff8eb"; - sha256 = "0n5w7bdbxqca3b7hzg95md01mx4sfvl9fi82xjm0hzds33akmn05"; - }; - - meta = { - description = "A partial implementation of Protocol Buffers in Idris"; - homepage = "https://github.com/artagnon/idris-protobuf"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.brainrape ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix index f8fe2a46cc..9cdde90c41 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -1,6 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }: +{ resholvePackage +, lib +, fetchFromGitHub +, bash +, coreutils +, gnugrep +, ncurses +, doInstallCheck ? true +}: -stdenv.mkDerivation rec { +resholvePackage rec { pname = "bats"; version = "1.5.0"; @@ -11,20 +19,34 @@ stdenv.mkDerivation rec { sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk="; }; - nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' patchShebangs . ''; installPhase = '' ./install.sh $out - wrapProgram $out/bin/bats --suffix PATH : "${lib.makeBinPath [ bash coreutils gnugrep ]}" ''; - inherit doCheck; - checkInputs = [ ncurses ]; - checkPhase = '' + solutions = { + bats = { + scripts = [ "bin/bats" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ bash coreutils gnugrep ]; + fake = { + external = [ "greadlink" ]; + }; + fix = { + "$BATS_ROOT" = [ "${placeholder "out"}" ]; + }; + keep = { + "${placeholder "out"}/libexec/bats-core/bats" = true; + }; + }; + }; + + inherit doInstallCheck; + installCheckInputs = [ ncurses ]; + installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows sed -i '/test works even if PATH is reset/a skip' test/bats.bats diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index 93755e83a3..51314db3f9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-zbxFMc02hbsU2ERlUzqMBHwHYfORB7TkMINrKC52PPU="; + sha256 = "sha256-GphF32CFxZYaoTG1k9pP+cRNs/PIKtwevTcIyjG7CpQ="; }; executable = "bb"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 45dc35681c..e2ab96d41b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1058"; + version = "1.10.3.1075"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "guIQjiWyulITZZSjt/kCtU5qo4FG/2IK2rwBI6Ttfe0="; + sha256 = "5uJtr6uz6mrkoFfzUmUb6vy5H4s1Lag3CNCsGwsQZ9Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix index d41c0a3c1f..366b7df3ed 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.14.3" +, version ? "2.15.1" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; @@ -10,24 +10,24 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.14.3"; + version = "2.15.1"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0is4gz99i06yb4jisxcz2c15jqkaz6ayhg9b8zb3s0s8yp59r2iq"; + sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I="; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0wg1mnj4qrv22z510032jnwb3z39gvzlrv5wic2ci5mg7316xlya"; + sha256 = "sha256-D0XcqlO0CQtpsne4heqaTLOkFYnJEZET4bl4rVXOM18="; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0gnjk3lh63m0naaw67g9w7wys5cgx2ipzd1dznqnlvxp2vj1gj5p"; + sha256 = "sha256-SRq5TtxS+bwCqVxa0U2Zhn8J1Wtm4Onq+3uQS+951sw="; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1j7snnf3a0jly85njq8npqikrdhz9lkirhvik1hkpd9sv7qfbvd6"; + sha256 = "sha256-iDbClCNDUsxT6K6koc4EQuu7dppTbOfzCVedpQIKI5U="; }; } }: diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix index 41778270f7..2719008bbd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/love/0.10.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "love"; - version = "0.10.2"; + version = "11.4"; src = fetchFromGitHub { owner = "love2d"; repo = "love"; rev = version; - sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; + sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix index bf53e71a22..425060e240 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RX8JarGpY6dhPGpvOX1FuUjirEPff0wGqLkGFxOa+bc="; + sha256 = "sha256-HqDrGoyYzdx8OTanlRd95L1wAtFeew7Xs2rZ7nK2Zus="; }; - cargoSha256 = "sha256-UvrDqxaZSgUJ/a6abigTuiUOfw+C7UolBApt5kVR+yo="; + cargoSha256 = "sha256-t3EwVYrKx7dvUcSp0B1iUAklg7WdQDld/T0O1HgHw54="; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix new file mode 100644 index 0000000000..c182214ccb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, jre +, wget +, which +, gnused +, gawk +, coreutils +}: + +stdenv.mkDerivation rec { + pname = "nextflow"; + version = "21.10.6"; + + src = fetchurl { + url = "https://github.com/nextflow-io/nextflow/releases/download/v${version}/nextflow-${version}-all"; + sha256 = "0l9hi51vrhvfx3px2pxw7lp4h21n8ks50x4icfk3hbgl2hwf7fvx"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre wget which gnused gawk coreutils ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 $src $out/bin/nextflow + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/nextflow --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + + meta = with lib; { + description = "A DSL for data-driven computational pipelines"; + longDescription = '' + Nextflow is a bioinformatics workflow manager that enables the development of portable and reproducible workflows. + + It supports deploying workflows on a variety of execution platforms including local, HPC schedulers, AWS Batch, Google Cloud Life Sciences, and Kubernetes. + + Additionally, it provides support for manage your workflow dependencies through built-in support for Conda, Docker, Singularity, and Modules. + ''; + homepage = "https://www.nextflow.io/"; + changelog = "https://github.com/nextflow-io/nextflow/releases"; + license = licenses.asl20; + maintainers = [ maintainers.Etjean ]; + mainProgram = "nextflow"; + platforms = platforms.unix; + }; +} 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 7a2a79b8cf..1bcbd2bb4b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -4,7 +4,7 @@ , libffi , gdbm , xz -, mime-types ? null, mimetypesSupport ? true +, mailcap, mimetypesSupport ? true , ncurses , openssl , readline @@ -17,6 +17,7 @@ , configd , autoreconfHook , autoconf-archive +, pkg-config , python-setup-hook , nukeReferences # For the Python package set @@ -62,8 +63,6 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert mimetypesSupport -> mime-types != null; - assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang)) "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found."; @@ -105,7 +104,7 @@ let nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook - ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [ + pkg-config autoconf-archive # needed for AX_CHECK_COMPILE_FLAG ] ++ [ nukeReferences @@ -277,7 +276,7 @@ in with passthru; stdenv.mkDerivation { --replace "'/bin/sh'" "'${bash}/bin/sh'" '' + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ - --replace "@mime-types@" "${mime-types}" + --replace "@mime-types@" "${mailcap}" '' + optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 5cdba9d320..6bee51f642 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -133,10 +133,19 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "9"; + patch = "10"; suffix = ""; }; - sha256 = "sha256-BoKMBKVzwHOk5RxCkqJ8G+SuJmIcPtx8+TGEGM47bSc="; + sha256 = "sha256-Co+/tSh+vDoT6brz1U4I+gZ3j/7M9jEa74Ibs6ZYbMg="; + }; + python310 = { + sourceVersion = { + major = "3"; + minor = "10"; + patch = "2"; + suffix = ""; + }; + sha256 = "sha256-F946x9qfJRmqnWQ3jGA6c6DprVjf+ogS5FFgwIbeZMc="; }; }; @@ -180,18 +189,11 @@ in { inherit passthruFun; } // sources.python39); - python310 = callPackage ./cpython { + python310 = callPackage ./cpython ({ self = python310; - sourceVersion = { - major = "3"; - minor = "10"; - patch = "1"; - suffix = ""; - }; - sha256 = "0xz1wrd6xi20sbli30vm6jclc4rlnnd03irybknf2p8sdrdjdwd7"; inherit (darwin) configd; inherit passthruFun; - }; + } // sources.python310); python311 = callPackage ./cpython { self = python311; @@ -199,9 +201,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "a2"; + suffix = "a4"; }; - sha256 = "sha256-aKjE1s4lSKe2F9aZ+9s0iTe9rODPltsaoIOEnfXa0T8="; + sha256 = "sha256-Q3/nN2w2Pa+vNM6A8ERrQfyaQsDiqMflGdPwoLfPs+0="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index ee610b2620..5f55ed5eca 100755 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -340,13 +340,19 @@ def _update_package(path, target): raise ValueError("no file available for {}.".format(pname)) text = _replace_value('version', new_version, text) + # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts + # sri hashes have been the default format since nix 2.4+ + try: + sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + except subprocess.CalledProcessError: + # nix<2.4 compat + sri_hash = subprocess.check_output(["nix", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + # fetchers can specify a sha256, or a sri hash try: - text = _replace_value('sha256', new_sha256, text) + text = _replace_value('sha256', sri_hash, text) except ValueError: - # hashes from pypi are 16-bit encoded sha256's, need translate to an sri hash if used with "hash" - sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': diff --git a/third_party/nixpkgs/pkgs/development/interpreters/quickjs/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/quickjs/default.nix index 4bc0ec528a..cc5487183d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/quickjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/quickjs/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ stesie AndersonTorres ]; platforms = platforms.linux; license = licenses.mit; + mainProgram = "qjs"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index d151c6765b..def2d7cb0c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.13.4"; + version = "0.13.6"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-zTgXMICuLn612bmL5e6GP5aBQ4uOcSLfce0PCRYGob0="; + sha256 = "sha256-Bios3h2bcR6PntFt6JWF7l5u6gjKaljS8HsKfTf+0X8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 8a20fa9285..c676a7b05e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -166,6 +166,8 @@ let # Bundler tries to create this directory postInstall = '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) + # Remove references to the build environment from the closure + sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig # Remove unnecessary groff reference from runtime closure, since it's big sed -i '/NROFF/d' $rbConfig ${ @@ -203,7 +205,6 @@ let # Add rbconfig shim so ri can find docs mkdir -p $devdoc/lib/ruby/site_ruby cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb - sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig '' + opString useBaseRuby '' # Prevent the baseruby from being included in the closure. ${removeReferencesTo}/bin/remove-references-to \ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix deleted file mode 100644 index a71805f505..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages -, which, readline, zlib, icu, cargo, rustc, llvmPackages }: - -with lib; - -let - python3Env = buildPackages.python3.withPackages (p: [p.six]); -in stdenv.mkDerivation rec { - pname = "spidermonkey"; - version = "68.12.0"; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf"; - }; - - patches = [ - # Backport a change from Firefox 75 that fixes finding the - # location of clang and libclang. - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da"; - sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0"; - }) - ]; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; # Configure script only understands --includedir - - nativeBuildInputs = [ - autoconf213 - pkg-config - perl - which - python2 - zip - cargo - rustc - llvmPackages.llvm - ]; - - buildInputs = [ - readline - zlib - icu - ]; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - export PYTHON3="${python3Env.interpreter}" - - # We can't build in js/src/, so create a build dir - mkdir obj - cd obj/ - configureScript=../js/src/configure - ''; - - configureFlags = [ - # Reccommended by gjs upstream - "--disable-jemalloc" - "--enable-unaligned-private-values" - "--with-intl-api" - "--enable-posix-nspr-emulation" - "--with-system-zlib" - "--with-system-icu" - - "--enable-shared-js" - "--enable-readline" - # Fedora and Arch disable optimize, but it doesn't seme to be necessary - # It turns on -O3 which some gcc version had a problem with: - # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e - "--enable-optimize" - "--enable-release" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Spidermonkey seems to use different host/build terminology for cross - # compilation here. - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - # mkDerivation by default appends --build/--host to configureFlags when cross compiling - # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list - configurePlatforms = []; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - # Remove unnecessary static lib - preFixup = '' - moveToOutput bin/js60-config "$dev" - rm $out/lib/libjs_static.ajs - ln -s $out/bin/js60 $out/bin/js - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.abbradar ]; - badPlatforms = [ "riscv32-linux" "riscv64-linux" ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix index 61b340ac18..6be61a1210 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.5.0"; + version = "91.6.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "04y8nj1f065b3dn354f1ns3cm9xp4kljr5ippvmfdqr7cb4xjp7l"; + sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix index 6c6268011a..d6dc01348a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.12.0"; + version = "1.20.31"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-5gMf62WSGf46Bg8CaI9weSMRjrdGiuxtaDV9FrS2xO8="; + sha256 = "sha256-Yol+bbxC5cCtCIZxP5Sa8R3ev1LAopc/oQa6Zd1nS8A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 6022245cac..816b854b99 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }: +{ rustPlatform, fetchFromGitHub, lib, python3, cmake, llvmPackages, clang, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w"; - nativeBuildInputs = [ python2 cmake clang ]; + nativeBuildInputs = [ python3 cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix index f9f3b09ba0..d38fa0609d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/LAStools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "LAStools"; - version = "201003"; # LAStools makes release-ish commits with a message containing their version number as YYMMDD; these align with their website changelog + version = "2.0.0"; src = fetchFromGitHub { owner = "LAStools"; repo = "LAStools"; - rev = "635b76b42cc4912762da31b92f875df5310e1714"; - sha256 = "0682ca3bp51lmfp46vsjnd1bqpn05g95pf4kclvjv1y8qivkxsaq"; + rev = "v${version}"; + sha256 = "19y49j5af3z3fsiknq9kg9yjcsr73ywng8dfy837y97q4shc9g00"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix new file mode 100644 index 0000000000..a5057c0fbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/2.0.15.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }: + +stdenv.mkDerivation rec { + pname = "SDL2_ttf"; + version = "2.0.15"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; + sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; + }; + + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ SDL2 freetype libGL ] + ++ lib.optional stdenv.isDarwin darwin.libobjc; + + meta = with lib; { + description = "SDL TrueType library"; + platforms = platforms.unix; + license = licenses.zlib; + homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix index a5057c0fbe..6975dfff24 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.0.15"; + version = "2.0.18"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; + sha256 = "sha256-cjTriINRTgGed0fHA+SndFdbGNQ1wipKKdBoy3aKIlE="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin darwin.libobjc; meta = with lib; { - description = "SDL TrueType library"; + description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + homepage = "https://github.com/libsdl-org/SDL_ttf"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix similarity index 94% rename from third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix index 2ade512de3..d2a1f38932 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x"; + sha256 = "sha256-fcxPhuI2eL/fnd6nT11p8DpUNwGNaXZmd03yOiZcOT0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix new file mode 100644 index 0000000000..d40ca0bd4a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, static ? stdenv.hostPlatform.isStatic +, cxxStandard ? null +}: + +stdenv.mkDerivation rec { + pname = "abseil-cpp"; + version = "20211102.0"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + rev = version; + sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ lib.optionals (cxxStandard != null) [ + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.andersk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix index df390ec166..9616c13cc4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-Q4v0HhhKUmLit5+V7bb9g4T7fqaeJJxU512vBZqNl1c="; + sha256 = "sha256-SgzX2khR92n9388z9mPrpK+tgk7+/59Z8TTEZA7oAhY="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 64b7aefe8b..527db0e2c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -61,8 +61,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "OS abstraction functions used by aqbanking and related tools"; - homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; - license = licenses.lgpl21; + homepage = "https://www.aquamaniac.de/rdm/projects/gwenhywfar"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 031b4fc46c..ea0f67ce8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -22,6 +22,7 @@ , libnsl , lz4 , minio +, ninja , nlohmann_json , openssl , perl @@ -30,6 +31,7 @@ , rapidjson , re2 , snappy +, sqlite , thrift , tzdata , utf8proc @@ -54,26 +56,26 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "1d8525e109a12a8c67c489eba48715a199609153"; - hash = "sha256-tesDW/1yRyhZtpLbPvCVEsocs6KtstYofxB5GiSMEFM="; + rev = "634739c664433cec366b4b9a81d1e1044a8c5eda"; + hash = "sha256-r1WVgJJsI7v485L6Qb+5i7kFO4Tvxyk1T0JBb4og6pg="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "d4d485956a643c693b5549e1a62d52ca61c170f1"; - hash = "sha256-GmOAS8gGhzDI0WzORMkWHRRUl/XBwmNen2d3VefZxxc="; + rev = "acd375eb86a81cd856476fca0f52ba6036a067ff"; + hash = "sha256-z/kmi+4dBO/dsVkJA4NgUoxl0pXi8RWIGvI8MGu/gcc="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "6.0.1"; + version = "7.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-N4az0t+VTQeLPmj5jS5a7Lqj+irM8HXXo6E8GHucUpQ="; + hash = "sha256-6PSbFJoV7O9OQPz6sbh8ETxrHuGGAFwWnlzfldMamd4="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -85,8 +87,8 @@ stdenv.mkDerivation rec { # ./cpp/thirdparty/versions.txt owner = "microsoft"; repo = "mimalloc"; - rev = "v1.7.2"; - hash = "sha256-yHupYFgC8mJuLUSpuEAfwF7l6Ue4EiuO1Q4qN4T6wWc="; + rev = "v1.7.3"; + hash = "sha256-Ca877VitpWyKmZNHavqgewk/P+tyd2xHDNVqveKh87M="; }; ARROW_XSIMD_URL = fetchFromGitHub { @@ -103,6 +105,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + ninja autoconf # for vendored jemalloc flatbuffers ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -156,6 +159,10 @@ stdenv.mkDerivation rec { "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" "-DARROW_DATASET=ON" + "-DARROW_ENGINE=ON" + "-DARROW_FILESYSTEM=ON" + "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" + "-DARROW_IPC=ON" "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" "-DARROW_JSON=ON" "-DARROW_PLASMA=ON" @@ -201,13 +208,10 @@ stdenv.mkDerivation rec { "TestMinioServer.Connect" "TestS3FS.*" "TestS3FSGeneric.*" - ] ++ lib.optionals enableGcs [ - "GcsFileSystem.FileSystemCompare" - "GcsIntegrationTest.*" ]; in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; - installCheckInputs = [ perl which ] ++ lib.optional enableS3 minio; + installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; installCheckPhase = let excludedTests = lib.optionals stdenv.isDarwin [ @@ -215,7 +219,7 @@ stdenv.mkDerivation rec { # path on Darwin. See https://github.com/NixOS/nix/pull/1085 "plasma-external-store-tests" "plasma-client-tests" - ]; + ] ++ [ "arrow-gcsfs-test" ]; in '' runHook preInstallCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch new file mode 100644 index 0000000000..e13dda5497 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch @@ -0,0 +1,24 @@ +From abdfbb94df98fe88be4dd92ca587500126558411 Mon Sep 17 00:00:00 2001 +From: Victor Gaydov +Date: Sun, 26 Jul 2020 11:54:52 +0300 +Subject: [PATCH] Remove deprecated scons call + +--- + SConstruct | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index 407025d8..04afa91f 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[ + # performance tuning + env.Decider('MD5-timestamp') + env.SetOption('implicit_cache', 1) +-env.SourceCode('.', None) + + # provide absolute path to force single sconsign file + # per-directory sconsign files seems to be buggy with generated sources +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch new file mode 100644 index 0000000000..097f1b3ff4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch @@ -0,0 +1,31 @@ +From 15b37bb12a362c7889ac431eca4a47d6b2bdb97c Mon Sep 17 00:00:00 2001 +From: Victor Gaydov +Date: Sat, 5 Dec 2020 18:38:36 +0300 +Subject: [PATCH] Fix compatibility with new SCons + +--- + site_scons/site_tools/roc/config.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/site_scons/site_tools/roc/config.py b/site_scons/site_tools/roc/config.py +index b42b3adb..03b76be7 100644 +--- a/site_scons/site_tools/roc/config.py ++++ b/site_scons/site_tools/roc/config.py +@@ -13,7 +13,13 @@ def _run_prog(context, src, suffix): + # RunProg may incorrectly use cached results from a previous run saved for + # different file contents but the same invocation number. To prevent this, we + # monkey patch its global counter with a hashsum of the file contents. +- SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16) ++ # The workaround is needed only for older versions of SCons, where ++ # _ac_build_counter was an integer. ++ try: ++ if type(SCons.SConf._ac_build_counter) is int: ++ SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16) ++ except: ++ pass + return context.RunProg(src, suffix) + + def CheckLibWithHeaderExt(context, libs, headers, language, expr='1', run=True): +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix index 728e52b267..98c088ed54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, - sconsPackages, + scons, ragel, gengetopt, pkg-config, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - sconsPackages.scons_3_0_1 + scons ragel gengetopt pkg-config @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--host=${stdenv.hostPlatform.config}" "--prefix=${placeholder "out"}" "--disable-sox" + "--disable-doc" "--disable-tests" ] ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ @@ -55,6 +56,12 @@ stdenv.mkDerivation rec { prePatch = lib.optionalString stdenv.isAarch64 "sed -i 's/c++98/c++11/g' SConstruct"; + # TODO: Remove these patches in the next version. + patches = [ + ./0001-Remove-deprecated-scons-call.patch + ./0002-Fix-compatibility-with-new-SCons.patch + ]; + meta = with lib; { description = "Roc is a toolkit for real-time audio streaming over the network"; homepage = "https://github.com/roc-streaming/roc-toolkit"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix index 2ba981ae46..0780d29788 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix @@ -15,43 +15,31 @@ }: stdenv.mkDerivation rec { - version = "4.0.0"; pname = "rtmidi"; + version = "5.0.0"; src = fetchFromGitHub { owner = "thestk"; repo = "rtmidi"; rev = version; - sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq"; + sha256 = "1r1sqmdi499zfh6z6kjkab6d4a7kz3il5kkcdfz9saa6ry992211"; }; patches = [ - # PR #230, fix CMake problems + # Remove when https://github.com/thestk/rtmidi/pull/278 merged (fetchpatch { - name = "RtMidi-Fix-JACK_HAS_PORT_RENAME-define.patch"; - url = "https://github.com/thestk/rtmidi/pull/230/commits/768a30a61b60240b66cc2d43bc27a544ff9f1622.patch"; - sha256 = "1sym4f7nb2qyyxfhi1l0xsm2hfh6gddn81y36qvfq4mcs33vvid0"; + name = "0001-rtmidi-Use-posix-sched_yield-instead-of-pthread_yield.patch"; + url = "https://github.com/thestk/rtmidi/pull/278/commits/cfe34c02112c256235b62b45895fc2c401fd874d.patch"; + sha256 = "0yzq7zbdkl5r4i0r6vy2kq986cqdxz2cpzb7s977mvh09kdikrw1"; }) + # Remove when https://github.com/thestk/rtmidi/pull/277 merged (fetchpatch { - name = "RtMidi-Add-prefix-define-for-pkgconfig.patch"; - url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; - sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; + name = "0002-rtmidi-include-TargetConditionals.h-on-Apple-platforms.patch"; + url = "https://github.com/thestk/rtmidi/pull/277/commits/9d863beb28f03ec53f3e4c22cc0d3c34a1e1789b.patch"; + sha256 = "1hlrg23c1ycnwdvxpic8wvypiril04rlph0g820qn1naf92imfjg"; }) - (fetchpatch { - name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch"; - url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch"; - sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj"; - }) - - # https://github.com/thestk/rtmidi/pull/277 - ./macos_include_targetconditionals.patch ]; - postPatch = '' - substituteInPlace rtmidi.pc.in \ - --replace 'Requires:' 'Requires.private:' - ''; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = lib.optional alsaSupport alsa-lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 01b3caa24e..65ce6580dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ libsndfile ]; enableParallelBuilding = true; + makeFlags = [ + "AR:=$(AR)" + "RANLIB:=$(RANLIB)" + ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-o test"; meta = with lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix index b20bdac908..d5057a6148 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix @@ -19,10 +19,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" - ''; - # boehm-gc whitelists GCC threading models patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix index 5adcc2d1dd..71a99ad6b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.7"; + version = "2.13.8"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="sha256-NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; + sha256="sha256-jOA2TxDgaJUJ2Jn7dVGZUbjmphTDuVZahzSaxfJpRqE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/celt/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/celt/generic.nix index d4fe5e8365..3b47b1d5e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/celt/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/celt/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Ultra-low delay audio codec"; - homepage = "http://www.celt-codec.org/"; + homepage = "https://gitlab.xiph.org/xiph/celt"; # http://www.celt-codec.org/ is gone license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix index c8b8875154..5b8cc369ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, darwin, zlib }: +{ lib, stdenv, fetchurl, cmake, boost, ffmpeg_4, darwin, zlib }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ boost ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix index c57525c01d..a31a4472e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !enableStatic +# Multi-threading with OpenMP is disabled by default +# more info on https://www.cryptopp.com/wiki/OpenMP +, withOpenMP ? false +, llvmPackages }: stdenv.mkDerivation rec { @@ -19,17 +25,22 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace GNUmakefile \ - --replace "AR = libtool" "AR = ar" \ + --replace "AR = /usr/bin/libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" ''; + buildInputs = lib.optionals (stdenv.cc.isClang && withOpenMP) [ llvmPackages.openmp ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildFlags = lib.optional enableStatic "static" ++ lib.optional enableShared "shared" ++ [ "libcryptopp.pc" ]; + enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; + CXXFLAGS = lib.optionals (withOpenMP) [ "-fopenmp" ]; doCheck = true; @@ -38,17 +49,21 @@ stdenv.mkDerivation rec { installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; + # TODO: remove postInstall hook with v8.7 -> https://github.com/weidai11/cryptopp/commit/230c558a postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version} ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version} ''; - meta = { - description = "Crypto++, a free C++ class library of cryptographic schemes"; + meta = with lib; { + description = "A free C++ class library of cryptographic schemes"; homepage = "https://cryptopp.com/"; - changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt"; - license = with lib.licenses; [ boost publicDomain ]; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ c0bw3b ]; + changelog = [ + "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt" + "https://github.com/weidai11/cryptopp/releases/tag/CRYPTOPP_${underscoredVersion}" + ]; + license = with licenses; [ boost publicDomain ]; + platforms = platforms.all; + maintainers = with maintainers; [ c0bw3b ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix index 731c038527..005f1ac030 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { name = "gcc-4.7.patch"; - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/" - + "dbus-c%2B%2B/files/dbus-c%2B%2B-0.9.0-gcc-4.7.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/" + + "dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch"; sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; }) (fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix index aadd61370b..ea6d45e5df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dlib"; - version = "19.22"; + version = "19.23"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ="; + sha256 = "sha256-88vusoLEkjh3WRh/PxPtsVIFk85serRq2VxVcEus3IE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix index 2bdcc3c8a9..75f4dd3ce5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "double-conversion"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "0csy4pjw1p8rp6g5qxi2h0ychhhp1fldv7gb761627fs2mclw9gv"; + sha256 = "sha256-Tg8hndib4EYSYDuEYVssv15w4pQyW5Jk+MwGJWOVQXE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix index ad582d9330..03c4ea0ee8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "easyloggingpp"; version = "9.97.0"; src = fetchFromGitHub { - owner = "muflihun"; + owner = "amrayn"; repo = "easyloggingpp"; rev = "v${version}"; sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "C++ logging library"; - homepage = "https://muflihun.github.io/easyloggingpp/"; + homepage = "https://github.com/amrayn/easyloggingpp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [acowley]; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix index d44783079f..322c6ecebb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vC/1j0nCmqx7/3BabBZ6gh8mxRIHn/CKxDL9D9ybsZk="; + sha256 = "sha256-tdJdbjczUcLtGbVitHMtAdJYmsjI6eeWLY3xIHzDEbg="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix index 0afef1c9fd..396acbc1bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix index e26ebef0c5..98c660dc79 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/farstream/default.nix @@ -11,25 +11,21 @@ , gst-plugins-good , gst-plugins-bad , gst-libav +, python3 }: stdenv.mkDerivation rec { pname = "farstream"; - version = "0.2.8"; + version = "0.2.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/farstream/releases/farstream/${pname}-${version}.tar.gz"; - sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; + sha256 = "0yzlh9jf47a3ir40447s7hlwp98f9yr8z4gcm0vjwz6g6cj12zfb"; }; patches = [ - # Python has not been used for ages - (fetchpatch { - url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch"; - sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn"; - }) # Fix build with newer gnumake. (fetchpatch { url = "https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d44.diff"; @@ -47,6 +43,7 @@ stdenv.mkDerivation rec { pkg-config autoreconfHook gobject-introspection + python3 ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index de20caf22f..31e9e2fbbb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "2.5.1"; + version = "3.0.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0dn0ic2ddi5qz6nqscsn7nlih67ad8vpclppbqwas6xavdfq6va2"; + sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx"; }; depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcgi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcgi/default.nix index 1ec666a920..434d445ceb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcgi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A language independent, scalable, open extension to CG"; - homepage = "http://www.fastcgi.com/"; + homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index ca2f3b0e38..134d9031e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -6,13 +6,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "fflas-ffpack"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; - rev = version; - sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74"; + rev = "v${version}"; + sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index e4a5d908d2..9d9a1a126c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm +{ lib, stdenv, buildPackages, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -32,7 +32,6 @@ , avdeviceLibrary ? true # Build avdevice library , avfilterLibrary ? true # Build avfilter library , avformatLibrary ? true # Build avformat library -, avresampleLibrary ? true # Build avresample library , avutilLibrary ? true # Build avutil library , postprocLibrary ? true # Build postproc library , swresampleLibrary ? true # Build swresample library @@ -100,6 +99,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , libXext ? null # Xlib support +, libxml2 ? null # libxml2 support, for IMF and DASH demuxers , xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support @@ -107,7 +107,7 @@ , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering , openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering -#, openh264 ? null # H.264/AVC encoder +, openh264 ? null # H.264/AVC encoder , openjpeg ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null , libpulseaudio ? null # Pulseaudio input support @@ -164,7 +164,7 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libnut libquvi nvenc opencl openh264 oss shine twolame + * libnut libquvi nvenc opencl oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: @@ -225,7 +225,6 @@ assert avdeviceLibrary -> avformatLibrary && avcodecLibrary && avutilLibrary; # configure flag since 0.6 assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 -assert avresampleLibrary -> avutilLibrary; assert postprocLibrary -> avutilLibrary; assert swresampleLibrary -> soxr != null; assert swscaleLibrary -> avutilLibrary; @@ -260,7 +259,7 @@ stdenv.mkDerivation rec { configurePlatforms = []; configureFlags = [ - "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" + "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}" #mingw32 and mingw64 doesn't have a difference here, it is internally rewritten as mingw32 "--arch=${stdenv.hostPlatform.parsed.cpu.name}" /* * Licensing flags @@ -282,7 +281,7 @@ stdenv.mkDerivation rec { (enableFeature hardcodedTablesBuild "hardcoded-tables") (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") (if multithreadBuild then ( - if isCygwin then + if stdenv.hostPlatform.isWindows then "--disable-pthreads --enable-w32threads" else # Use POSIX threads by default "--enable-pthreads --disable-w32threads") @@ -304,7 +303,6 @@ stdenv.mkDerivation rec { (enableFeature avdeviceLibrary "avdevice") (enableFeature avfilterLibrary "avfilter") (enableFeature avformatLibrary "avformat") - (enableFeature avresampleLibrary "avresample") (enableFeature avutilLibrary "avutil") (enableFeature (postprocLibrary && gplLicensing) "postproc") (enableFeature swresampleLibrary "swresample") @@ -375,6 +373,7 @@ stdenv.mkDerivation rec { (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbshapeExtlib "libxcb-shape") + (enableFeature (libxml2 != null) "libxml2") (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") @@ -382,7 +381,7 @@ stdenv.mkDerivation rec { (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") #(enableFeature (opencv != null) "libopencv") (enableFeature openglExtlib "opengl") - #(enableFeature (openh264 != null) "openh264") + (enableFeature (openh264 != null) "libopenh264") (enableFeature (openjpeg != null) "libopenjpeg") (enableFeature (opensslExtlib && gplLicensing) "openssl") (enableFeature (libpulseaudio != null) "libpulse") @@ -420,6 +419,7 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" + "--host-cc=${buildPackages.stdenv.cc}/bin/cc" ] ++ optionals stdenv.cc.isClang [ "--cc=clang" "--cxx=clang++" @@ -431,9 +431,9 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext libxml2 xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore - zeromq4 zimg zlib + zeromq4 zimg zlib openh264 ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva @@ -453,7 +453,7 @@ stdenv.mkDerivation rec { checkPhase = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ + ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ make check -j$NIX_BUILD_CORES ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix index dfdbf8eb2f..9bfee29087 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ffmpegthumbnailer"; - version = "2.2.2"; + version = "unstable-2021-09-02"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; - rev = version; - sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich"; + rev = "d92e191dd793b12cee0a0f685f5a8d8252988399"; + sha256 = "1ysfq3g74b8ivivrdpfi4vm23d3cyc3rfla5i6y8q9aycis9xv6q"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix index 283942df63..6e7a58f559 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, ffmpeg +, ffmpeg_4 , zlib }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ffmpeg + ffmpeg_4 zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix index f4b30129e6..4f3d685c1f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -3,7 +3,7 @@ , lib , gfortran , perl -, llvmPackages ? null +, llvmPackages , precision ? "double" , enableAvx ? stdenv.hostPlatform.avxSupport , enableAvx2 ? stdenv.hostPlatform.avx2Support @@ -11,24 +11,20 @@ , enableFma ? stdenv.hostPlatform.fmaSupport , enableMpi ? false , mpi +, withDoc ? stdenv.cc.isGNU }: with lib; -assert stdenv.cc.isClang -> llvmPackages != null; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let +stdenv.mkDerivation rec { + pname = "fftw-${precision}"; version = "3.3.10"; - withDoc = stdenv.cc.isGNU; -in - -stdenv.mkDerivation { - name = "fftw-${precision}-${version}"; src = fetchurl { urls = [ - "http://fftw.org/fftw-${version}.tar.gz" + "https://fftw.org/fftw-${version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" ]; sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix index 283c815b19..c294aec893 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals enablePython [ python3 ]; meta = { - homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; + homepage = "https://github.com/flann-lib/flann"; license = lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with lib.maintainers; [viric]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 592c14579f..c97f1effd6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # Hardcode paths used by Flatpak itself. (substituteAll { src = ./fix-paths.patch; - p11kit = "${p11-kit.dev}/bin/p11-kit"; + p11kit = "${p11-kit.bin}/bin/p11-kit"; }) # Adapt paths exposed to sandbox for NixOS. diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix index 45d3f128c0..965016e1c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -36,24 +35,15 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.15.3"; + version = "0.15.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; + sha256 = "5xCZr8noj61OdXrhNLw/1j4SuQGtYrDtVTavt5Ekr18="; }; - patches = [ - # Fix build with evolution-data-server ≥ 3.41 - # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/folks/-/commit/62d588b0c609de17df5b4d1ebfbc67c456267efc.patch"; - sha256 = "TDL/5kvVwHnvDMuKDdPLQmpmE1FTZhY+7HG8NxKqt5w="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection diff --git a/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix index 3a82b566a5..7d4ff382d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch +, pkg-config , gettext , autoreconfHook , gmp @@ -9,16 +9,17 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.3.2"; + version = "5.4.1"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "00iyz218ywspizjiimrjdcqvdqmrsb2367zyy3vkmypnf9i9l680"; + sha256 = "sha256-6Zde8/bPOQQ16DqhqrQuGXDrf5HQEn5lwxauvyBr4XQ="; }; nativeBuildInputs = [ + pkg-config gettext autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 124c0a48cd..3e5ae303dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -62,7 +62,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = lib.concatStringsSep " " [ + "-fpermissive" + # poppler uses std::optional + "-std=c++17" + ]; # - Unset CC and CXX as they confuse libtool. # - teach gdal that libdf is the legacy name for libhdf diff --git a/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix index 3f8215d19f..22acc73c49 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libiconv, xz }: +{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff - ]; + ] ++ lib.optional stdenv.hostPlatform.isWindows (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/gettext_formatstring-ruby.patch?h=mingw-w64-gettext&id=e8b577ee3d399518d005e33613f23363a7df07ee"; + name = "gettext_formatstring-ruby.patch"; + sha256 = "sha256-6SxZObOMkQDxuKJuJY+mQ/VuJJxSeGbf97J8ZZddCV0="; + }); outputs = [ "out" "man" "doc" "info" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix deleted file mode 100644 index ca4a3c98e0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }: - -stdenv.mkDerivation rec { - pname = "giblib"; - version = "1.2.4"; - - src = fetchurl { - url = "http://linuxbrit.co.uk/downloads/giblib-${version}.tar.gz"; - sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; - - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; - - buildInputs = [ xlibsWrapper ]; - propagatedBuildInputs = [ imlib2 ]; - - postFixup = '' - moveToOutput bin/giblib-config "$dev" - - # Doesn't contain useful stuff - rm -rf $out/share/doc - ''; - - meta = { - homepage = "http://linuxbrit.co.uk/giblib/"; - description = "wrapper library for imlib2, and other stuff"; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix index 29674118df..83f7854a73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { pname = "givaro"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; rev = "v${version}"; - sha256 = "11wz57q6ijsvfs5r82masxgr319as92syi78lnl9lgdblpc6xigk"; + sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 29eb1b9482..07c97ea6e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.70.0"; + version = "1.70.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SwYpNBoxigI3ThE6uX+anzMlQjJp/B4LBDpf+wGGHF8="; + sha256 = "sha256-u9wO7HzyX7xTR2n2ofssehjhe4ce/bDKWOmr8IsoAD8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index 9d21d8e06f..30f43c00a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre + ] ++ optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ libselinux @@ -143,6 +144,9 @@ stdenv.mkDerivation rec { patchShebangs glib/gen-unicode-tables.pl patchShebangs tests/gen-casefold-txt.py patchShebangs tests/gen-casemap-txt.py + '' + lib.optionalString stdenv.hostPlatform.isWindows '' + substituteInPlace gio/win32/meson.build \ + --replace "libintl, " "" ''; DETERMINISTIC_BUILD = 1; @@ -198,7 +202,10 @@ stdenv.mkDerivation rec { getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { + packageName = "glib"; + versionPolicy = "odd-unstable"; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz index aecf1550feffdb6cce55dad4088b4f6f0fe6dbae..49ffd4a7441cb59744eedbdda9cee072d931d868 100644 GIT binary patch delta 78686 zcmV)3K+C_#pajDH2!ON!Rt|rpU2AXKHWdBbe<1`|m!PpCQct(Vu)qzvVh!fTZ8vN! zTuP!Gp?<-#lD7NvyAMjD?KtsTphy#mqQuv|B=6xlc#8go&K%(gfr<%%_YkPPMO1L8 zka+?aEwE^nUft1#dQT@oYs7q^cW90RHQF51D|WNQ`2}vnlMWn(K-qsAH(S{4#x*0) zt-!qt^9;j6xdVJ^Wwsh$%F%SQ_GUahdR~HxyuLbZzaK0W+^Lu5b;Ldh>xwcrIq+No z70Q^Gae`QXC~t*z(^e#X8VfMgt9>Oma!Z|dNomzCZfe|WUNccf*iky#AzBr4z?ihs zjB1<>Yry%8qVp=13BP|)2(sleC~BD2+9C&US+1-r$7xp}K0DC<3A3YPKKDP*+not$ z#gjd!{IAsVTIs2C>HJ;JD`?f{t8etnU7UOm1+<8WXqM@p%&bjLh zV0gh8eZI_og_XsfCyPk_EkLXZs)o1ZZ{d~^<}*e0990r0bC|N_8*F$Ks5G1#xVZ+V z;N@Uok2<=RLPuF+46~v7kYUjeq!tNw)I8RiuVpTEzwdv0Iz<`bD3f8LERhsu+#@_h zxgbcurv@SP$!PzSh?Kx%=&)p5mAO83R;o4NU}@)$swW7&U~WIsz8nnSxs5XAyc0om z#w$%L{&DL;6mrM6#3~!iuBSvW&w8Xpt80`tH<3=bfrb02`pa@!X61VN)p(ZA&2vXB z=7}B%kD7neRJapRfg{8sW_ANqmc2yHN<1Kr01B|~y(Nx~-c6OQ+{`}QWIs-jfyL+M z4AorUHk$0XqlzGni8<>9>sqjUW+}V(Ly;V&BB8(36mN(LV8wp!NZ0e7?~u)w~8{`IX>`riHqS zaBfOvHH6~MakL4D+DCKqww{&?c)?`8aNeNCX9a)2K+6|+<{zhUYfLfwpB%N|UD6;9 z70iDVqe!Mv>i1*6P-zi*As%W=A{~iPc>7%8E-H6#kG>bnyZ5O^{3Su}m}$fYiXG-`4Pr6yQ?3}82NBS_nv>)_e`g1A8Lk&^OJY#-EkFMtmrQD0Kv5Q zk8d=tO@$(jqcj#e5q(dEUg~Kt^HN_Hs7IOLAzDv($#)8zUM}WDZz^IGI1PkZW=NZ> z>q`-ktSr zT8wMKwWOtKg@o&hE>KrSP}~uzEH~pqpi!(#nYWx>0^Xi$dI@vk9PgEEt zK?oS*@Pte_-olF!TK(LXs4Y!&=}-cCL1p;uZm$>9?ld;h@jK9?>S{ByJ;Hy`3`cIt zZvirM+R-H`XQtx%;i@l-wgor)Tvr#JyTu~z5V|qe7)Ho0$(!9J_xPs!Bk?9_~ldR@hT^(AQ*Lgjhuf8|JuW?qpHW`7gN;$bpIh>_ea)B2eWvN5$;x%C}jd+P{k>aa4TANJa~UWp_ZQS%jm=a3(-2Vfz4K`A|`BKqSKn` z84QRXe2H``rUcj;W;hSuvAT%n*~A9QyJrya&NIqvM+t80PSeT>EHr=o5IT+PdPM?$ zC@+M(dnT}*!=|_2zH9W=1PiQz>p>vhyj+jlM3!skF}YH=JL8f!*q<5ye?>|hc*U+V z+>-%wSfX4!*hxh5vn^?61oQysgdr3ehOeJ7f7>0VV0^8nMU(o>k^57&ANQn-_Bg*d z-U-K<|LsW24tmXfsqKGPk$xZ+ivSr!W=e(*(%6pcKL7v#|Nrb=OK;jh5I)miVX2o8 z5#l9|!9hXWl=~_qZr~+S4Q7_bt zTrD=(NFgGFR~yM>u{o$p)((v!JskID&j2gj1cZGuQhw}6IGAytczY5)-; z*N^{;0k&#Yy5v^HYgm;z@&jqke3Wcqh#{!8k@7&HMg4u7D+Sxz8SI>Q&^^x* z-G%6|cR3hdae{w$*~d|jUiqU)3{pQ9e&mByt&|LcNcx_DUJ9Zh4t(#b=`%zl3Q)FP zZZi_2c952zk%|(`YJ~Le*8`cVAdQC>B*0FpkpOlu0RZs&-}rYmzy|766Z4K?59~iR z1P%5ud9S&maDz0tzkh}4Fr!lV)p2w-*QJs{pRkI&o7+H4C!iT zflOLO%{DgUBFU!3tcO58*z-wa4RSb2m3lkApiu}4J>H-%fiv8S$OwuA&E0jd>EsuR z_Yi#EVi12W?CIQ|xd-a&oZ~~U>ihP*%$kG>5>^uiBAme_PBH?q@Hr=nOFeo`XD2-3 zRc6O}h_TY#5!z`=^!u=j_lGi3zP*#TQfj?zg_7+S^n?qxTcAJsWrvS>XMBq{Avy^x zhyA)hhnr=0RDV;nUvC`a5dyM6U+QZ*3{}`)8S;PVPLpDtAlwW#kI0z>NvqGWTj`XS zq6@lf!2_-r`a=sHAC~zPHi1MdovHFivFezVxycOX;8(1vm=2^GF<8sTg@IhZo9uw8E<`t?0hQg1TC{w3I)>8_BU>8o&sr5<@QepQ|2;+rGllEf~DWTd_n;C!MSJU&qq!zua3oTgL&z>D!%es zJYckCUuB^bC3xE~rtHTfL111oyr zF8}}l|Nrb=O$&lR5dACSNk}0*6=Bf9Lm+=1g1Uw+doHZN=+C$Fu^;MY1sy%RGVa&B zH|yJ(!2?59P?!A=Kz%xrYD_1<;Ge^mhvH$8X>9eaPRV8l`YY9hgfW+`;sYRTU`_(& zEj!}CKp%AJg;odPwE_yy>)W}ZUt4OmHgvM3sV;H0f~eS5hfT?s`&GXSst5!g83h)+{b?wSaXRHd%9o@jOu@0U#+gax znn+?hK;QNzX|sWQP#_a zJQnFp*fU|zggu`V9q(j9LITN(DAs?joh1F+z>0*tG`NH==Qcn~vhBoh28zPLP7eL| z27bCwTGw?f1==v7fJIYJL0(hDyD00960>|J?p+eQ}uyZb3v zD@de7WXR!dH$@xANR74Qz;YK@EDVAi4jp%8OOTvJjH2It-+OcL5N*j)+YNuP1q@3f z=OEu4?>Fzzh_pBMyi!U$g zS2d79hjuc(u9QIUFLWWpP$Yi`?ZzJ`;>Kh&T^S-iX&!7u^Cm_z%>DtgrPgWXeuR{6NAS;!>$`iSfK+CHq#acn ze$*Z+yJ%#B*VVPkzAk^oSQW;hKl+Et*&_{*RS*<1lhKk%l`@QMHMC_xUZF7qbdRC$ z9hrZpJDWb{tCN6`D$N2NC%hhhY-1{}a(-X4c21b2wmW=uCeRyWE43wrny2%{>~6+q zc&IrS5(OaOJjHaxw?NBcwm>Mfl`@)C$zI4}*t5!M#c%7U*TR2rY4u)CZ^&I&p9;lN z8=1%^lE4oyO$h%PMt;IERcc_$M60bapbSP;0?LXnC=0|jLz-n=ikCaDYpEUgg9zH1 zNT5?-LbrQKfbt$j5U$AsKaAwR0jycWXD7#R$JVotCqG^QU_FJeXXnT7k3Xo8zNG0E zDjrVkyFvY~==XnW((oEjggML~3o~rd!%g!m3SWjvsZhXtCvHfA&=pS7d%dRjx)Qf4 zEpO+Vj-2UpQNnT#1SZ4*>c_lHl5W<^Ze5-AvU{CO)Z%e!y@LNT%3+hb!=}XI(`wbX*}n>p}DoWx@_M3lqJRiuCYRmT3S+2l}mGg9nwg;%QL zZKTjVz3T$dHJ;$x@IXKP$Y?jESJ?y1)fBhBBTeczzmhOq0c4<}A`xu9)=Q2m(dSp< zE^FTyVrNi`3;TOskuwk!JpXu@P5wE#ID*5|`Pq4^2pQ=*3z2C|K%cTmJGaI+ziC$> zd;`@ioZ^2bXNP}3(6{)MBIv!LLB%031FIkejUWx3^&HzFx+6qu_*d#iWR|#*K>}qi z(mWAy6%{d0gdd8?F9IK3h=Zs~k}!`%DT1QmQ&jI<=ud>7+v{X$F7HcGg$moYXiZ+V zjdu6jUiSaTX=|%AW_iFv*Y$$ji#(qdA&?_G18HZtU6{C zN}0Zt3s}^RuZ(Wn&>sbKM2p#SZcB@F{Yz(?BtK()5!g3n=fMo5uX-=jH5gJFQDlc- zT55kMSd=&SxV}k6v^IPbp%zc(g7;V_L{m@i80ZK`8c>ERglW{^>uZ${;%}?fukuBa zU%^BtXTCM{;l3J%&hsLCX*I2Bu>O&NNa#Lj4Xkg867PWr9%jtJ+z<`zW^<%%SX}n) z5-8L+OPk#{nOFPzrqawZ;$@u1NnAXTQNDk#?WQsxra*tQMR9#cbIa@?IFnv1$#juc50t8|r4&E|P$Re_kW00U45>$B_;Tcq8s>jY zFD-U?&=hX2%BrYITdSj59q3yP@f4P6i=7Tnj*mWEVBR?c7!6pIy}9(Kko;<#8w83C znAjs_?U6=pFNUgu0FJNBE0dt&CFfC8G zlkPAoE;VkI=r2%OB45Jc%Gtt8rqocXP{v(qKu!>_)m_uVn>ZpNB{r1;1Yh+nx0(Mpe?g5t@dmLY)}*SjMcU+ z#j}-AE9=~)2_(H~C>jt}sGxs4b)Ta2VujkEQAauE1UZb84DeSKW*dcQ_H2$55T$7n zjw&vBJ=Gb$(RPzeH?tonlcUqOCr9U5hGB6P2_K@+5cZgK)}gPkCSi58Ntti-e_BB1++U9(R+_%VRElAD9)x;0r!W z0=Bc3%G(dpeHK2hrAi)?W-tH4Tar2DXov1>?dUhMxRKL$>Meh%gQeumeHsVpDQUD0 z6x?M+&6O{%KI2BQ{4*3(RS3YK3{rp#xmU3`_g%nmQRpSC@RK~KQa{C5@9Py*wNlD) z1ZHvxORw6*ug@p9K7X99RZsm6N*-%lCC{p+D%ns|)t)3fE35ve`X(H(fZ>1zJEnPf zdTIsht4yt+{4#%| zg^&2Kh`NvTFkl&uSW~iEU(+i3IIRi+N3O_mQ2SDPQ6OmxMsKhfUQqY0`hBs_ias!GO`a1%i^STPN+m z?_6v!PH5@c$G)T`0b?KA$M*Lff3^lH+N4RG(a#0_4^@DOgTBT+B7EIOJkywV`T6YY z`Nh@f@OQo564j&t5K4ZH@@Ri#%YS?@87T`7lB+jCcnBMAmI-!BXT>QG-_( zpWZ1-?=Kpy2~6S=AtvN>Ex~jvZGh_KT9pBf5cLVhL%&jQXridC7%c}MoHQvMb?d-* z9p1zHN@;i10b9eaSz3#5IXK;>3Kk1<^VR*2zrcUzNqhB9k^?*OK9YmKA4+lrGcir) zshb8vNDh^@NpkpiksQsW&L%hdC!5dl+|Q)NGimWy(gOOI%`|jz;{TvCsFzzEw~03* zONmxI$BZQJu)eAgedzQ7-sV`Z*}Ya&@j?mL4?Ce^H}LjhVYh>WZg*LY4nJW#KVxim zMpJ(`4)tf7{zKS|NAVf6Or%p86oCl+AosIacGleF_(P9ry-3E>A(@K9OEOK=w` z3+c~BZhShMpL(;WlZDh0kUQFtsu_|iZge79&6Uf`gu_6^$jJzi#v1ZdRRoC=v|J)~gM|bfg2hPfXIGO>TcMaOib768cKnwpJ_Z@o@>xdQ1U}C^`N9 z>`bqx)zXZF+1}!dc;W1jQkXg&)DSRa0jgh;7Nw0<$qVzKwOYcb!|ssX0ho`{*{_6| zLMkws>8m6qyeqa!>4`+?x^j|Q*U%sn$1n>0o0J9o68H(K3zKp&rBr`b zvRqXdV<|IX<;YQb2dxO3fpAkJK#RgKKq;|?kjf2CInk_1D{xn5i5>yj*aUj0C9+nI zROKy8e}0i`-cN|2;LJPKHD~oeqD|p`=V03X>>OBH+tay}m{_x4$7Ni?&e1N~?i3 z=4@-;u!T{yb2ZTu;847Hgy*OoC~p?~Ggl%9TjZ&WKCJ-XmHUww$iR!m)GN}th&*?q z#px(7DazQPe|(9`l?rcwj6s`#dgMCP5!hyn!boGSP+TV5A19OWcuV-(TR%1Q&Kd z#msu|b<{nKIz<=O?xcU!%A+7lcDlRmV7&nObXH4|UxvcI6pDhMbRiQjTFWJTuyIog z*=yLf7Y*5kp<9}r%b|he0)p`Ze{yuggH-+V6iQarFF{r9sp`S3T7z=pfUX5!RX%QV zZ(mgnE$`(60kQhTb!W+IBr)Njvl$nmVVVJmdwKHr)$nL=B_Dsm#FxXb7em~w5mg}i zpM_){?R26v%c7_g?51H@Bt>th6NcHS-|vsW-lSocCqeR4=U}I^TlEL168e_WUeMm# z4fH*kw)QQ-7_(nV*;|@7Pov~vu7`(^n(P!3rW$@OF;`$0?i0@8&akY#pcA^VtOXv9 zHxIdV?bZPstQ&uJE<2m#zqO6X(`jZ@Tjj}(?e5(UN+U`jtfBb?4{hT!G02x`Prbb-iV z=)(~LCLb518ZOZ$c*M}3tVttdUl^~b-T&x~TcvA88cl!GfnI06kEheS#|KVwE}6~2 z$$HE!e?I7M0l*iZOoh89!8i@5p=xOz56HnA%>02jSH{v?c_fWVU-;F}#pQKIJ;J12f-j(YfC}>XdL2_>2=!67JV4+GA z^yAoH$@nCX({IR(zj~tkFF0P~(OjJ;*Uzv|l|Ne(`13cAq>a26uqbK2n}&JR4m+c6 z67B}QB24;uw;grCq3VVGpx5p$<;y^s&c-agwC;cS4`iW10O>R@y13A^(VNUXJF<9zcj6j0^_TmY01+F4$t7`ToGh9o zis8g!sOT3)=%MJxkII(fz-|1nm{Am_c}O?!QRbJPkh&PvGlV|2smbUJ2(5mSTe01V!Ep6{DfUGMAHwh-RDYr2NhJ9_kb&y?*x zP63%AM#Vf_I((`K_v7L8dSVgr;-wO84+21d0mp-#@l(Emzx)Tx~Q$N&voQbcW#i z0V0_<2dBzcl9(<2R2$W#2eB2u8aIU}Qx(l6r>dPR)bOnmnOnlD`;ntoVi1=61x4#SQ`sWI7MNq8Kt^1rKgkJRSe|9mdiw70NKth{Y|5;nS$lG+g~Zd zZ;Xrv#QgO~rE1W>XNnOK+G7Uq3ygpFC3xD0QJqyw7wN|?DUu1-{Qf= z_wy^im8CIZ4YE9@o}2*t)i$X|RiF-3*U^jhTK!W@_7%~iwTj0^-#6y(ng)MXvDY-P zIcsf|jo7+vX2R!e$t10|>zEsSI+INaD{8|+(36Jgt+t)=gkV=GVMq#&1cvdGMQJYr z%4aKp7M9J;O3iq2#L9S+yheGwfMtx6opO)=2LJ&7|CC)p4gw(zJo5`~9{7S6-{1?3 zS>r}yJeW<4*}qF$T3TQQy%~QAl8@lV&UPD?8EioJ1oY$waR~$QQ^;avW3ZH zL2+B|TzP9W*8M@Cnq>V4T&XfW^g966jL%ud% z(x}@)XGqUz0GY~yE;w^08p5Y)UO|+9>!CEyQd`;usT%q>PHVqLh3Qs(n|B4%Rcj#f zyV0sX_$*`7E2Q77&{cl}QZ_|ZlZRmS;N3E%2*5jMPG?>h zPvb@q|6KkGHxg<>9*s>%oWS+OwM0eYR8;tIYLQ$gw%h0~2}(ji<)807_hCD5sO1ZZ zcgNYs?Ck8$Z)Vmr#7U9#U#;PY$=H%VF0Q8EDSjAvau;4HV`MtZ7t4 zvjgxxCs$29PVdK;eux@Mby`u)RFbsJhJ-6-EATx7imb>HHLj}@)!wK5n&GXx3o~aq z97Ut?8hP}HIR)8}QaW1i)>gi#Sc2Ncf}%8)xbNJ1;1D9KegT)1-3D={VsjmDGXp?a>I9Gk!@1XST{7wDIYW;whSX4HQSVq<()XG~C#d_4c;o1pQ~ zt<>^L0p29A!jk!4*k$JfyxB`f7jCApa5iN_W_O45-(R!cI7%p(LyV z>GUL*mO=`DL45V_EePr zR9cIzbZAKGl;5+<7VGLWP%0`96=&JC4*T)`DCB6&+Zj`r5W`YRTDf3{84Tk zspEef92}_FPj`q(N7~2ZPQ)%0FA>-aPQM^HT7f1(wqiC*Ul8_={Y^ zaKeBvAl`P<-xOpI*QVjCb+6&~{f>bXaHBx~21Kw*Rd>7-@-a@oAUw;~kf{Dz2iZ7T zrcW+-mU`LtdYPEqD3$JZydPD-!(P65yw{Xl%{_Hm!PA@)4nhsN;U~IQhhm9PScHFL za#cY*5BW*HIwPVW;cL1-koUzq{9^dlDFn_&U#&8mx^;-Z@yMC)fZ;i)o?9+sfv+*F zFQ+uWuhfWp;|QZie^%yD2sf$Y1fT$kR5LNP?Ds5L1#0Jy=ZtJeEdd1+Tv~J%kA@b3 z_X{&R7r0NLihBGUA(;#~I~9%lofv=i*Zz=kGUcDBeRt(m24%9hg-of-wi6g)8M!XM z^q^bP`$~#ir8O;o4IUk|YYF$P4sKQ5>aY${zyeR{7EV&D9q@VMaQpq?_7nXz+zwG= zPSuZS`8mS|sEd<{gGeJjreu&|c+vsIokaXw`z*X_8kIBL)BNfkH1n>}ngoA`%Z7NL z83rc+TQh9A&Rr#j6@nL7l%2A4%uXE+z!IHP5VAj$I&VC8x10+ttKTTtFIT+|WIo@{ z5YG;({xxo34)E5RFJ$2~{;$p+*C0vIGk;89VqD{z#H1P4ek3JK(<2tpKejvEnW zCZvr5au>wi6=1s|a_~LTSV}5nd1zP_S1I63l86ilJxmWdhSA4vKp8O?vbh7AD*>ck zOG^VW5I*-`gr2NzS5S*0RuF2XAXa>!x3Z`Ug;JzN#Y6wQndg6Ib`!hmsfX?+nQtDM znPg@Q{5ZN4wc=fp74z37b3~yaiLk@#nqx(n|2eJ8q}%h$_WyOeHC@9xYj7O>ZVZT2 z`F%H=+&(@%Sow!H;Gh%otXz#YbQfTn@2AtN>Gfqo3C1eUrSTCvfo!A{D+e>G29*St zk$XKJku~YmvVDJz^ZA0m1a6r^!-3afMikko^OjXhcWaOilye_*QY06P8LcSu*U1{? z{bH^Z_7o4|NpfJID)5J$Uj#EI_RYllAF`IlbHkONfA_j7&IVl#o!ObzX@{c;X4oG* zfK7zVsFAw1pZRKuO_RlhJTG4J<@+0z>lG-9CyvJp{9b=Afj!;&g*|D@?m-)oDJeJC zCD`!~uMb)p`YYB3@5(r7?$QIw;sB$nvlO63H|MrPwH2jSod`J>;)zO_&dK0{@g?a{ z!1&0b-)CyiB76-9YiC(o$>Co4f1oAHN?JN$*L!MsZ;UL~Wu*{JE`iz|fobItf{f9Z zpLrc3>0EyV%gB;86eE$IVV;{COAQ9pSxOAr3#e%jQm?gcrRDM!U8DD=7!H-emAsjZ z{AAvN%sNs5BJ|tTh9*gdkQ0RAi2m4<8XS{CrL02rHU0dgYgIT9dyx4+hhPo3U^9@0 z501{(66-;<5082W9_{0Oi#E<{z=j04+buNcE@XdcMbEW6By`{GU1@XMMiTuj{|c;K z6(zL?WNpNXbCt%E$Ni@458*Uf!Di^DRm^KHJE z(~W<=m{T276=O^l<>mnic?X-+gH{+f?og(5G_au_#O8P!(G0Y|rCs1Fre4*o%o|O+ z%$G6j_9LK|QUj~?jCdfx!KTDLPE!bWb)0XXp5WHa#D@Ul0wySgyJ{T4dOm%>wzf`K z7VWAj0=$#?@Aj>t6T zp!&zw9&pq#Ums~fy-`h3b7_(YD{4*`tVbU*nS|gOSv2pgrbkl2v1hrdduM z5A$Jez!jA3X$7%MkQd4DNNO(-SWI2^mU50XjR0>_{}tnm6- zf&Z2mQw;ZmsSOUQ=?B&PKeO%uPXTiS^XZJ$oOnAYCW_)$-%rxmDtJ84=VRcM?L6LG z@~ci8(Kbsse6Dsu?8R%d_WAoLi!c&lfC zBHuiv2g{iEYKDW=;D0)uPlvPrXgHw5vZ zV=b~Ut0H-YK`49)IVXSB8#U|MSgYeK;5e=etj}<#Gj^7^YJH6eiq=*&g6JgN>o7t? z=S?*4r7L6w8+yf%J!tDI_jYddJ`2CQx)1|0;fUYq=E2(a7Bfd)yno1vs>D`qQI7Z^QkEMX4^1<*sdcMB1yc1qvc zkfqBv{(V(D;`VpXq@jq0nzZe;!nTD@Ag*e7$4)^Si4L0LmqwM5oo zk)>XeO0ST<7l%b8Gd~qklHJV=rn9H`5KRD#q$0aw1{;4GVMHT!x?Wb4Y^Sw_9MJ%^ z_2HbxK|aTB#P~OW-RM|3PQk=Xj!J++v6gk^Ga5#+B(4e(#zh(AK@y~OocU3dOCbu8 zi>ydxlGIgJUJ2m1(*}h08twkVb;BS{(@gkTIJm{#P|i&^B0gqPQ-9I;g2vdJiV=(j zp!``TvZ#MeT*aQsJ`9v5B=EiqK!o$hN7%4OZDy2qB!Gt&5I?ljV*CW z{9!s@UpjcBHW;90Ut* z7O59Rv8=N?OG2;S6wlPjOVT~1$)idk3tx!RcU>jnyflnUkqmp!u4E?Zokqwnrl3)O z(cFKe<^kVjXC}eSRSfOW$IHcHrGG${kO{L`QocDF0`2w29G|M4tUg}M=MbX$^Ke^G z8J)l`ed?wfNalx?U!+MCZb(beE7npvBB7Ozr|ZkLiY16l#PpQc%}J>DM08xjwA z_lXDYHH&-A!e|zpQE&#!043JEP6@Csg2#VhI56{xczo!F@{#) zjh(hVS{au*09LF52FLVrFf2*`;T?bC@Pf(1+g{oD)J+#mDeEc;yet&gFPOSmYrzac zykfP;EkIhK`;XZzbBN)%QQe%J584A&`@cB&!jSfyAv-1KPrarX%ho2}uQ3Icsu9ATo6dh1eK&V>egHr= zK(c@j2RPvlsQzwAIcr#*G!|IfRQf=ZRauPPXis^kHj;8ip@0pJMYLqh zYypRlA7i0YvO~jJb-2507tjLk;BwtKqXQgVn7*+c7~Ccux*z6WT3m2ZZy^8*#?XT5 z9fmloB=yGm8Vpx7?wBSO=M{CAp6I%xT)ScZ0#RgY>gxsxqjY~CiUb2#!mgOsi9 z+{7u){6cNv(EPi)gSm6y4mk9F*|(AvA?(Vt=e`a4YU`%1QNBhNZl;cLM(IjWGBKi3 z4T3(wKRePJhmnMFwh=Hmua;76uujU;i@d&)|Jeh+cpyZ zocs#ZnI=*r$$Wot+Duhjc084(jOEtX$@mnK03A(jNhg2BvD>@;_uIuAL5i~FM!C5U znTaEb0GA-JyI26b&*pMEMQ}ZkD#_$p>!G$Qxg(<6oY8JXputgXqrD_))=!BdCW$>T ztK949kMol_A%we^bC?a6s-?T8i@VJFmSB#y`C{@3bmAqG3QUF7FXu_d{y*Izea=yS z@YNl1ojZSI5MNX|d$_`eirQ|$k3d(jbfc-7^Tj4b4`}GbyXx6d7;CSG_)+*>BPPZEM@1BQ_n?fNtO9&Z8d&^9N`HY59$+B zqf8X1PuX7nKEz>b7u4;?t2S>2rki`(E@hR= z6)Tm01;S%>#vL5nc&4{}`cmJ>kM+uTuU>!R&5{?zV78anP>4#XC^4UaSDy(7+k0}p zv8%kf87I^|xujDzyJ6G)QtAa34Okci_4}odd#JIS>UegY)1#CSy(p|~I@pC}uQ3<2 z!k2q@d^*s!hm>ipxp^Wmx%f?lkw89TSQcMm@5)U$n0PrgVV2|WU1LHcte)G($2UUVk^Grz7W-<@jjI&vT%QU2mZ!5 zxh-Z_Q1iKbXb1jY)l?CfTdKiEW$ghhx`)5s;qmF{?9IU`X*`FkVqmbm{Tlxt3tGHp zzc;9K!)oPE3>!Ea_Q#{){?EO$Y7LZGtgwGFK0Q8qb2d_lU_6+GKjxr&))lR8w#f6G zw)C68V5>KP?(0BDj-^lZ^Gtsr6{*Xj)pn_K;5yb+9dBGNY8&7!4c>>qf!J3K!FSk0 zE#O|x#BIBbQFS~xJ5|kF6@;l+M^*ToyL^KneX3#e{|#fy0o^uRn@n6{avpUhF@n6qQV2 z{Kk~V+Pjo=a#>sz(Ta4+3?$TWIVqEqzj9h93mJ4P==_^$rjC83vd7b3DG<`bvmqxm z>!NAIE-2~2(G%q=v_bITS^?#mqtysv4hy@fMYgU!vNH^r{lY}^5-XU-&hAdjn2%f1 zgXd&4{^@vdK>mZ@PJ4g*;(D{rF-H(m5Kjh-oH_L&ATQs{Y^VueB(E8cPY;HJ{%`Q0 zA%_U%Uk;Apk!QnGad|L29QOOe^Ol&5xy-8RR&+v66`-N$Zt;7ootL~Q;Nyxhtq;T~ zSq3+Aim@-($y{xb$&P_5bDmPhjASXwxV@&MYWP*DsIX89y@Y==lce;VS=;f7W(&IX z{1iLArL3Df%wx>^tyMHjKBlf`SKkshrg5X~axuG^FUOLeXo!FURO4(b*{&2jicB;}1xK17uw&rkX00 zs4~?;Z5H)OcX4c;z+YB8H{-io;_E2)d(LN_6BFgK4%RI zWlfultmO#ERc^n5CuedCj7Lk2lF2DGj3Tuf(&R2L?=Z3hH~>Gy5Uh_X+g3c;oy7Mv z6IhW=f8}4r=UOe@4*OujgF7@-}DdabQzz2?w_Bm z3sd$`LDWj!4ZI-~J|uGn88q}X6^ju2aq_BKQb?-00+YVM>8fE$a0R_8qnGLG1C3d6 z0jXL9C_;ZjTZ#&-cY%IGS{A0-*JO07!8~=XXuI&)hm)>I$os@<*&8;)f7uyN>fh7a-mRM$e|9` zRz(P^LWkyW3HET&W7u0p@Tqi0X^FTkxmArD$^w6yTtqI4qd~C?nXDX=>k}_EZ{AXo zDubU3;ri!g>FH#bIISA12Gqta-6#T8AC+lvRP6Ku^tSXk6Y6#%uDzRFl-CIr2&vH67N@l`^{>S0%AK(Ney=>^QQL+@WE} zvV`TX$8z5bEt-Wv9@uW^gfa8Nd~5N%j=kpwd!Bs{tX-EciSTe8wHo>)%ohyi)+PVW zaXQLQpi$Fw6;%GCC?sm6kq1RqI=(lLCkB7|bcP2%^37(IWgDNsiOn+ZMnbtS=%nN( zb}F22_K1dL`+PsDFX+V-dDNj+&KxVHdFlkm+ssal89Nll2tN-RFosyuQy9sQrIlqT6r!C^%hW_nR9-8h+lBKK-6xU zFM5t;qqFYWFC$%E2D+CtL-5A%7l5jH~%?e;=1PFY4X$MPaOh$6$&7u?pyB3>4-+B)efh!WD;s*v-lI_JRla)YZvfV&rvQZ#%dkcZc?acy_SDrN8 zdd#z2YZ4jrOxDFblh2QNCL6~*lXWrA?XAQ-w<|Hv+aOwMx^M}6rhNmInxc+xC)9Uc z<}n6FQowwWGSE@Ble0H}&FM7xo{yuiN>V>iAq<60Q$cKL1O?fwX+j(^=u zP@&m@^xV4=y8@gTOv!H-U}w&5mSWkbqIDzyxCnX@p8cg8dHy5bijO*f#sGCa$rcIv zr5SeYAqVSDZ!QUM>t-l7Zsa*&lg3^gxT#IU00trtqBNp5^D_r1*@4Aeds7=#_T;Y6 zeWQEK!Aeb)-8*K`kc4?rr;{^Sn`A6VgUzhcD#iQF(Q0kJ(&Ikk@IMFY?G4UOe``oR zgKMs8hCUDhm2mmV_3YDslRKE?pS63(gI~LSxRj-TKDo2uTBk1~2gYKN{}L&61*^@a zwe|!iK&ag!_}8`regEq1L^S1KW;$GRz#3xa4sfaOIBuM}R+PuN6|gvTU@ej}&$k#2 z<2-WwnE9a=tHCV!K#pct6bJ(Ie}AdIc5XY93BY)OW^By8-D_$fRH^S4otZIMU|zEBEF>}3870S zI)UQZ32xEI(8$+65a*wM0D|*Wc+*35_1F%_7=bp8(La<$jpNF4%Jn%*M!JP7-_63SBqx z6AR3v=0k*1-=cmRdO?P1D}2x{h}cK7)S|HDjB;2BTR@6`uG24Ktah(4U=am&x6C!^ zh81-zT$YAO5X7+N4fBX*K3I-xLIoZmSXM3%ROTSyJn<6zFOZhGa``U+00960%pGe} z8%Of9^DFjTNd?(R-kp8hcUL7q1TM(d39x-hxwd9sfDM9ZAwcT#-*38mW;Cl^fh6Z_ z+f_oEo!3r(_w@Ai)7lW%gYDr6h|9;~$pPxyF+0)6RQ&p*m|k`y^8p;5xPB%5!{pue zp=cumu}p~d+dmk&3>^J|5dHS#hiQJdY5g$G?ugiIE3v&qV#40KS2s?cY=6^x(!5Cf zrCXR*a^2}sKa}n7%8JlKf$WWO9}$8o2S4gUkCE|z3NEUmej#e{O7C6yMETHGV1Z0q z3dE(U8?slkfdNuhYlL zA5UuJ!if8V6qlUNz^YtK^CjW=?OBd)g?Q$}I;jJpIz4~#JrkXecitxlBZCD}1Ud>b z$9HpoJ7$arId@s$mNw4|kNKgS=AP~6QIQvgCeVAmfAy?`8|&|!J0{yB@0j5~N`oWTEePx$Ea{Xy;+!vxwU)bF&B>rpqAB<7~zK za>%bSC?*Txg5daCkkPe6wO{lpEeKIBdnpKwa#pq^anzZL0C8@mqE+4;f*MnEEa;Pe zssOOIodJ+e6)Wdx{2EN9 zWosk+>TobT92`jvx6xvIuRlh*Y?N((?f;ZuIecIk*V(h-{?5+9fF3(6G{w`t5>G3c zfEEiQ;7C+FKU3JRtuwuCpQ^-xw%NXWY`P9}NEq$Aps;cjea*p5@1#h`18^phR%xVp zb)5(fvciPI8(0;6&|YZyBJ|(E6zZ?Y9~=jK1`$O!=qqZz8Oni_l|i*>1wPn+T^RkV zBS0-G-CjaK=o82Qc7G`Y zkX-P)vx}Px$p_5{gIt1#UtarvctKC#(umB8Sd#rx94VBdOdL=JMBhPYHVSeghabEj zfp@~Db}bWwot#Lox~e!SxggTZ(W)$sNc|hQfgNxzh*RPFyeycTddzdZJoZaglz#=S zn$f3TFAwdKa~AOQub@>ol}0%Ty|7xLn(BZS6>_N>ZkTC6@X>G&WsLT^IuIk1J?v}li+8HnqIVIf_R79$Hu zLUXel9UDeRE9~b6N=prnL~K%j>6shD%@QXYc0mq{TC=QUx@KULAXqhZ263&gQ9e+C zcRxSJrKn^W55a}oxK1vKZtmfh|wd(53Ohpy8+V}>aFcr#80{q4PEe>gf2^A#wv zX{Hb+cYZ!uXY;C%ZnZru??o0Mv|#$A{*uPkAl;~}=W?bU19{|^dVU+U9HRK=n0odC zbn&wY=y>o`vR4+mbW}C#!A=qrf>caG2Y8bgneep6aT9*qgAxxG8mR0YUB4 zAauOYNlT|JVo#h4smEDv+nyZ<%r9&|<=%>i0jS4zixh5QwhzWfzCH}1ns5wEhep!^ zvi-ciOy2%77{56ljRs>vDRD!S5BqQ5vxLM2Gh*xX7Pl9-{qfO|(!+APOj{iFHc-q{ zOesd_P*7-x^xiUm+fORE+j0xikX0N5zF>r^;;zVUP~-+3$-6gpz{GSY)Yc`?{42PN zG0SCLydBFuy=gH&=%!-n2X6=Or5JD~KW8LtyX3j3=~{0`;)Q8{G3)0y;~f<}4A!I3 z*ujQk1Zp?=XO}yo+EBL8F%B-vx_h;v$)`CkvnDdfWYiU zc6HM&3k-H&)eJQz{iEUBSp)M+)!)M(#ApcWG+ z)p}_fwIVQ}-!-6NkiG|DVbmkGK=H%~5sVB{T@@e=15WNKoUb4`&icchr=T`@x_5ta zIr*uW+=!d*Qz=(9tRXjw^bU<_?t&=vLf<2I&`cJ3o|i-F4lK-7%{cUeBJev8Q_t(0 z2^^V!?bLJjP*P8a1>y!-dQRHw@z~BwH%`OoVd`mg(oQ{%3dktAcasGK}HevLrg z?jIa%^|yaUzpUi+Hse>7;L>F4<-4`!A`RE=4j8_5FA|%RnXu_{M!YF6@tHiBwIZDbjzo?ew3dfmm$zO>b%lu@z7AO z2XZ{H#%K)La?ldSZd&!B=&k<5zo}r>KS2>F04yhdxfsk+cvCy6x*F}(JQ6~Grw78Q z^fNn9SJQx(4v+HO@AVwl7588#E}g~bvc^D7lv<+`6n(Kx*Lp5K@x=p!FYIo zC{W5Q(#MY~AM)$dw?&pLdM?X%56446hRh-Z>K)Ch#~Ijou`()iw@4%Au)+z_EH9!o z58Tl4!`$a(kgvh2gWSd!ka@|xmp*Ib)Vp9G0veMu;OI!RX9UA1!LNCQ7!qG}GO9I1 zAH?i*3NeBu`KE6Z{HjI$BBnEwcQS|M|pW5z`Z@#l;5`Ak>!k-=hkqa$q>6HKY@A8CPk5hVaxSw z#-NBX%~l}d6|TSwtp;y$)9M)z{sk8zia)$0mtE#jCe8*Pxp^G$tZ>RQj7lDVq&y3` zz_Q3IgE9=4R!g^pty@?}nHYLu=(`awy&{`&ZpJsS$Qq!gMeK3LM*hWAHp1}t4TLo^zWc?DWFUj^9CGH-%*okJfE5srfoHFJz%)R(LXbPjUb{#K4PbSC zro8m?taQR&FL1rg75`&rNkUcY?-62EtBXvp1J*LnnL`o-OqflU%?Sor0THy|Br*7g zjDYoKbhJO*{{@0d2{3nm#K|LrYXzJb*?$f9|QCJA0ljuq)o4#Xu}XOSn#?;KQrU$vx&UvhrP2hp{8 z`BgxcX{AQMR#95|`4>Q(l6n(0_q74qI)b@Gf07KoQ3v-I3e#7iK%h?Oo(rCH{%ZY5 zWp&j~3qQ|om$|*3o0g893%=i5i58iiE=7>c252RWmVDyVaVW6#`B|DJST}*X3Di}w zWXSs+T(vgU#+|Ew4sH}vey=?NBn1GiPtxDn5x~I5psS;EVdnm0wIGtUfm_I|lqA#; zt%y4MZvOZ<&vh3Y3kK4AK|6`GVz;VGTi~&}g!$(1`VA2EmtQIHo7Zg-VLRG<;841m zE`&aDGrf!?PpJA8ClRQAS@2b0KV2L6(-omV{l9^~3D)U<46e^tSO*Q-X&tsQ_toKE zU!2JVwJ=t`nO_`g`Zlo!+;rQeA!m&C4Q<`odn~(qXYWB!p7pTm9;SO&Z4XBQ3Q}!{ zQhrhb5wMeg8e}Kyffl7sCTJPiinB2K^3r;kRNyGmD00960%w559gdhz4oqB42m56%o>=*a}JJa#nOovNy#eeyE`Y|A+ZLdiW*w5RYI7UtH;$W!|hSi63qye24!#UDmP8!P526DdtMq@`CQsOO)bxeP?Pk=(B z;BkBZ71Lj60if6eK&c6UcU^$81e7SN?)I;vk_$`g2it8MH#>bSZ#U})-{~x>8*Ju( zy>2jF^UB&O&iT%3^}f7!l-Yh%#r6jP0RR8&T}w~fKoCBgUtvW>ikpClV<^q3A*Cg1 z11LeLJw=XfXvo8<9jM{gcV_nO*a@^zFXe*J>}Gc!-^^^J?6-BhI}ctT?tOi@_rH3$ z_r~rHhTU_!itWH5nXNOBL*9xfZw29hTJN;iIqMTYm|}GSiDmpy3CG#5cll>^61UYQ zt}jpe7wwOo_Tb8TSd5a`4+B44hUT13@6v){sENkF;H>-UYS=&hY$eAuz!E5r5;It-2+p4 z$fONZdc>rzq4)J^XE?wgG&V_Y?WYmDr?OAaonsv96+f%gKP-~?78&n$YMi`}h0xJ( z!Gqgx%kV1pJq08Pm%#p`5W2&rq(W0P?*X?Q4FgU{y7~I zf-qXK2BMbJ$Y&)N&SH>>O_%t8{e+%kXXF)xzZy55rXDPFB9O%hL6)%ufLKXGA}p1n zDPl^Ft?*Yw>}x?1r)dEJh>g@_5A<{zU8~ioRKfNtzJ4U5i=4Rt&$o;@W3!T7!oI~!^ves;y&cGiR$4d#&a5C-G%n&ODe?s(NDu4 zNl5+}MFs{LhyUuA-Fiu^VV^9qbrAd7*SpyQW?^UKvly247cOI(_I7H8 zh-+;yzBKE>zVnlo{c-$&m-*>_5R!e)mv|2H_$|H24}M^7VCX~*){pa3aq#= zfFZ)%Sw02x+{8`3?lIofM@iqO`5UU=Z6sKVW+S9fyvgf5N( z)%ssnL-h($;`GvLw?5{7UyLwpdL?QVH#JY|nqb=nzEc+K=Okn%v+)rn!4Zrlg-ZQ6 zWzU+4at~q9R@!EBEN()^`eNrT@6*Wdqld(Gw!E9WZnx%tws&hf8axZ2_D?{XJ3au0 za)=aNNmVX!9Kd$zl^*(dM>1wOTRt`Dc9;bdPdoX{<5Vv zEOE7!!HqC~j4SboYcfZP7Q=7b)YRKXfQ*XRTu$* zhycQ+&j9)hrCuWBKO)K!61;6RkkN_R{vzmkVhajFL4efGx1y-!3fF2xa$^*()tKb& zIb5rM2_CIz-R!{;(Z*y%v@t0W?ds=(JV^$TC3>w!5z&h^04gGVwT7WtQkq4ofl-nn z$*VPra4gp_Hb+{nQ8c2vDU4?#8goX7;4B*X1L#;x@@$ja(QsCtdaC?+rq z&ZJ`WaU)`fo^VZGVa_6$AZ8ID3+8amQYB%Xr5ddt0K8kl4S+BRT*ZeASibIJj4zYE zjQdBeRI$_wZQ}qIIS`P$mh^|4$l%yRi2cp5)N3e2ej3TPWSPQLq$^aLK}dvuJl9_d z6++Kxtpw;b)gams7)=PG-?P4wkWF-9O(MJB=t)5&G7Xrdfoh0=*bJ1Ip+ub|LqM4! z6#xgpEAn3|ZTe=Q_{G7z`-E+Cz**NF@{q@)WKb}V`6t`%sxIU<p!Lx!M}EjtP6p z0j~syBuYpkz?K)#Q#p8k7ODxBl93hAFhv3Y00960>|IMw!!Qg!_g_qZLr5T`k!~w3 z+$J<}83<|Oz;WG*HUZtCD&pr8+es6*S=UzMA+!_2$r9Ij%*p4kR+6ac6t#?Qt@LbT zJzdjr*cbNF%}@th@~sXf?3uG<3HfF_Ou@pUa>-a0Z9XyeBi%!MW}YRzJk99RiqI4y zLA-2L(p#7zy*RPLzq56JY5soaG($|Ra!1?>8{-*j>d~=s-KO|hvb-J-<1maD?eMWm ze-=W9DLgJt7-6#VdT3Lj9Ld@92?kI%{(aU@zoG4{G(Po)V-=fPZM9lPSBp>tQ9G;g z&KRf|Xi$;rTo$j;Jfe$7bn%ET{wfO`lFxApH%UD9`eZj<8j#6LVvXee5Kt2L(ahL0cbjX-LvBmqsKFcB9#a^l@@GB{8JAZwqtNOh4a6Nw=9a zRQ2I$X3p9+i<~ikf1E(M724 z(#Y^TDvUo*R)()D>(ieh4iBzc{8x2h3S~c2n|3S=?HC|`8hiwR=8fu54ce%(piZBQ zp;djo3OF(#I3&*uLQBwVN6w=h%FGVd6UN!E#^Hgo=o=JjQCOW)Y~Z0nJGSIM5oBAp z1R;y+8Ptac^?r)-?MIqGd!J21H;rj;ItE&}uS2Sl5#@!E%KeFB%ih7_8@yt{Ogz_t z-LIkW{;TzW^aTI_|NrbLiXXqU|fn<@HWTt5sy?(*iVEOM3 zO=-e1k%)vKJYhdQ`@fPgLl!LG-B$_eRq}5dt+mpIpsiYwo351`&AKS>Z<6l-$pQZZ z(z5vH;X@w&3ieWFaMm7T#=)PZ6f<=?$mhI-I~Fg0{*KL>MG7Bsy@DH0=9j3D#YS&{ zeX0g?ibz=SNiF!aeHie;PM-?+5T{QKeCV95GJ{48j1@EzV635$0wb3b>th$dKo`KE zv6|3ZM%9e9tjrWuGjdsyaMVh>NY)SY@#;V`0!fYU`lo2yN#J2O3e?)@~dXi)iCqJsrivuezhV`njuJP2pS8)C2ukcHSiRlU<&k6#5|l1 z=kD{!{S|w`r>|l=M3L1V!9?0G#g<^hL0_Z{UHlG7UWYS3A3q`SSUhJmHnqCW>e~;s z1>a-yr6?5t$u%0f!mjLd1O%S;MZ1$5P-0G&IDH_xVmJSTW<4k}~H| zI?6Uquqa!}*4t242JLd723^z z>C(e?8)1jCc~IzwN!wjTX3G1BtK@-j1GTCZ`cgjccj)P<`&9AM*IyG-lg9MVI9r1B zy(lvyz|XAdb}c8h2)lW_&T@PC%hkIJ(2O|m^Bfi;6k>C-X;yQ8`!g1TF%6t*e!tpV z5vx9qoe(53sF?Xg$5tKVG6hOQeBLGIK#hV-9YQl$z!)AxmuGy?h7I%;t=*<7_@+w? z8wTr5N=l89m%!J*{mptC)>G7RXeq#22yOHF>_|aD2`s95g)9g)W6lTo-jVws!JvV{ zWJ{zXGY*}HA+Ps;U{#r=88ndu_Zkc~MpmLNg2#2X!4qz+2RitlhdFiRWlfj6LzYK^ zXbz~FU$1X2LLy_vD_f5U7^mLIxY$pqYd|O4Ic*^+FpE<=)$BA6HK(xi#lfOQk`yNu zW_JwLS`x~2xN*}9?r(In#;AmIgt1(kt)gOXLXf4h1a-!0g-BjLk#$_>O7G1wxV8T(ot9r5!1mqU9v5;CUL12%aD2`M^954 z58R*VOyl8yCfdO`h&{f|I?t&d-WlpiVTBwD$c7$zOP%R@^%iZ8hM}foa~S$Q%8m-r zs^AWYXt;dWunaebu@6v4DCFj+JDK97ev#!f`Xv~{Xu$)`Z3!T3t#tI+FE&KQ1YN_55~dV2c>}{ zU;wT-wGT_0wdzs+PHcLI8_i2H8nNba1J>NNtIDFEW*zC|Ffr+F*SLR^B3WqNCdhbS zKFvMv#xAde^@bT&L!UHIjnBb#!VBNB!@cBXGd1mVTJ){2t*Hjp%ELWq>HD+&gEnN{ zUMwYlwbz^Yh8-PH#m_s3@7mmK9bmy)8t}cOf`_D}qHxUHXDsCivW|w4VT-WpmL5A; z!?C#1(WnNVHLmxh>X~TLdN+LH*2hf?=?OEKwByDT9OUtBNWr3}YjeV2l!?h0#ag|K z8V7etPN;CDM8c4|luu0q;s>4}T~xSdCfmw?)e@4r>KmFWUOGbbX0j<6nI{xgP~!~6 z3r=;#O&W#sohm~VmtPc~AfV^-ollXa)x2|PD(|Svo8|ieYTP!V81ngN?MH(C%9t(q zp}ZMX@SO>o=UWp6-!(<2+_vGyFUy5XY|G_6Ubvr~lSJB4H=$|Eo_WAbuZN<HrF?Ek{o@!0gzq3207)?Ntd3LtA8mgr4U@gvs*MUTk&4t7=N7I#$gz}^7Q9iQNKTX(J3OjZS8(YMFpDgj1u;b}}!p1__ z@%0EBo5Fs*VM!cblT?ztAPsDjJ?^$q2*eLt-h)m-i|U9_6-|sw9eh`Luv)xZwfvr* zz@nwPJS=)t)WRf<`+XAtEg4z~2r{6pU%RSqLx;lw>N*7t0 zNiqme1#H2+`YA~rY#65;rYAgqsllgUT;akfuTuUJ8zexxfT8JcHP06%(gS*U6u-&6 zDbZg9oT@uH4)JjnZMS=?35|q;NF)fCtnK(@8sd|J2D0sZK6?2(txUD+p|l!;py4U= zP%T=5_(w<+NhZE^Lps%WHg_iIH2>dx?ii{+I9=K7?aj#RJ|e@jJICEXhYha!N*kqCWrt0RR8&UEgcMFc5y;f3Zgg z3NB4k82GrifuO!i?aC0{9H`7cf9YM4=4#TU{$d+@oJq9bEnoBH?vis%=uqu};6!nZ zsngdz7l9KaJz1IZ7~}wdW6HO{`fl*ptNyHK7Wgz_FbP|{^cH!sn(sDqZC{McsAy&1 z70s}Mk&UB}I#=D&hvdcz)5`oeHJCo!e?x)kBS=u?&^UNWmFpoabWESLMKI|;nO%VQ zYAQ8q0py_t&=%P^)g5xSUKY6n8nagYvou)J30fKnjS*;x7h39nfW{*g506$nQP4yr zG)|zUUTDGrO<1Q4hcU+_gXa{Zpk#}e4>*HV#pEGjZ=bKFj#-pNzE`Q0n(O#PqtU$_B4xtIW+zt_xri;+5MCco@G7w? zMYa0sEhc}Iob*yq02q*OnGk55_FowS`K~Zi#no<@VTyYm0vGxvs5$zlF8cX=P?}KpM`>-G6G2 zpv1nt+tA)wq5zSLN(Rd9Mzi!5%tsPCY*T)Qlc}!$RCAIwS($pB+{+s}xtB4l^wjrL zWW^2XRmqB*ZR&@9Jv3XoPGB|GIe}H%?Z|o@+g$pitS4h9a@}JC-|t+6%&Z%onc0?{ z%4p^&sE4e7K8{{Saa)*DYKGfMliT9AaoZ8e{b%^4mt#*vbs38Go^FTZ?YGY=t-pB@ z<|o~lpPbG7B#QY-nE8s-nQ^xmQg45#jQ$1y0RR8&UE5CEKoEWAFZ|jTsMj&5imFPK z(h9XwB~Vq~kV#AlBqX&%asR$MJA0eG*kA~x60fm;oxRS^?3tM}F=z3pc@7)9j@q5| z|8HZ5owokSeWa=HJotE7Y*t#^e5g>naHA;=RewO$PNJ7~x zt0FnrKaoKB?Zt#&^)U-l5}K3=|Brc9x@6-{x*TB~hj0y+!i9V5X#d1P+NDIKrX(tV z?{;2)T}cL-34y~ifDm@`ZB6s%6f=Z8J_~E z)Ed76FtNUv*kEfRXTtL^d-kJ#XF$PP@+=QSw&a}_=q`Ia&+y}T9D}H2-sXq&hPGqD zrGqX!HSap`@U zpJh)*erEX7kHx6rsC-Y(icRIrt*<5v>panis^uAMep`G^yE!(XuK{4cS>EWF$H`zE zNXe$Zc)=N8aK^R98N(ZS=-x>JnivmFkm1Tx#t}cHqd3#JH_~~NwfQz93Oiy0+G;z0 z=I6{F?B~o@qIRjDGrO1CWp`A&tV`_rEN}DhTnJonQNdZ}Z|8rfE1~_7t5G|yB)N_Kpx^H+A#?V=zQ*V>V zMXsLc%B$2UX#nFg@k2qB05?};6Hp`*P6(1pd*?E7J=c;b%qwJ&IK74zPw{nsSsdJw zN%1BL^RZWbT?{c5J;zdl0*o)A2rW40J0!|34m)akz}ch5yXU`HeXD@8{gH=ll|J(j zwxmYQUE%D$)?#e8wTWmvau{tdfivmEoiw~7W$a{3yxW+W?T9}Fm7vrY^b=`VOyvX3 zPZZt|ViA@9itygbDI5i|mT^UY6@v$ae9CI|HusTU3m>)0%|eL-&I`=$zT5RqGY_Uf zgIe)H+Ls&tqT8qdya+fY-(P&Sfcry)Mt}cmsv%06BM5R* zoJUfBY33qoC(#wB1jlL;?X@3vOO&2_x}C{?z@UEABItJtny3(bw@7w>2%7ld^S8Y( z$JCrKeA{=*>Brs?I+YZyE#!}m?(gBkYB%nRk@_3@F~U)dYiY}vqi)0K=L zMNryaW}6{7yd=qP3@yC0=dI8be8?{5)Q*LC$@#S; z1Ou~gQH~}Bmv3$sFX3u`D)U1Qm&puF#W5%`tJZ9Ri-pu#+9=oTmOz;#X(9|w8W{g7 z+;UShUW#v;*=!rGlINwYGQf6m`K51}KYzuW0gBN@Q3Dkew4z3{DXEzZ?-Td(zzibqf@2?Qe$4s7Ez19=pO(80RR7gLPRv?F-9nI00000 z|Nrb=-*4J55Pt4|fsiH*X{!PWEFf)CHSM8NHBH+KZzxTmV@iS1QL_Jj_MPpV9or$m zSljVL3(ha+KA(NQ`@R#98NK{!&}!Mc@bx&T5d_mwRZ0luT528u)A~bQt(cizk#5%9 z_mWx}PWtoVeNF0r#brabpB+s(R~rtR72B+PB*jA>I6jjFPxQuBrKB%>!v+|{SfMcH zK~{I*!xSGBT<95l&@wns(J){36( zLFnlY=+wbBoz)s9`w~N(2v8MRa04BA9!|rG^mqnVV)Si)3Mzai^?BJ^Ol6piuP1PR z!Tc%w3DGVLVFGm_u;Q}CM@i!A1YGRKTP*23fw1_e190lM{}6B|cURsiH>iwr;I*(o z2R6zc+5E>y+X;%WvYOTok82K}%_^(uJ;s7q&27p5V&(I6knVuGz(&RY#a2j12BckJ zjND+1G%#j=9x!HSFg_J9!VV5c6x_js9Zg+77^6Bc9s`R}>6V{9_9BHnEtpq=Fmld8 zcMrlNfQB5-O$E^ISM>sDyp52o86?9jO`(*PMS7C04)qa0F8b0`Yraw>GjVxQVZ+glRZp-!?TRqSw`(y%c#i%8oV#wgA*}C zJv$XP`+M{VvX#R{15LJky4X!wtZcZevRIl0y4#i!qFPgvEAK!!l0ql)Dnb(~qnB`C?;N zySi9^4>K(cU)m)#^%ll%l#;rKp}&DJrxoMMYMnsJ>MxYM_*&Eb?qE zlxJ(G^TJ-1JzoUgqONlR`ZCNy?tXozi5C~IzJ9wFiYV}hl&p5Aj^W8mZ5DADY{WC8 z#wW|z1o8UjOW2!C#GT~R1V`4*YQ+F2Xl;yt%+it&jBLoGaErRl*r(f)QvSM<(QYT@ z6{ApX%U9LEF`v`e-G#w`?AC&$yk4wF%k%Y8J&Z)r4J?cpBx0Rt2+-^IWvQN%L1#~} z3F84u=Dn(OLMc^6x9qR)URvOf1ve$QU*MxG0+r`U(j?I;A^ufraIv?`hiT?56P>ev zj|Oli1wE)$S}=={HWFX z#mE#*RaS|I#gFt0grK4VI$^n<;)|0CdrFqVHuulz~ zy#kJQ$sVwf5j#%Yh;}nggtVrf!(QZnq#g~A_CO1VV!2k~FR4RQgOb9r{cZN?(Ncrz zwg?T!;{dXV@sU(q1H*c5HICyY%cKNBQkW@JzOF!;&|cZhUpb|9`pEsTQgM+zbDP~) zo6op&6&ocq4Ih&{-SAmEYX_|PtTo99Xbav~a4pb+R(8DQtvhX4W--g+9ol|>txnUi zoQJ(u2>2)lIM#J@m|8FsUC;96R=$nJ^bY&fI>e<#)d9K2W;#0AU#W8x^;py4gB&m* zlM!xY_oxQRDr^cY=_E}Bv9XVFL<0XY7nStVhp^r^89I*RZ0(LsJH3tf{_x9m&C9rX z+Yi53&v&u#$QKJc#4arawtwG$I*rK)GoHvo@uJOYQz8r)Ij5SEikr6R9CHrhNt5Ln zO$OeCVzIcJ5>A9eTj%A?=0=6+l~vWj!^>L{3b^u!2}lB2Sca0S${wNDEq@F(E{B16 zY+s`??N_q-`WE|@R9u1l28~tN4(sY&P4y1|00960?44b2+AtJ`ulp~5Pf;w6YQhfuV0Qo;^Wv(>=J0oa#c}`?Yud*kL}0Dx!E0;0jo=2 z4JW%>dG~pf=6~UZ7{WcTGjL4z@F^y0NNX#f7+or%#L#v!xY6Z zA!%RA;8>+pCI)!QcW8yl(JHK;A%01n!~a6(@MUy{`b_uPyEh#Ww9gL|Z>v);-{}Rl zvc{yig5A^LnSF8F(vU7nvr8x1ia=;iIMwEsL7NkyO5Q}xTVr*9y=Fg^yhAl_g7PNb z3rLl`BQ@_3)I3Rl1n1YN|{rv9k)7AUytJ(d@?;rC`;X^D6w_@o;OCu(FVqv0< zxzC-r>HW~rw^#SqHzq(jC;@2$$b9lFkQu}t8c|+|*DBN)Kx{pjLW|l-w5C*Vz!_qZ zgjVLY)4wQx0*g;{qLTL&L6~(E$q-g()O?hizK7a8srD$-pt=G@A6i>Cs=>n?mVJiy z!`P6HIid-u!Z8Xnp(@t0mrpWOBLyeK{DGg~wXa#KfEhc!y`jT=szcb;`qI^-qK;7G zZ*)JOxVUL zz3z6ow6#mPOQXszqZVTN8nskwtG2Wfc#_)qptRwGl_k(j)RvDMuDRtqwr83Dv@Uzx zP}^#oEW)m&{f3D8H-pM$TwF6fSN8^vYY;iXTanfNG+%F!9ayF6m2y?8H>zH$MydX~ zcn^wylH7y(_yEu-t1FEiq{xvf$Fr>C1nqrkP(?lv(9035eY!qkl=BiLRxS8WTX}KR ze7kAdCR9C`-S!FT0P$Ag0@)Vc8RvGDi00PRL)ZOgCZhgY;AD%7o2wg+)$uJRl&y}X zx}WRn&+~flr@l?M-v+QC1dCF%8uWx0jTg0l`pK)OJ-Bvf3Wq;~@-v@rpcK?)<~PAu zH@(^AFs0`Cnl%&nd?xlaphg?69^A!|m({{%&f3HA+pyxOVN<5@;(0eiF?IblDn}n^ zgI79*#Z$Eab;{OR6XH?EXqog5nQS8hj>*1uvHqTI*(oWL{fKVz$jt{oZEa9|flTm! zWi2me0z!>C?V>0NowuD9^T{g6q9FC#L{ST?1txCp21&xwn>U>xR9lfq!zIf6Pd%h^ zqDz#7u2MxLy9l#5$maf18QGG^z?N{SY-kCKYG>G<^Jhy~EFU+q{s900|NrcqO$viB z5QT3fnaMxBMK4hDW0o$w|Dx80O2LGGNvH+El?w+6j~Da8d`x>g(?^$_;XcY{v6{M> z@A{%xzv^Y?A-^=WI>064%*cUh;LUOsz$IBU7Y$rG(svWtcpZ&&6k2od#fa@v?pse5 ztv3<8cVLG-ub_^HeTuSH20S=KNNE_r`k+#@+z|1w?PD}GGaiO^#lw~duKW0Z??WEN z11`Ahg1b%)cb$~Zg4#62*XtYoZ#R>Za0gEmlu!(lj-mPBn2A|<3&V3Q4d3_Ta8Djy z?)gN;zACATF%=?9Hp$k@!xI1i|NnGa+X{j}5PjdTSbBGvbyu?`BB3H8KVolQLNiPs z`unEz#lrWQIdGWUfip*2{PMDYV>S^sCM*y(h5cOA8ODkbl&lTX1+nAWyNDYp4G-7c z;72b)BRn_WS`j87VPh>xhrVn(MbGTQ=yjmm@>a9HZR_X0XmnLGEVv^F-Ft=2ed;RI z@*Ry3K#5pIFxtKXNC3!p0FZ_tmWrm%efG9}ylAeQ3dL?d+(-A=zq#yx4FCZD|GZsI zkDD+MJ#T)6Z_REX3YY*n^iXv#l^Ut)$E^}F;AqjNY-EzQ`S+a}^BG`+t2UPeIpb$L z^JaJkgQ+Hcd^@E0u9yssZC!u)gp=Yz?q#Cq#TC$N%hd?1y=0A@aCcg|?Cab3%!Nan zRTXerE1K=+K7ZXZ5x=N^qeeUxBHl~Fs?s1`D5=t0dE2!~E-WkZH%Hn=L(<#7>%Pk0 z*>Ty7bDlg&rOxb-CC^|<+s>B0Tf6HxaRqmiP2jB3owwqFv)e#}PLTLQ24drKA?5vS zVt{PLvm~C!*KJDvuM-)r!w}km8KED9JV_ldo+zJctSbRh+hJ&bc-(Rvw!p6d*VgM= zk$O2DAqon%c&m5Z6-PUPqeBkNpd(cteV?&AyvN;&h<2Ik6)N$oYrCLgz(&B!vV5RW zVQ)H^tqJ`_8DxxpaXGE%KsL?Pc9mvs+vP)T=R=735Ms7rU!8j8kVK5Bs232-&Yd zvflM9l=blCtdN>fgzNbtvX0O?LTdg`%maSXKWK6MVf*Q0^zQKybPCmEnN@Mp8jx0OPNH&uxB*f+<=e8R;3JVrmX=FpkC8YFgWQs>EXy6e&0!1cNxH*r1nY`W{m z$NdH7Vtjai;07V3@k>&amAllUhXMHtxxqd6mfSd;r*gw6Ehw|Jpl+8Ilv!FBANLqH z{r~^~|Nrb=OK%e~5I*N$1W_a+Xtj^LB@R$HAP_`Ng$S1_*-c0!*r44Y(yBimzjyrF z*hxr5wWqYs#2(Mij>rByGk)eahXx}znH{1Vy_o2KMt^WZ-N@VxN9JicGEdWyozQk< zp2j2dwH}$T`N)|4psLU(s(?0eCshS!JK^a==AJ%eenKBI_w*qv=5AF5PirB(RG&SQ zIQE#iQnKAri1tNE8pTQX;$jhpi+0?drVFp#lIYQCt0bt2v(%yRN9Sb}`$xx1o?Ejn zQB@;U9FqyL*&*c>uXnQklP~!cH#;!gd-a-lEFPvTD1?3f{=D$uK*j5XFJ*&Pe@|&{UmM zlqOxcq|3H#+qP}nw*7V4wv8^^=(5pe+qN-%&OdW8cX_d|a_yD-&Dar7sD}g_pp<{j zRA>7@o(K0E3WL@RTWHa8#3`NTBDCs~prw)vn@2n0n7z2i{X%MH}lbNG);tYV&2i4jx z^m@zWtc+9m8^vRrPF$`%xfNEZLkJ+-a8(uqp7)&1mtI-$Brr)pE*da@qSL1I!Oe@xstC3WJKLolKd*yYVnnS=N&eNgo? zS+CD8bMzh&K|LM}&GO`1tC2RE4ke`vqoENMd)Xr*&F?uCT&W(Qu4iz)w;tXK+Dvjw zRWjYEu-M6aIhxY~=lxHoT~YzOv3R(W%lE22ROE|!6NMWig)NV%0yl#L_J?uKhaB+< zOS0l}#(YLy%R!R0;P1(`^U*r6Ho8i-{eU9yLrac$CQTVsl;y}9C5d^0T8Ui$rPEi| z)uUG{Xi~D;;H(Q$XZ-6!p2yww)nx9TsDY*wb8#o^)v5&OtOU8V#WsLLh6PTFzB5bL zU+5v<>2XY=cU6@M0ssS$9kv_`+`u614 z-yZADxbnSb-iXgaYSQ*_iKP19hHdN|>ZYpf98Ze%)Gd|t;Y9$u0(7yOijE|ss=s0# zTCf+n_^<=_La|tFe&Y!$f}&*ONjuy&NKDm?Z6nR@M9PX#Pcc_Mi+9 z!3AJZLfoL$Kl%YtLZ;6kEP3AE)uhY|p;+CW_*hED3tgr&5+fnxMBHF9K|aNETb3OcG zpTcki+87b=1|95xKlbCWYzyr#c&g%2eL0BW3Vj$q`0_YcQF&RjR2z7d?k@X%qJs$V z3tX5~D~W+IlT)kb14Au{(TT;yqM$Xcf`eihH7Ujtp>|=tR53_y+UStJ2<&o#nPECbSs0x< z;k3_OdIK&5wk{F_JjXzLGRcF?Jg5VZwl->)##i^OFpaW;zrGD5XG(iTKNn2EMD%n? ztD^igL(QO)m{dZN%>8HWy|e72U?W(rUHo#nq|Ph9M8DCgRg$lFu4(^&r_Ue^2B{^I z^S5iNOnk}TAsQqD8m!s{OUoEc7s|1~@wg7654oKP#+t zgMQ{Z{hUZ$gmI9Pl06vh`;f(DVkS9r*(oM;ul=luKm*!EWsVpKx>lE+h;9nH|J@JG z`qK!(|Mo-b6@@mR8;@o84R^%2N5**f3G4h9;^pZYe4LjD*ci&V#@d!H#q z<>!x>8*TIp^HjCRUVqzj6#?>@LEU4}3hM*4+_T)INbrg=bR&Y;n1{Un!cg@Q<0Odm zZ_nY-0H|oTFEy#VZvnPy*qzn57Hhw=do9x%XLuSssfGBF?9<PEpyz608Shq`N4E+HLaM6*roUP}^vMy{s8+&N90(4v}|PX_-a<4hrsQK7;b zhm-?J6cqD@1Qx&nZq0zw@p>49e8<8XAuBd`O{fZ=|C8nimP1D10!#<`Zp}xH1Khq}vjiFO!vqqGbK!IIfNn2&EPZitmbm@;LStv4v z{W-9Rutil#$fmF3{TICOnFONHBXHR?Ol9DZ&+s({fTCGF2}!Vg1Y8<93k5bg2XIOP z*?l{Blu5{{{W3)FczOyfl;CpTD-Rb&umEKM?0qtLsAV! zf=4m{OEfT@Y*}yDURDOmh}`|FKN_UJDog>ZcRH*pAAvEXZw=h*(r$pb!GNefoe1&` zP`!Yv^n-qT$@?#X=Fx}E?RENFQWahl1$go6xcNKEGE}vVE-^HLRBwo)`A&(SCs;rd zV7ZLdO?yNCz77~^yT7f$^Q)rjUE23G++iQV%mV7o@p+Yi{O!?eHoqbu{yk#G+i1I_ zL^3JCfXv|%d_)-@r?m;vH#GyRze&x+l*{_ZHEp!m#Y(jE#4hgSldMcS!6%(5`92p@ z%PU`_5XGXg!WWI1%T-~qxA1T*Ta{BCa1|Lbf_D!z9TTw{ut;cX%Bzvg%X!%ak6ShF zzq<82SQg&E%%{(*%lV!&zve&)KBHLk-M;cs=~K6~PhHM#zvoaQwFWz))-|<`NoQq; zQPzshj6-DdB};4bjzu-|35@5k{^eLF_|Z zIE9KQyNP*f3A90Y9MeL9Y(FxyA4TkEc^PWO(nc1NW{CbGpJWAa;xra?0Zc5m+g6}nAv+wF=}ej%>y26VN05UhUY2~ae_)p)9e9ztLHY;z!{}Z zPpx;5snW@#nuLC#yayJ2l%xVxtZgYO-Jmb)n>99fInAV16Bar6L?KA;>)420k$&8y;HR^QE;p*)ALzwyWPjizMMD@%sTl+a^Sj-R^+gY@xH6?H_4QlN9bP}pBaV9G&heJB8;j&4YsMcn zzwqU5N2tH0#usp`B&D$!FIyX!@n_I{l!k&l5vp9QX(DJjP8Z7s8 ztYQtIJxHXO!>yK`#jm$VU+*3bc)^|{f^bd&h~FL`8&d!+MvSJV9Y7Ck8EY`o=i9A( z{fH^hpN%6lJuul_pauMm>($4%o&wPY&S}vw4rwhWw<~5Z?9p9>okaC8VU$gIOG9Ar zLi3mC#J5lq9SoIf6<*-O0(R}FV0q7yDQ&va6ihdJ6xxB6T^eMgZ&)O%)Bn|gFKxTH~yUAoj-#UL%SJU3me^k4B?{&?7DJ)O(DS7c+ zP|k9lD=4}rP-9Oy@KtNpTkyt!7w=rst?;>^e4f`YYfSf8f6(nZrFcKD9Uy_72rvMM z3{Q(=pmKh6uxWQj)5yLQOwQ+~N_Q4>_%;)`Em)p8z|h;zTh*GfB0pSN{ZI-3_E?Q9%lWIG!eK(qyP=b+Bi_LX@h{yL~?;=HMwG5Ck%?Cs{l{e?&< z*wa@)kYXBnM5JYT%ACAmjd$=CJ%|t@b77j_?9u=VlSTQ?W@~Fz_vjJ|4waQ!@ZkwwbIRbkeu&$H2%=?;WjB9TCCLH`gn9kKdIeuh9 zqLBR}z(BqrEb#kkY3)xljsFQ?;9g&98<9u<1jbNxr!8lxl{Zue_xwF#iYlf)KZa$p z;EL1+&~eE!;U~eq`@0wdiXu?ji~vfEL>b2Wx8{g23nG|QB22MVKz0!Wwfc&B0e7Mb zcor)4|NjtpOqTxMy~vOr=k;3^8=MfY5+N=gL0tk8@OG`JuR0(3cse$wJk~gh zX^9zfxOVvdFkFRrGJ1AqBUE*#fBg4vB}jLM?8gmPCA6<5-Ux>d53RxygW)RaPK-p{ z(OVcYAWYaO^AOYa`cvo3)&|sE_n7q|b9PEFltUe|fCIU1=bvE`y9FA=Z6}o(hsl3H z1lIuz!ByOr3Emjv!G)v}z@Yh)qyD2)i*SFQo|LwqThk@uN7$7H5Ea*-9G_9aPjyo>H@(+pqp&)rOm*)~(e;%N2r}PZ z76tKf3_cH-rDz3U`Ea$0V08+kfpH*+z>-tll2Eo5uQq;+T6meB#>m_1+Ks@}dBRK+ zUB!NOxhMbhu&V?o+KlEe#Vr~&+x*1=kf;Q2>kR&QJxwmx!%I|4o z@At-he5jB4FB$vz%{c*A3**9!f+J1O4biirjtJT0%~uu6;{$TLXQz>&t_!+6oHBQd znNRZm>%3ld9Psn4vkf#B&I?R{SWtmbf|oj94xf8!H2(`r3eH#$mDy9fMUC>&l**~? z@6jEW4jNh(EVn0?`H_M(q8!L8KJYnc-M+V>P1yhQx>#bFY=NBMy=6I2qcEMyUc>7l#Zv1gJ|_$vht z?gZ=(@8?tE?EI7 z#RLG%7l!(K>;%;guf+#IT$>I+_XQq6g8!3xZE-m8^WUtVtNT9=g0rvxuZ zIBJ_ZRfB0-@zEi0O7m|O%2fVPZ-4Z_QOblK*p>RWsjL71DmM!}mVWe9@V09;S@0oO zO+eW&i6v!JAT(f?i%ps{gu1&s8$fA>Ek!s|TyRSr`qoJ)qG-dX#i3aiLnk zNWAq*xT#L8?bwJE{psIZ_DpYRQtCk$#)1h0e}yjVj9IULiOW(z{?dwm0@XUrfA3o= zdg9lG0w6;JFb95BgA<33$=$WgaPQx9BMhRuu<+_CE4A{35w|JJqlMX5z~Fi#1~bEp zZWh;`v~MxEP@iO|E81M)_O6p#kTWIhZw>G81sX3CDH@?IALkP@4LNZ`43h3Etx`C+ zu;IZ`7T*+LgI%`KEWx|!$14Ab-ri~0z5adTyhHpqf5XJQ6?5m;4X)92sJ2@Ra$J3M zU7bMmwQHKEyR928fLw`{p+54IBPO}n`F*#0!I;HysLQ4vuG)0$?bQj<*|*D;;wN-h z#91m)aBLuv3(C*BP+)d0#&$kf@+B`+zEf+@3FD~M^)H3qI^?T9xjPfm%QUBxu+q>I zs_ifW7TE?m6IIY7Sxfk8Ocez%3bB+*OcaESWTdh{wvviv?H*<0)Eep;wc|=t)PNz> zfoEqc$*R?=Qx;s_g%sI@!Ic68+~eA?*_BP3FW1tPJ@p@b3NsG>|RS&tv}#Ksr* zPU=bPUmysoFNj~NnRs&FrE07xi0yhv#wEh)^m87J-p!|GCW8`KN)Z}og zbtj^1@cfXX$09+b=aV)nv*9sz%!v*w@sYE5VjVwy>*1@J?{4(4ig&IBXiiu%%Hqr= z!s}=r6~lDdVpT^;2f38@6mG|B%RJdu+?1j2uXSK*veRE@*Hk_3J;@dhmr>8WBDKVbZ)A9d?**Z}?|LBG)X9ZF@_ zYnem{VCh3yAT9*{NT&=dpYX%Ti3eQu zIS8YW(%fxf$WctSvNvVzY3+ON{QOn*23?7g1NzVJz%lCoVpE?N-3r;qQ;Johq2Vg2 zoStL2n6EZ~Qz{EA2ENXrImZ(Hhnu#DmSv+Rzb+xzaiECax1Yvzc4+ zP>eP2R2c3^Ax#tepr7*wM zX2vI+N4`qs;EdX?^+aD#=NiWH75?5~ka?;u9*7_)>>NHCYBPnmO3zQdz2Du$jp~ja zQBb62zOSdkPegzbdVw2kogs3w->8N*}+a)Y)|Hc770jomzeY;;#S6gK@{*0n0MwIZI~*?a3b|IA|t zq@UbqoNzi*EeN{vy^2wN z0Xd=rcYRzVKwXGU>B}{2psruXl88v&iRB*o{*Sw1R)mwyVc~E{??s;pz$QW|ge*cx zU{48wdnwy{<&U$CFk_0o>3!UglY2@(K>likF`o;p_k_A0chb(7#}%{RbYW||j4pa} z@i`6uE=Tr_nVlIv`ttC9=u%t(Ndq9^qFHxqa#oF>)F-_HO(!R79V9E~)CZK%Pu!Qk zPL=#`cmZ!)+k$0HW?&dHQSpxp424MRL!S5s%I=5=j5?_qt6450Zu_ zEVP&?-iTb#{&oExu>M(n1t}mCk?u*JDDHJ?N6KPu;t>70j@>nu4Yfsi^MN=$q-HoW zN*mI_{0(|Ez$T;(QYl2c+uDUTjLqWZbJghLsBO`h;hy-{1Z3+#)f@&x>`|+&q1o8j zTC`rxd}1#h>o5^A=I`M?z$P>WNX><*uo53416`PW&Nc>|!xh{o4J5k*gg@{zs1p<; zY!N>Q>V1A*<+nwVgY9p68KmD?-z}+Wfl|d;(r-$s?L>~oPR_;y_1$&;UUhW^yb??< zu!V8sGlAy4iGQZ2Hal?+OBX6DkI5$rEAL>Iq@3G0kT{Fn_UJAc0qCjNG+|-gU1*-< z+kQIqz?Sw*H8#m*r^0{5BsT=vGaiek^>$>jWRHlIMYJmk;OaJAqs3TJ`eO;M@aI-@ zhg`K{tUq}18nLzT%nk=3+W(H+w5uF&h_YCGqYXXC#Ri#&CMs!g>723;Rr2?4Q$bZ$ zlohI<5h`v^iUMDI0gB>E;B@y%+g+z5x@leom){lW$L1>sJM$qr);%9RA{}|uG$5F0 z?NJ3Sv#F%WWPct+Zpqa0QYk4k%&h&SFjt9m3w<){R1LQ79C%e8DbwWZ1h`%yR(ZHi zo0iS~X=qgIQ-9Y-kXJDy4yW%*T%d*1juW< z<*)P%Z^;sh3efI14mGJAsq!wd$ze+W)THe^PY$E(Sue`iB4|eRGExF47%Y;-B{0tb z%bEBhM3ey2#CwwJOF0vdUmc$;ZK6vQR)BFzYH;<1WX8HUudqmNQK_U);4R*t|CZ{M zK*?c)(Ph30I;njNDmMe63V#Jz|5e*8LAzt@=DBG(4?t&>`>pmwliF(%#aTwBZODXq z46b@TTZJ(tFCXj>DnG}L1NuXbUz^u*h(EhEudYnqW62PcWq`q|!@qH{06Ro=Q-E_s zWhh+LdT!7Mz{ouFeJd`qEU2n}R5Zo#+w+tj*RFbl?F}?nSf+d;wng?NOy0@R)12>^ zBBz=$0fc0CN=RCGs`BOHP{N*E6JzN{1yP?mBt;E0Ke4molBKzqdj4yq=aag~Jco0GxxWm`r#Ta**OO=^{^O_htVVpf&TZBwq6Ygvj zT++wL1vgkb*s~B&SjuzcaCUJ%)M8?$0N}0+!eZ>bOsjvzPs4x4|2!l$WFW5VIhp270h zRO$~Fo4XPgb;q?1N`d$=5-|= zD+}3pyml-6c`})X4UNX!qab*LEY6Kj0jVyu<>~hpOveos#qcoRMMz>?+N(*3#gV+>3rUA4% zty+|eHRIqwz^YX%E~p@$ht9MF;Iu*EqQHI5gEycJ*Qa*ns(o-J=4oo5*I0~@BS_(+ z9v7kx=R%rMs(;797PmhStMSgS{-o@#pv#AkDwQ>R2mK#%JJ%v@Uo#3ebT%|7+Kg5A zEN%H@tkH8)mK{~ikxcqXp}^T}ryNm<^8^jG$3gt;J~Um<0{*IO^>on15J^?Kq*6*x&HrIj`^ z_C4f`LfQ%(W5HB6Y&C7LdO~B%a22Aw*s~Pt*)A%6d7yX&I&Uya6FT?6&4kB+v!?(W zfPnkNW7}A81rZQkgU&?>n9!xRQCps+M5#S8v) z2Ov6A5mT)oK_YD5k!v;}YP@qhP+2Ouf|f--_EVvhKjsb@zxc|^MTaJy-~#X1lY|3` z(By6rMJ7p00Xk`u?orBI!Cm+|h{Rk7Q42~K@*+-A937_S4!LdWqm1_zseEy)XNLmb z_jB>9bRDaiZnD~&4CWSnDNnd%bf+1OI+JV)j4sY{TQHg)ITW9$r8y$jG%5O2i0#Xq zj)=u=ehUVP&Mo{ztd*&J7A>0zRSt4D{8+340frnWfD6b#&XbnI`Hofj_%|Jl)Q7#` zici{wgI~@&*q_-Um~0>u?Flhn>yq&|B1q`h-?vYFL%=%4NoJ1y9Fcnz6k8?noY1cn z?tkdX&e<6jA-nnb^~MC85s1%D>vt6><8bF94^FC30RLH`b0;0D|DksbkLbE8+YdqF zSphZcrRd_RUSESla|*f^DLY2pXL(SA;Xhc0yOSk8`_bB2L#EV~PyXd{c;E>45Y871 z7=M;6wm3;Kf#YAUH)uaz*bHY*8doMIOS=u@!Pxu-@Dd+Q!YhmFAb^8>PQYJ;!kEcPdAL zrr!DEn)fj? zUk^RUrh}ya*8aEDFsxG44*oW312A`-kE#P8ixpgeE|#dC9K3y*on;-3rMT<a$fvq<2A7nLbO_^_kV-m!F+omX*||xTp~>{MpOjgn~o~#tYt! zaKBi~w?2nq$(m)-^qbq)$tqjMt5+62K}1GJ$E%|+exFlbzW-1hLD^D^#C%Rm3HquD z_Sw6|HK)F{=w`|Sr53+#Qp!Jn(Vr5*p~tO>#DppV0#-2`H23&jCP5mXvt%S4h+V*H zP1_1)O5XQ$BMM61koBM#69SMh9~U7=9t6aw=^k*iD6w&I$xF#E&N53V$aQcsODQOm zvfc_MP_jP?C;HcRP#WtHbi5NYybqF5lAEY!{iNJ!(5Hi1>;6FQtE81PuZyX%qx_BQ zw_*4VAcs)-5DTn479K>Mhk}eZ{?qz?z+haTjsZmpk~^p^8}M5h-k}qzYLb17Qww!@ zy$C>qW7cJB&oNi-FNU$n=i5(h7Y>>c6%dUACCk)hB6mIJ_b9Yet>gQU-O&<1(f ztUybyjmmXD$fOz|H5JJ&cZV$t@&X;kz9++(I`p79x}%d_66QK)fPRZ@ig zQIAM9WAXU4LrqBpU*iMlXE=3Z@dWil!H@PJ8pi43(HC1cqE zu{m;mOW57NAP^;(ss$-3ugL~-7m`-#Ln_7eu_&iphcXC(LpDCopMD(X_}H3 z;hcEf^DdWBr`;G#+c6vd$TwW*V$39AQ7&4;H$Fma%y#BD+cb?anbc+60|^LKl$nT< zE7EukC+un;K#(lKX#V?S30rKQz>b$urHP!TGM3N7(a3`Vp|BksAYSD4#`5>^x*xUa z@xwH9bTJB{oj}XIZM0}10`O$(DeS;3H({!x@}%C&*wmdZ07|S$XSycWasm-y!>STr z?t^hg31nSJW0+^%r-KLBr^0c#mgClQ}X>HLn>lk0PO86m<>&ZBi&Vkk|wp;p|n~%u1%FpWgc*q_5Z} zrQ;>E&8Tl?FRG=l13ZZ%<01_0p026euhH@n+LeZD9> z4mG6m&B5d&Ws~PHa}#S(l~t7a#@@Q+ZZ@^84Sx83NQ41|B6@4IP3bWxG45g{t&?y5 zBFqyEhsi>yCQf!SWpFfl;E!0ttFI5-lQpf0Y-VmKdunYj0#jnJAW5IHTtikl>ZF5o1M;0E%4=b;f0olT8zAY z@dy&4^ND?iVJj)XtqOVAGfdmJJra>(y~lk6gfWLA!+d|ylNYq^>#GWCiWUirCqMKA zl`TXv5g-p9jJ{x2Us9ouZ;&0<@8`|buHo42_w;f&&m_QtjFJ8JF;TO!KlAw&J`r0! z92;>!x`>!3dIgmG8(m{JxNwgPy}Xe)C$y=J@yE}dSughx&-yle2{JgxpT>z$C6F+m z{1`h`8w8B2GrfhQWobku>s&fG=76fm^f^ms8IU1C)^eiF=MWF?*|swug?kYtcimst zBl(%j=2!=v%)2y5Vy7vb0E`O(L@9gsGkQ6KwCt98k)f}dojGaos1@=jo&c&i9zsOjc z1>h0Xx&w`_lm-<7<_3#(qk8d$*6QAPUJD;nDF@R>dfEERPer%%{Ltl>`#@Ow=&(X5 za+s0Pn|iat$(~6E6zAEMO-G!=!1NN&bX^*!E5+f{#9|;LdL||nwApd&!nA%CgNTes zdL@TMq=Wu{$MdGX^8e5a1D^Zlm;hk530z3hYe_5aLg^k>fhAWtM$-9k(rMXnahEa# zjn^yjo@C@QMP@QmjdqGPSE$~61mj&F0?hfdv(nZm-{bZ;|8Au4?<&@cc@#Leuq!P@ zp>|j7Tt@|k=KIGY5ByfSlrhTgVqF2rB? z?)JtamAaYed+4N_Uo{5kFZ1HDyiC912<1;dXE%W~DQz>|fW{m|{^S`cP_y^{R^=_A zt&4`Q=b8rTqYtX1zn)mHjRhpNG6d*Hxo@lr(513sr*z6ViG-y5%XVk^pcPxy-CjRg zG^u+bEB?6|w9_WEHpJ!hO*+k%)zYi`-KEne%`&}`Bg!R=FIjhD zNj+`yam;(h7_?)rMD7}K3uskn-lEJs-jc1(4v$Y{?DZa^vrJBXPPKi zV$4%J-(JG$ZI30*GkqBncvklU#$W&94jy~FUq9g?Xh&QvF#y8ZWBv*UC5{?;dNQO5 zkUq(g^`eoxXqGg{VU+yd-?x%%D0GvF0+&zn# zLAwYwZWNO3{ROa~&%K|2Oekm4j4c{e#VI-UA{QSe>sl#XBVAoiD=?+rS^QJ3Wwf-Fh@5DXTp%w#nQG{V%9l~*_dq*M`YnVsm^D`dfVg9=nVK(;iPHV?}f=C@?^HC!V^FQ0+XYgCp_TP)EEtv~P)`e*LlYQ4r;vD?D%Vc3rpvKA( zP;ZDH0gH6G=kO6})^Ypiu_`%o=`+a}@kb`wBYnv#J^V^PBkTDhPkM>$WxCJ(-gr#l zvHAC9aTY{slS>4uDbGb%ch5u;A0?&D_mJ3M2&R6c8EgMXFUmUuSk}~Xr;*y%J7m{09}pd`0rGs&=Ee^AX_gV|b|^_kjE7^~2F*lK5UewMZ$q zr0a46#3)Xj%ybe3QH9+pFI5%XuUS}hf+h^4)Hc-6YOdTJyGhVV*8!S^E{Hb;zMlT> zmSc!?01dBpMez3A%(+KQdx?p&2Bti;E4OFN6L&~u)adlZ``dCqg<)T8944yQPXHec z4FXUDa`5LJTiOhrXjwHx3zlV0IG~GRK!W<+AgVX9Nc>}Z*`Qb|eT#MyC=kSYuhYGx zt5|&a14k@z{TaJf+xL6+)tq@enukIs=w$O7mUsa=GZ}lIhRg`uzW~&-g-{t2=R+(7 zgl_7ni)mwzX<7Q!-RzGGB6z%fNio>{94R1*GYw;jAHO)JWnL5JX0`w*rq5nca=3t8 z%7Xp#B?jQ(!D)Ps1n>2`^V@Uxy?*U4MQPlR{(}6}I0C5OBpFS$AE`3#=N0avD1>5H`Q~SI8Sz()dkxYrP zt}y-Gy57L8pT?)K&ZC`X>9OA)__8lth>wk5v!(3j+4JM>tFP|{(vI!!I04e^8hAo)p zOdU5ivP3!fMHC}y>yI1Rd#cRE!9qP<@Ekbo6j=A;Nzc))_zxDx+z)r6%gq|DBXK;& z5#Ja?uKZV`kF!BdR!?32IZY2-PfkPe<>0@pl<=(&LNCraR3$NJ6;dS7{xPU|?Yx6amJqpKc_TDRR1Y6ZB*CET@a07ws;{zJKa{gMMS<=DiM!0^<@lj&`?2FaI% zv^CHKr$_$w(()3sbh_IL)beQs1d2GJ(s-yi5l6X}$nwb43*?g<0PezZjO9Nr(l^AK zayNl%He7@@{;-&bPg5joqM1BvGxG;i1n3PNsgNuz2*kQcO~y* zmw60QZexN3cPulH%nCIfV!(fNKv;BL-}2eS_&#?`4etU(Z^@iF6+dh8u@~ml%bB2L@{ylH;TPo<(%MGYo8cSxalwJp z@4TBT`=`elljlzw+``@9?sS4xe#YwHm#Jc3ta{%V!q*(c_b`^KOj9@_E2*u9q6(4U z!stn<>Rq2N0FRgM2b&q(<%#`T{>e$g7!S(34$5-ajiySq7DK&G$QxkrPJ0K0f7kDo zh-3^WH*)=9YOf;3W^`)Sq;7s^T6B%lyF26#qv!A(z4awoNiy^0Tf*Ugg7=F&;Dg(nt$Qr-3GC} z(D#HmyYn1UGaheyTen}dx1>R!N(AooG?X0HeHQXx4OJ+|cUUTQN5+Umjlks-{?%L! zk1)5o313(T%iA}aDZSf8>S^Gn3X>dgAhn;#BpRQ?T{zKqs6RD^F)D9d`Um~|vq}69 zFHzSK@IPY7b01UvwXqg*M2gp6gJ=w_IRxPO8Z863wIp5OxFnjHq<>Q=U-zj5cM+Yg zXaW$hi3Ek9@*(ouUCvECfm^vxlD{MTS*2Q(=W}I3^^Z&sJ`ON*%3wtC)QHE*T-MoY z+T8d3wT!0YcHT!P#Ix65Hho83*4Pn~4pI#Of66F_P5Iw@kl-CcrTz&&T;r$^ZR_E-V9N8)W0?ff%3?J<00dwPx#F=FG{`T5=ue% zPb{hp-m;AT+^&dFX+g%?2BI!Lb*SPL3RElbV_cS%Sa*f^xAL6NS{kYsZE&sQncK`h7OF7=j zdsBZB@HmI=@vP~S&o`GB-R+gON3QQgn&a%`ZiCzG>z&rKEa*p%3Y{6+=)dFqa6hP; z8rn+cb$KvO6CD9?evE{RRxRogKma?ITQ(d0eZ4R}{Ujo-oKZyBI7Xu+!Yw<-8awXeMgG`%QxJS`X&Ot1=0 z*RFmX%}V!vkfe#O&~Sb84JC+uyxnPla!AgKl^PKbIkX?v5cx8C4ftX= zJETvWc4>w(P{OVB8^bc>faU;{?TKu5B)MvWVd>kg5S%8w@jd*2BV^`?ss~wTu9lc; zS}`p{e*3=xm*3MBa8(>M&wR6jvj0W?#db*VP!s?zr2j0UpBJEa&V}|%=GS2%nN5s5 z?r)bFgRkGCb2J4}>1B(JeVx{}p?G09+lVx9r}DQNFK>*b&!@Qo)$DNq-A4pOJg7US zkXJIOL3J~x5hF@#aaIoo++Xu?kOJ%~jr(bl%8Qb_KHKMw+KD5yV(@Bkxf3+$<=5^_ zCgOJJS;{ul<|;wZcgFs5jiZ(4~^o^F)?O^xq{qtiU;6|BE6L?`_v7tSyJ4(tI%&Yx%^kV zOVoJdtD%nEJCvHI$q>}Aq;ePFB)X}B?MNLAq@2?X6#D9UKS^hl&GSplZQr` zfCNTvPdH*5Vrg$(y!O4~GehFz0n^3d{{hZGF~5k`p2AEW#AZ4i1p$H+pO|BN;!`tR z9tL(2(6Y^IeaO>m&l-^^qfTAwB*$R-XO|VjxxVJbL%BXi*3p_#gg4$?U#r1`T;Ip{ ze>Ay1QJ}a!QOk?t`b^JwaesZ)mj?EGmANiSC?YWnHWwF2e8}RAt~bNEzFLLDpSt1t zCLr{=1K`)}oUm5^@UkQE#vmm+9a)3$BG z`|spvuZ?cPX_LLVFX8n0!1ZUCR=MJEl`GDjVR{y*tqjv#slf8^aDRsBS)jI(OUJ5L zV|F;X^ej-Da3qy)o4oBdjkt?p)xy$tSrwv~n7i@TAa;Lydl^dpgtc$+Hii_3J9?j$IV7O_ZU45~=O7PJ(R~5;}a7Pz?3# zD*h*~UB`Q4i7F!e>e2P;(REsnE-yK!a-^ISi!&DR5XWQep?|L&R=;l3f83qH4uUWY zhR?o*kFa5f@-)kU5lwUlqdvckhB+9-b%HV8OGbO3>mUBF*HySph9s1kG^LC|!}Bax zg07UAd8rJ>9mNS_W~7XTMYf@QR(v8?k;cbK1muV|4Gy~E^eU1FIUyqFWyb#!Q)1DY>Atc$5-`=vnQuKgEiklJzy zMVok}a&LqrnhbZ*Wx{RZ_QT}KNH^mKS#(Q%zMO=A^nYg-r+%bP!OU2jd356mf@Awm z4MjUmH>@Ob7sCVJ11|8H`QB~4aEMb~0BwOTeM0$?#_9SA00960>|MKVgD@1G`3uio ziUIRTrdH}kr7BgoO2`HirHY_}3{Ahje(*{F$3}_NAsr&s#x|VX*vCia9zVqn30bW< ze6zc0Z+~Jp-N2{XOv_gZCz#K&-836cpFWN**487CkHRc)ePj%vF?p12lmK3nIyMO+ z^buSr>3B5ciTKjgH-=Cl>7dyl)R%N_9iN3!fG*tM1fCmELaC`I@5G2Ic)JiSG-LF} z8=vM*)M8q9QTvu;L{dM`A~$4V8HH{R30wX(sefDZsl-(@okw>}VrIrwW8Av1 zkAI)2t!cA|+5ri38{?d@5kg5ui38QS*Sa1i5$kHjSz3`@jeR;o8rhdMU0Lm)oE1O& zmqRzuOX4@Hg5IzU$uh)e=f?-Y&y50U|8JiN`S>$!zOWnNm(5LTbs69TJd~l$A5vO#a5`?43mu`M14R{=BBi24mqtadWssj4L z?Lfddzr%qLJa!ZujWwzp_6$xt1j0>=pA$^juj~Egm95~LB#~L?_^I%?EVcrG?|*Vv z@OPJmSBgWXg1aj@vO^+NMF3Et?G@m-MEywN| zo3rKP`1gHQGO-DP+V&D%3wl@j~c3;47 z#=TK69P+*u3_QE#lrqZl3HxOHWq+`F$v#B?C5Fthr1<@5#pA?)z~5Sbaw#S_gKjC< zRCvs?nK_);_5`M9nN|-T<-#;uDzd|_Cd>%}rfUyTXUQzzvan3`drdk_ssRC=V_mI9 zjZ=RdSu=|7vFtGC?|)dfmhlS89+O$X@PjkdB8~; z7D6~_Kw#eBkHalBCX+`M-DK%IsRXHM8q@9}YSfUP`H{#WV;%cnpc?gqWYsC@dpHTE zC;H}iIP!zx*c@5ma4bCE;(t`8IrM$%RWNL~jymt|XZ}T~Fy_5V-nnhd?pZ_I9P|*; z!f@z~JbQfHZP&vOe0Kdv{lba5#l6R0OQqb;Rg2!z5f+J0--n!GqP&E8KA1qZ)73Qt84*5Y@dc0_mYNiCk}}DYk#Au*Xkavdbf8# zTW=3&bccOOOAnT_%N487fv%===X!a*uMjS@(DZzzcwTU5c_%n_%AR1!-=3!e;uuE_ z%P9^G(g}_VvJ)KX8wxkzY_c>@T&jpmAcdEYRE|oi-rM@2JMpT!T)W-ichoi%_ohor%-`uk+HjllW=Uao$xZ-~CKvi|6 zS&C|wOSa8Qs6!>fg1D%z_l$NY4Z2yb!~kLP#2{ith_tFA7=QJHYfesGB=PK8q$1}D zyDPmU_SNut?28n5ajclAMWjb0BC#d{xSSB4M2;A&p=6<@pcbRkZ z$R3=8O{CE@n)y`*KO!Z)Gh)40eyR(^YCVeFu zLM!YwJF`0zcIUVGXWOK&?f0y!&vpm*vE&Kr66+0LLt5*QzOk+Q0OGYA%ql90%KQK1921r9S%BRRChe6twN088#fTcYz)wn?alTbrx1Ejpi^x?cI2 z=hY!7+uY4;nbn}*n5PsT9G$}tXWbQ zS%2iQHr(D``AkAMy*P`fPV7~M78!$5%iBmTa8TG%*izV1*s6yutm>kmtq+{18?kFWNH2S@(f2IUKF}MytNjs&BOFBUJTauVJWJe~{)70}6|L zpj8x=_$W(FlJH6s-QBS;N;R@fHZV6Ls>DaJf{5M@MEz)qKU(6CmiVJ3J^%m!|9}7N zU1@9MFcAGK>Vm;;k|xbIq>v`C%a*0EbW4*$KNL({$6yFf$ia4d{P)h2#)s@2E@>bI zeX}*XrFm~8dE`w%3)A~E7d(tS+H&B_eSxuCBlfXyQ8n6`#gfkbZT&++6)p8(A}lm~X86qT*(dXv(lg0pX&~t; z0TT&w;iSv;DUCh6@SxCn@p3wy%ocTdnfe+Tz^vxas6S>*o-2?LX!kgYV1L@mB}O#F zALN&0*5U^Vh$`@#_o{rdj~NIZ22h$ra4=S~1RGhHh5w`CJrBa>dmZv5ba&mqySe#$ zJGlJSQR9sKQTOGX7C;HpW{FeEj=CDp=~=5doT1jfuu}+%q;n!lYZQe6%|LpLWtf|G zC|^Y=E@XGnQ>DV?zr?i0>3?3kDb#Ws;(IIHCy#(NvL(y8_dhRxUtPQX!4Gr=F2Hz^ z-Mua!61h*K$X73KamI=mx2LUCxYe1|Z`}V>HHIaOGRi7+vNoKBjK zGtGAfkq`XE|4jagIcWv)fFFWK?TfBxSq|x1I3LxX|@{mOcnFbx*X=;aWSXG$^%}t)dKhEMc|&xY9{EnEQ3aMq>3>E&)Z7XH@vB;f$nFCG00030 z|Dvj&0OXxrPlGTNhVS<)dgo?9DJ`Y!Ze}qt8HtH;8gCjtN=BT-IPl}&+d~H%vQ0K) zG9wqThL;0}o`3Z;1)ly=M(gt8P6cOl8Hr@TJRY)u^B{?_XIqI(u=?p)j>MrAa$ybTSN$5BdYD+u31Obg1iO~& zBtb{|e1F^MH?ZOM0VRzdV*{%mQMoN=yAfiZhLI@c0^|bZo1UBLXh2`&=oIqehtWed zk9RXn9rdev9}L#jLg)|`(dD{gEip~Tnk>`mE@l|w|~E1sH0zcrg&RNu|tn8iVuunee^L_ z@4<2VcU<}e00960yj|UIn=lZ6rhf%eUJ|WD#@HB^r%r9PN=-X8ZMRC3BEUxKL)I^? z*~dRW9|mFw4K`i-gk+!3XZ!AK|3Lg~Mq}frtYBjQz;MZy{RUpTbEcYuUw3+_$=KJ! zmw$4AeOs$DfuFgK6s`E;^TEZ@q1CospMX+R$#TOcK}czyh7p-gDZ+V7L& zqusie2Irvxa3p?!N4SH##GGlQTAsa4?AURMC)fBmoEbai^0L z&TNTQ^n78=@3Ki8^;adP{T*G*7ZcT4eSag_8dEEa0$+@0H>|Rom#1y33$UnHxcsc9 zHpi&JZqfGol^ip!rO$%H*@XMrJl@x>fRA`gvB>i{o=zDJbChK~&8-4{Z5Q$DM#u*$ zQVdpR0bKrHK@G*Lb$F1-c2oN7ZdqNx zSro)9&JsGEVk}tdM=XmB!@H-4o@noBU2x~_V+^k zdg`U)+lk}+S*=E+TaEGL+kB23=YQ8~<%e47O;P&0RVtOBLPfi@P%WRJTC-$+etqRQ z&%ks1@G~T>s)MR3kyTw3EXBdj-H;tEjxLwihgV;gm*>C)gO&$phf63_R4rq^?>HCA)o>W!~xY}plEw)9J#c)cY6IRhlNR%>xH|8#yjzTbZ;h_|c5`)Ksk zF-g0GYbchJ*he(WSi)JzxG#K^i;M~;c%F-hCn5_767*G2Ed7XsVNh)GKRRjQ^t=Lm)qz*V;8TIGeSdiC5Uf>@oF^mjqzyCpm`VC=|qhXRI{}3Xn=Y-uw1{yp4Q-E9zif^L%a!*i~BI7!2sJ*B)H_2LJ&7 z|Lk3RZ`(K$|J(a1h;9qS>o}*EE!!v#m+fZT-lb_S&S7tFQ5e+2iGN$gaxJHc_tW1D zhm=G;Y$@43fL)-d0*WGs!{KjUB>fH0+AhkQ5xjSfWr)diMncNu^IH+Khl-f|{tHdm z1LJ^Sk-|2?S3zcFr_<^5#IETvNs`c>dEEcdl|Sc2FeabhfPnd{?c-rgHuCwWu|REm z5c}$swu7*g+@=UNGJhzUBcI=hfIR}h;PWptSr3G-uSQ=R@IoS)nUg8}IrIk&6_7y2? zgK0!&6G3X3-jqQGuW?nC;0!%JwuYe(UNScw*BtS&YqU*p%6}%CW;kVak>VUuiW44# zzfzo!NOAs^t^AVN%J!+V#_137GeZx{f9(2Hu6NFTb6^hq`S9py5xh-y?@lDQd=(_QK_Ssj;VA|7zGW^Dh`fDXB9?g((tUp@Jt$?RT!U11GEbR zG--sk*);uhc1cO5hf#tv$RkCDyyIe%ch&a%9vbU z-?HP?nwiWTOdNM&I4Wb}7BeP4FYX!b&qAPCZn(N@OJ0V7{D3u{<`b}f65oXR>f$hx zYJ`qRXxF+UE=q|3O}#BMMO(O|98BpsB}q0hAUqG6>^=M@YF=ViqP7mgbHN1v*vwLGEZfX*hHoyDJ zP1Jc7^7})E|Kl>ES^dxSWOh8A{qkaZdUA$~r+>1Xb>!_iZ;;$ov}JebBF(^4if@-2 zoOcIj`6{Gb+Vb|s3)d(+-gXlvbpD8S5*|gJr&dM-{VF{6Dt{jy`+0$Mi)Nq@+X(oE zt0w%L)yEFzWHB?F0Pb|&dtvAF;D+B*Xw({0XjDE0(`wjK%RBQ=$~#*gM3B!S@60B= zvw!}qyt62hC7(s!SxtCn{|R}gl;+s5_}rQg!Z37A-wvJ8JhY9#vFCy756xgOw8ODG z@LKLLKz;d7zGRlmOlx8p6VR2QFs=L+gR_%grW1A?;7LvI_6pS8Jq%+5>Isi}{`f!k zz2!Osx1ewEE5LJnsI5$6&vS$MdV7jy|bP2^&1Iybhy~C*cGK@tb8kL+c%z(y=^mvBZP8qHeHV z@*60Vw{C9Y4`MQ&rgppe|~%M2L60|@%rWKGwEjgYo1((3AOFohJW*p ztv1)F#%G||gIN$ld-0Y9ahTv?RJP(t!dC0WC){c=kGN3#^VtLS#`qkMNe9tQyb718goj{7*seP=hTgz4oRPuJ5qB+PXJq*X(5+1;9Pv&GReu=h5BKvP#(B#JHVi%WP)Y6T_Sg(vyu&&N!T~w|{bn3!`7J zNB7UlTY_gX%H0v2i`BIvU(p>(IJo{C|eVjyLT6$}~^pQnEGJP)BY%#SFU75SDjtD+gmn z5wF4*g=iJC^Ff32=@%Ae$Y8eLfU_)0t!c<(>C41C;a}&;XhXE_{v+LCOSF0 zy!e$J5Ld}4blgL0JYc<{b!a)O^xxU(Ie*wk^aq+qzk`K@x2kkA z^7|bCOtcAu1=?f4i#{4(KPov8bB}5l!)0WB^(mwR-y{pUTeV)sJIS@Q^&}bnPUW80 zt!yO~U21MNdwqItTeF$83Bfv{YfVVS+ZIDcDXUNoMVPmNnAUWdmHUI!UP+>BNB-vc z^2IB8+FIQ}CM5tbg(~gNcT*-6S78Dp6jBSQWbS zlUwU01Ow(Rak*6Z`LsfggZHK>C%N@LYBRJB#0&|q1#Q-@aD-6$ ztGe!zaK4_a4xbY!132MUbasui7cyav@<>Ul@REw1_GG7e^BEw>;R$aNM<6^F8J84N znWTo3uzzKwhz3Eit3@Wc)lv&D;hTQpqh5KYdIVi6*@8FaAVbRjY>()`c4(VDic1RP za-Y5i@)Z+boLp^)&p=(Ij7+`m!FRm^Lnkz0>B=X0zu_BjLGF0Myl{^9{p5S79?*Tf z#uCx1P@l9ERUJVGpyEeb4m9d+I(RgPqcEkqmVY5iK(m?pfjQlRn2JCl8OpPGJwr>l zivt%bWs=dFqaLi@ysmkFvqC2wMlRdw;wsEXFZz{$HF=mQ?SqnPu#!_Z#S52K@nVUN zmz*v^r7-qk5o{6`uNPO~7Dwz8k8Z_PU(3)3wm>tKa>ca+7V_#A8<8#m$k7^|hy{g3 z#D7&^*f-uR#f9Ku44~@%m%Ml;oSu;dNiHc%ap5isQZdl}ihbNB%9|DW-t( z7CgR4A+k`p2l9=;Yjk6f?=(=cKD%mkVt-kgWjZn7)T0ISEN^D2SKsHuSQnu_Apv&G^v{JynH%{YtQa#_pl$L?<$^#oYRO%&nxodg{F}i<&5!5>^)= zR*a}l7vvT$#%C7G+dV3wI8n%r(*s(P`5gfmC`Evr5kjKK!WXZnmnRp~oB}CemVY)m z6N;Q%L+72(-I7$gY6jMSl%Jc0ED8I=QMeqlyGM-QAwC?$81zq6{%@<>lR3_IS-w zjzs_#6wq2=Y|-;cy+x-sWF|dEt%hQJf49c04iM~ESu+uK@9xA?WFHVHAW#KYgs+GB zQS6L76urm1fmMv-mS9fykW;Y*k2+TY8(`&#M~a}$#*qbxbW(Q{mVXPalgNSpjOi~q zQ<*l#KJEZ`mAvVjAh7eyF6g&tX|K+1pm41=z-YGtD)2YPQl`X5&W0-$6kY(vtCBtd3-*A#^5@f3@kYxw*_DfJYP>Z5A=cS@sdAU;x z_-Vfe;1#hs+ex^$T7M%f4Gix_R9^1As{Li51LBCVrK{jrt{uEz9IskmW~&FlX@}hl z>@A>+)s+!TpfyUN(rUyi_Sr4z-Y)L;D!AL+^hW;ujM@9m^*X-2y2dN6W7zv$TTAit z!eUd@7Mkznnok#bJBv7-emvD6w_uYF#oum_=?n}~6=^IwLXWWbD^qtB+_p1rmlF|H zF^F;^g)BI{oPRXqS=+Esj^7w>s7yZh)+M5F)!f~B^Tzo zWEG_+7E5V@W>#Gr7bw*{JX`b>eyv$OMyu7+Z;HnKT13>#t@@$#cK}#f`1)0W!V)tq zjTyRpRBkq}$^i5q9mLmpVCS(DtY=RhWg_7S6LtWvyMF`$c$g_y?%$`0l!QmHfNU$x zOQ8dxhxu_R8DT0GQsak~6}6>#HmRFZVNvLj)hysqT*p-_cSn4NJ!13!BPXpY?5pOi z(odz;RJOAS1M?a`1Ng9I6l~rX|S73QX-H; zfXpR_xy&JlL11vTm9a%Zwqj$xK3&y2*<399kfXS?ioI0V@?Ld(UT?(&|L?{6;hX|c&Z z^f>$DAaN|daR3~PNqD)ofBrr*_lzLz`>ljg`(T)J_bJ|Y2ExZaX;MZqEn|N>TPiwC z#$y9H^{3+b2ZkYa+FKbXGaDL4lP^P}&6V=!!w&!YO+;LjKP(Xb zuj0BQYOy44>ZpiXn$kL|7>TM4ZCPEAnkLyciCI=lG$r%4`D zKT!)P`3mrZ)I{{%WJn-{>T4M0d9{cw!FNGe+-B@=!#lE>TUI#JUSbu$m{QPJjwkh=$;#OyJi6O>rkrvg`K2o(~=z9pANAl8<^V ziwJ;11I*<836At^%yFjAF9m=->z*iZTCMIJn2FB-l^XpJ-u5fLi$uk%-}%ncJU#+A zR0LI;po6nfMN8NJJI+?hl7b|gEq~IqXw+mZ%2>0h2#Z*jL~+@$x{TUrjaIBQ?q&-I-a%~{SyjeQx-ykI_=VL< zPBH6_+_P2|8OtU@Ny`(dR*J6DYjdW_a;!;`YR$nX3g7cu*wem!`$F~Ex_`3hH*A21 zr{e8Y;&M%yz!GEDnD2h-l#wJ@$H@(0nkQt@gnBd6`4`)5#;jGm+ zjf}}OV@Y~Gg18h82t{%bG?m?m8qSIu4nz%&pLaOz57m#y@>O(?>80h;!Z4%}7C%dg zJm0B545Bp)Dx$$6(rCORGJgcRx+JO2N8xXK^2j@i3Gc{(yP19+ceg$KPE4vFeuw&j zwST10sFKwE${JT}-T`Hzcqwzmz3O>xI=!ZZhH~_GFo!{8E1h~cc8}dXI6YXZID@WS zZ^#WLqACJnwyJ{n7Fq+M;*TK+35puOA(x>wp3yI%9qBigv zZeQ?!xPb04Ib4$RK7Sekbd&S~3=h=WqN_jB0Af%TD4Z_@2?w7*g2U?)11{bk0Kt10 z@BlF20s`)+4qWr^(+pxfwPskPo<2i;xPyvS=lD*TK?VIxRK;+0ORiScW%L%eT2C74 zMap#3pCq4GO`)V|CMx7*Te)`+WySSn5N}F@OPREaPh&kIAAi#5!$snBO8z-2->YvFsL++)u8s|8VYXyQRZ4@kU)en@ONKo9Y+jg98tG%7t@)+q_L1N(Gva# z00960%w0=w+b|41?_cOLU`6N5mft-NyY$c<+U-2pj=Ke0+@fi_?cYzNWLdT)S&p+L zK!G%|B9jcQ2Y)GkpDMs$+6ZkUyt*i03!K5Spf)ZGRKfetT{k60nJRf8=y&RM1Bn;Le(})Hq}k-Jra^1!`QaaR8=%LjyNX}AAw&ZGm$bJE>sxMOfhJRr))K}`H)fk`C^VB$`c8!A+ zHRgjr--~S;N7>nGECxB9#zz39>40cftKxoL=5Z4H^f;h2aRhs%OW;w@B`S>uwS<^Z zOAG;vE`Iu?6QY4OL8=3Qk-N+&U%!mtW(>K%iQjP+l!a%4 zvfv+E!XSp?W6hy1+$v^(@sqdMs6$mpIaV?k<3X3H7^5w!1vfpoMPV@&XAw8*2*0SD zwrb%OdCi8@d041NMrU`35laI1B>|fYfV?!I@PCSPf=HSxmhI09dV~e<5C{w2K@b+a z83+se3eEGaQu4V%^RJHzBb|gMn&PPCun?XV7GhEVLRqMM()UkXU?<37VJFc0DS~PS zw1ZC8J2x3ZNf0ZP1hGO%ObiX5Hm{p?&4Y!#aiNFIs-(n!DNCzvXqW+6K_*cq&{$c3 z#(&CEow1a{T4JfjB}+Bj&i?tT|i?-V80Domv-WxeZ?cEihp|C$O(j2HLYgEFjFUmUF zdU09t7qJ}h!~jDa!}A%YVV{a%bePzF%$3YN=4wG-IFenh&yLG+T8*{alSXAq%Pdd* zxTbMl;;Ub$Rhb3RIx368UnfyS=|V_oJC>74K!UeSBi8 z9yor4VZ^IwpjZP3j{K|=sbPJe?qOl!KX?&Hi)>pV^}pVn&{#5C}W;<(K29h>`V zG>cpgU`3)AGsGqblt}5!)b94njYaTpPk+zbIl}Wa zg3l>Ee0n;MYTR6^ardd_T%4+z=~d17xK*=TFP)wugqb1qKR%=D_}eB7$p!>_pb zv*`7v)2#iCh2Z|EilWZzq<^edt8z{2q^_f=m`AVYmS*iY=Ja}a20fK$(DgK07UGZI zwVUhDUtzPlX zPP~q;$s^u(*CNY`|Fp*eTdV{a!=54kvn~F>_n}JUHe(HCUP#8PH-Goy%szJk<)FNJ zm#j_Y>dDu-ytEJpv%;)vZq)UDY#EsAg%GvMmSGUg#2GT?lNh9(FsS$X_y_R3#9=Mv z1@X3|z&|$Mf1sdzm&*EFaZJ{qb^VCR2)G7JWv>O>th22>1aw7E?jHaE0RR8Yoy}^) zFbv1fdkfz~4(r%qhkrfA*lFz0(GCn7Ep=h+?I&6OP!h`@Az5=Ogv3oED-yQ!|5>tz zU1S=xQwm&*tf zpoctupRd2lZ<3&saV2GNNbG|6(dOv4ufZwF1iO?&tp;(H@$CubRm z^k@rrV%%OY80zC{qH?gLp(VtsgiUfr$pS*u?EoS2*Ka+r!&F;8Su;eXD4*6dkzYx% zeTX028`m^zS%2CXK@pcp#0#1R*fp!3)f+t6{o~WS%M8jHRgHkl_~UAC`4#R448q!T zT^Y>tYhq z!m0>pf`dOIr2oBBCfLPh^ntU)e@*i#`XZmAtI`x0Nq^(lLK1E;@$#KlObf9D)S$Yh zJXWKIsNu#Dxf<yuU3I>V>>$7NTRlS>Fk>eoce!mNO_H zENRqkS)BT!nSYb6Ep6!;!dS*TfT`B~hihK;`y#hcUKS3@%f|}TwJ4P3tv~>`{U+55;F=*B z7`p)<5^YDJw$isNo8ewx@=DZl$vJkXJqQxN$D^V#i3kA6-;ry&H*9TFoJ>6PZH;Vq zs3V4>?DmtQG>ld3Q+`K?0b5&0Tr{G&4HCeC=znd$xC9z!`lf1rQk8VxJrtrvHW&LX zYNqv1is#9w%`j7CA8|6?$WJ27jK9TiT%W$I5B$tGKRUDl*x*NU0kuP0Z z)n$>aodAqVz>eJ6;ulVPnK=j@d+96srm;(R{j(Oubk$`-kaCooO(UA7Z0u*x?RcH5 z9e-{pgQggaL378m@WlGg)b-3|Gw0g4Ur&~vPf^8GarMQsg)VRl88p!?WYC1SXog=O zpQ@SDqFpSula_F>2`(}x&}vAR=XxXGDY0=6Lt&v_w2Iw}zF;hPe;16!XV%{=E8?Z_ zQ*oEmu|~I-Z3T*`*DSBIQQR|Zm!Zrb+dI10c|Np#Q z+YW*-4E-1%i7^9B`~YA43=J5Gh7r8Qzjy6g*1;yI#221qW@K$o+w~lih*cJ=?z!6l zjC@SQ^uTAOg@SLpfPw`wxW8LNbNODJpN_t%(&l-&71Z3j7tMKByX=WAMEM4o@PE;c zLkQ)Rm4e3Ddm#(08j3z_XT+`Anpo=D-%3QYkb!kWSIYwSH;tX&AH@%R~xCqg(bR&ZcaE6PeZ`^0K@Ut6hdjs3jhHB|ID3DYQr!Pg|8y$s)Rt} zRmmZG2e)>LA(%i?NN-=w=-(PiV_QzM%TiXPc~3LaeCiLP|Mg(kSJM*w9@~lhSMG3W zgg*Oz6l4G0g5?mZ1O0%%rGF;^Gjlp!`!dH zYiaGBXje{_qglaOcrO)~0(A}~BF34MDu|fq`c?{rRN&=sCNJqFDt`;!Y)FywE}PD2 zf__k7>pauUa*ae8bmT4WEdoP$gx9=YrGf(>tfmh91YCO32wpC>*UwD!}d0+PaRxGLEH$uh=2J500960)SX*z(=Zgr zpYtv9zyl~<$vx@b#t>qHF~l|rgm}os)k?c&>MmOO^yC~niQU+avx^wgq)w^r#*X95 z@j1Ug+REv?iw1nFckImow(GR>3jHn$T0B%WQp%Keb8kC;iho&0?dSbO*R0BO=$St|gRsZF2TCSF{ z%o*PRq0j)KS_DnvlluFQ>Mlo%pY1(-sOq_{kBD9Yv;nT2ke$MYzd6OYVEUJ^Hm122jEAPHw# zLLLWlI?lHBy4MZ%>pyQcz;R++X>v#I%{fj&CK<;G){3_!g(z*v)ha7sq{GAHe3PwP z#ZDWZNPkgG>H%kQjdX4$ck!iFrm?CPwLr+F$MLK zZBg7HqyRiS+uu3(eBP9beGExaSDOl$t`y}2AS&QURhyfv?qJQ06dRJ^1bX!OYg0ma z&*JwG|3sUJ!J%5(DHe)lP)1aPUwsxn)YGZT`F~jwr@mJNZt9hO;rf9`iqen0bRPL} z>=${M&WoZn#z_es$N+oJx+kRp#AO+kagxv6>9oF|s3_wwjmJUPS%GHIb(R=u05Pby zIQ560w$OEzDqR<#|L)t#!TZC5)3bVd$QxvLiH0sdz~7?r{lXWgACEqq!H{WfQh^wt zW`7CLvRF}$hD_v2%jRxA*~3ApP&*!3-5xB2u)d4~+BFvw+~Uu^qdcotqwDC+^q z$5A>-8Rwx(7h^i#H-J6}xKD+0fEgkJ(SHzAc-4mF1W^0{H6fiiQ2^}qpojszKPFDE zW+RN(8E~XZ10#?QtDC>w%-{67)t5}rol@a z1{%m%114yP-Pki3pka(8hNUB0lqd~!g?`_ zK?I+)`WNqb(vCO)+OKKS1=4vk=6`Qn)Z30XcCo4;q;U-pUgob-*^827t8O>}=%y~%)!54Qlt|XUzF5rJ5KBSbH29HZ#RZH0wLf`aaHv}xw(?<*&3|uFf-97O zL6*WS&sHG#^0ix=h7N*@zwWAl`0qtd%STPN#^Kj2Z^dDt6;Tt8Jb1K)4vjK)fno+m z0c&$xZ^7nlib>g%`CSb4jCOh!Cg7g>LK_Ucd*3Vm;rs;v0RR8YUE6NkFbw?_JuWbe zA$HOZ#r|dJW@ISR#lVuH+kcAw`y^4abs;IqcH+LYg^?UL#H%*M8gY= z)PH1%y&M5aBt)Al1P8fi!{|wL9C3|&?pz9qAl4#Hn18KDZ+OBRKgw56eGdyG7(A%W zE5%EJT~#cD$XM>nkPS}l?^VV9z4mMO_Hxb@e8S`^PT+h1B^&%x*}k8o8cb$|h>!$N z3sFx0;7{4F#7k;_*?$nI*Q}WOA^NsU8ev@EOAE$%8D4T!5TUZnUX$bNcu>b4e|wxDt2JdR|e=D`R>W|6}Mu|!L~xRIXI zciFoIbk3PZ(23ZLnkRRt@Q}dKAvdras{}%A`7I_OC_fVY<$n~k-kQK70|{k<8I{L( z?0;M1cvLU!xGy~v+ESyu)1GGY#jSp#e%!%BWzIS!hkZ7IiUI;37xCJ^Ja?+tceslw z+2EhQqdwn~N76m@@{Jp&d-7~EP`nMVyhbfItfFf* z#Aj|9npIxX`rk4qzzp|L#!2G*daP8A^v-C zat zzKr^&;aNJ7cS0y-P|WCG?>Fg`EfYta7p{%tkd#eI(r}DB=VAR9RWH0iQ5h|p(YD1jXeV+e^TxRBs#>&P zQ;XViEz0GGV68>O57Dlwd9iieZPEt&D(cW|a+9tjvcs#$^B({J|NqooZExH*68@b0 z3c|e}ys&32X|>uHw+HyzIOjv^1h#`*fPVuPdbRhu*7{bvvE8Em?Z+9C5+#vq`Q=iy zLF1UDC~`EMAs>>@1YOlr>C4{M9oF;0>1x@|%}11O0WHPS){OK;I@0%m!uXF= zm~%QC-D-HLKq|7pg9;+<&Nn+y|9|L$bf9_Hr}32yU+kB9|NkgIXPoqu{toK?rMZ4F zoIkA~k;fmT(*-guT?jmau*dr&XAE|~ZIx%oIs7)MJ~&0N%-kA0I8Q$J2QBOex>K+; zp&95-UZNiLw>;WDzS@c1=_@PC;0ekyc$%^dIw?zwHGKt89!(P_4#6FQySuvucXtR5 zFYXSDyITlOaM$2&!GpU?aCbkx|L&@`YNw`Vdb?+bY3ej28*BX+eATxMp&k6|91R|w9lJHDIpX4Bt=aP|GI5NKwt0|;vV4ZO3O zoI@=O3ux5=F&y_OaIdudIh&+*S5zOo-#7jppPye-8K8y2@~I3Kl$}fOQofF{YO+szvpAc0y@#TP~FRU`dZrWtQoy<8}qYB6r)@ zpya7k4k-<@VzbRy;MN^EXr(^f3AIc=Op@yXd*^>%zT--M4##{8y&o7GdUOl)LjAkm zQ4A(U_7Un^xdy~Hm@`G*VmXvFOHWVu@p^$8q^5Dv=-M)I;Nw>XS7iR1MY@ea%}#;P zPbds6f2)b7eK4SVBgg z$Dt#aJTKBE!N8)nw786BvhR`96-10`K(_yf$k7C{N3VHXH41+`M!{5msb1@%m-kpb zZ*>K$d{RnALZ#aK;)RRH-)=XKNGXb$V2U^A1PAQsI5vz6u|(b%TQXli{CC8Lw(0c+rQh>Fkt2i zjVIR9_p!9Nw1N8tcoeas&m{qWeB}2SWd~&}yLP&mZh!3dGUNacToX@~X1zj}^S1)U ze>SgL)#A1TyrNlux9oi4l`mBmn276L<3x2zAt)u|qt&}q7Fy#;N!|N7?@c7ktj0Q| zsLd}IHf04{HHb8tF$UKh2TL?Dp&?%6OCZH>(`_4;N}?Q_ZjbhMh%bZ_FSepGdwrrb0#lqECLcrYZ+8was4oQBq)MAg^H?z+B*a)eugGB`X@|~j zlh*1Q^CJc5Zt1eocW%!JVT>U&BDQOAAH%LT5uQVp1efgV{t!RXufF+lU-q8eiN{4Z zU)*0W`iQmFJVZPk-4UVTo<-q2n4Q3FBdDWVIOowMC(V{IYvY?u6(#VfeW}_pcx>7c zdy^d9e%!nL^R*82mf0+Em0=poBe6^9jC@DHJ#_=D>2CDQ-gM~Z2rt~gkky!kbYj@% zgIKxuS|EowO~hIQmpZIV%ACp6Q`**wN@DL!?oiddS>1AXYK3rR zHxv<*8w*1THbg|_B8+Y*!@5Uw-rpYLx)d&tR~v3HMg}B4NNln5CwH6@(UZNGTUZ4B3ysf&`fPy{DZ+e%BkRAKKL1Lr!aWhB1U*gmKyF@16@92!W*yn$S-7~g_l^KPx)j?I!+b>;Le&~?v=UPBZFM8lxfs4o zJi>BKsmJdF7vRwsyU@*GgC<^?X)zQ?lhru}Xd`h(1GM@)mogum{$_PEBJ2dI0*MKkCe{GgpswPQV_)KTuG2!#*>kcO@ABQY zzKFDFJ=yvLy1ETbbFo^Zjw!}i+?%MVH^pS=F7;PDte=YC8NTPW*7s|rh;#Kk?$3v# zrp3EHhx z3Fk~_`uw`UbK}OqFL-3G?zB31+;V{|tk{MIO){9mmp3g4cA=~63aZt)!_|Pq^ku_} zJe<56B!{}iaWA!3k2S7AQxG7sw7n&y3mtO~eaqD8%S`M=tE*`2lBMeiMh{@=)(2%! zqtFIOZI!fJ)jkHJ+e!Au9{Mo?$%u z%T1+Q(vTa@&PF){qN-KF#t4|cau|og)=-!|@KQ@o1a+5lYa~OzD>N#p^6TvJmFFI< z`x>nGsP=~5foT23GVT^(HBt?U)ik{QqW0h`|3!@I)SS2$So@~`lgXI;u}H;1h*_Q4rUIyyh{q$kF2c{V zZI(L^87|(9FZAKqg}PeyQM`pro9ut4+dWy!kWwu+w?u|u`Ym$Phv;p3t$7ScXXI3~ z#TbU-UZ8W^Yl6IRd&@UeRUkJjy-ojQ3DuR>o_K!<8z8-|+(|Cd7YM)pl+2p78-@-l zECKne69OUDbRJLtZh=3}k()?~sfT>hu731%s|@s_OO6ELi5OCFeaH=thZbe*QT%dst#nTw)LwIW!?T^xDdhFa&uhpCp~`0~;=FI*V$pNntHCc_`y2o74ZM z{x^_b5`fo?!9>KR#br@tF)ExIlI{&i6hk0~_G6)GKp|vRt^HqTeq`e43zS<7<_a!t zBa7-AvY1wkdQw3nt163Wp;3=?Z%m@K=?se>cz-!EVg(;d<#AqUqORx9V_ez}R7rTd z7)(Pr@=z{GYmI?PT-v42X-0)cebT)li9iq`+8tRRtVsf2XUVRKSh}o8VyP3hbDeX3bp(c!m2@LZCrS% zA2UZ`f*=Xc6@zJuTei%p`}%8;wn@NbjF9WiaO~)}fZ>FGHy9uZ4-YMSOTuL&Zrc;HB!XWTh$jip*;8Cq@cI6fnG>FvaqyoLz`k)3 z0t~FGR-z(PK>>Nt;LGFX`HOCX4ZklX^hno#vdA!pCEBYvd>VlrgZcUMmsn*c6iV~9r1nW@L8bu((4UtgQ&QWqq6QBNyfd19v!J@ z_{xmk3Q<_6lr6iWN+Cka2xJ$U`t64X@w z<#W489w}DS0@D`tfcaE;9bqTUJNCMdrQ3&~2XR>CY1dHx`JyQsE09T;6*2jG@=R2$ zJqM-@I~UFo(Mc2?(a3QLp*-f@=o;ebrwSbMw@-)|t*9YB(w@T097ml3zrT({$kUT#TgtNk8zq?EUX46mWq$C=PbfrHrRQ5z!g9 zZwK_LrqoWH9l1IPvJ7vc-#v|zACgbDac89%>%f8nYlbUq1Dlalw%|L6(J>!Bz@TAc zjg>gWJX3*u9;+&qPS|-rRwc4&*rNvo5UqJ*(%6-A|15?0 zjfr1+JK05^<@Y3?oOaN%10_2|u=Z+DqLK(K%T_#Ggo8l+KC_9>3nA&y*kcdf>hN>se}2p;c|Dj)Lm^OZ}f;+naa&#dzWh z`w(f?be!u0B|>if9QMU?n3?R2cxc4)Y&!+@<84WoG~|5cza3T_EN-RdS*&Sh3{ffB z4uu0Z>auG7JC^G=ct!){V*g`^-RLG+!SPYikDiNbCem~?9)ORpna%Td$B(00SS{1Rabs91o)#xVv@sdF$vum}X~1yZnzJ{} zp~0t=sygC}7CIu3I16m?qYEdqX$E2f(TLRWm)3T^laa{vHVA>3-w~v8Z5X2JB=dEWub4|LQTGZnyVE05gEaWIDc4UKNV=a%hbTV8R* zT@QNVfe4wg(SkxKL3B5ctbR=LC}$lx5G?&D83yC7Om4s2F!u|l)h*bRb}7{V1|P9P zM#d58#xdD8bxM?+TYU7VTZVuY%$$FP={_h}A-dK~*fac`m7z3KF5}2h+?(SPY~S4qjr`bO#F#I+%1jPczm+a z4v2WtK6;MiJ(xPTdI7V^>957tU6&UR?iDwo1?O~Qs{0z%|DK;cYo)pD>=&mUx9N>Z z0Gq+DTq(SI{hhX$ zICJ)mD9-lLGK*72?z51oVDWr$6lY9?2e3@H-tDyC`%5?Z#r%?n82THo_}wxz{Pjat z?bha0IOz@haWt;Vw-JBfZ(?UubXA9V_wU7@k+99WnmtQEzqQ+vc+!hg69~^X(^=sePtP-=QB@vj5RZ{8PEP zbjS@NtUeyTrAL{sc_n(j8zgFoQ!Ch&Il+yKlmD}A%m=(PJ!^a*yeXQjNXUIn^C9!V z-dQZkfx=XT(oP2HYzL9EY-<}&0O z5nyMZ%8##lGylSAP^*@3grrY~e;T4^vyjza2@j_dAQljb#AkbPd)(XcdteE|7n^@VqHnmDZZk$X#=sM$3ah4LT+UIu zN;{}(h4eQY`fK^mNpDMJc@533gkmW^2w=X`B*Zr{C*d7ra0MqlltRQ7$pIC%ftg(Q8tJe7+0xg=|w@B_YS1BtWCnTR!6wH`7&?8{nhCmdLK6bQOO@@=ZteUi-^%~OS2_DEBF|FRTe$Hg0qq}5kgO_f+Y zf?6*q(9ZlyuA)Z*&Jww7hPy#ze^}e_0yC89aV@~(#KPiPHjlw9+p84u*@fRy^9T?n z#BvLw-oVTA9TZ~*@B#aDPZ|E*y? zSbULnChpIkKk6zDkwaERNT)PtqrYdSG=C8vf*}l}*_RsF2ta~u{c_oYNmo9%2*X}X zv&h?78Nk(ZQc!1AI76eQ!exd(0-1#f11 zGK2M^^6-(hjbAm4*_*;2;udkL4eBMyNshk@)1yf}ssvvD}zMiSB)0TSC71=(hYW;nXNgs6*@%_`VM^T#VL0r#Nbp@3+Mo(9r-= z-I4}GsrDb#Qq$V2S~iHqTTn}D(>meVxHXP~(=>LQqikB0=qp4Yeq-vbexMl^-p)Nj z6yq9Cx;EITOg665bRjc5GJXl~aUEi?p^Wos3^$5#u)iQKOJup+-I7pZP8`IPS&uc_ zQa^$=!7SVJtB9|t->$p}W3iigPsjx7TY1mp7%LjfV5-M|*gYuRM7gEf`zdqF^S+m8 zxbydt$jbgK0wrRhN)#GrNr5njd4iuB;BVY;sX!`w(S=l-f~(yX&8o6>doz8SVcRJ$tkk zCLz)cWYR9eT_M-HQw?gQ7ro6K5&sw)zj2gf&DaA?FztdOT|9LM{$}hZ0L)Tj58f5M z=_PJK{hShQ$0}7hA?W)i(UE||OyNKTmAO<4(|cOzJFbcME1H+}KN4-h(^N1)C1M_- z=iBk-Nc-lAiK?iz;V@A>7wC_UiW5O-AJ22;%|#S+dEOta%6e>jZuIIYgGv1%V%+_{ z{Fz2!=tS2z0}cYt_=2>il3FDA#Km9bqnIl1?}){*jpkvPp6JFb8mfRfV>K*eR2*87 zh1$Q*2QV%ImE}g9j!dFwvHH`=k_Q(CVDYXfCnOB2MPNm1Riah(4=%UJ_ahdA*P|Ternb1|Bf9YgP*hJ>n;mafy~MLtIQ=k@oZ~n z@bUU%nTDgIEr-|H=|mAoIJ78{ab~!q%7TDhRP#R&Ml&ah>0g2kl2ELk1dJk4rvMI*%7FbYa3CfTn+@ZW=k9asozWOl zQTYU4e>TMk9cU+q<%5x{L|~{%qOa7PFqug_#QyzFtS$-AB-nBVb0`owCka@Hgj2DL znebT(M(L7)rG(gU+j34U1|iQHmeniY}a663-Kd*N<^ zpAO@L4=YXs>Mo%XwP#zo2Km(*^S^aW5z^q=IOnrV)}{(c>nZ1P%M>_}p-%q)i2pEh`xUK{O%esx0onVh^rzNA*#8~Q{nv=u?887FrD1A{`r>08 z-Z1=syXOo9|0_O}{lbjs7U{&QtdcYfSkSY%(X_dF?6eRP6j`Bhyglq+$$9K0Chg$X zQA4sxjP13fbnRkjgiYhKXNnxwO)Cs_0p2b1+FomeAJ$6RV~!#VtlL7Q8k6E%=`Qj? zHQ&Va=OZB?eWLwZu7xrsXYnTM?CN=8Gh>K#8RgQBwEt2xv5d9ERpxs^3THtB#Xj_$ z^`WUb>F_d2^585n59-M74a=K?+x+%!?Pm=+vTIAcg{!GZ8t&jmx|P@*5yuN-qpw&3 z$P&TbZE))hq5ik1={VkRectP5M3jVjKd5;Yru7tokN%zS^4I4%etn+o8DPn$Q9n29 zkiKOX7;{MULCN_*aB+#`^T4%meqsX9wynykCLj zk}{r|X|azn`)TsJ@T*7{suy7Usz3x9T8FW$Y*70rbJlNVGoRlmc}>1RnM=JP*V7Z# z&CPx4ms}=|2Pg1yd*=E1l`}3AfAcW;1z1)U#{{N#lz74lfyK~+S?BIuoxoct{XNzd zhSlS25<4^kV~eTP@x0*L_Y@j7l_vz}IF=t|kV7hRe4C|DP@K#$+@YTJ*U9w?H)*e(edl=%42`_2p9AfbnTM`OlxGIHkkZoiM$xL=LPT9isv zVLtU;RcNb@uyc5NcNq$=I*Z+JhmSvE+eiE>sRs#Aa{^aQ4dS@SuMbtAIb!JYNO!c6 zRYm%3X!5q*FsFpDlx}T&$W4pBl2?IxYG zeqx|t_TGMN%{W5HI^my8X^8~Q_9%=8*w@SVwNnowRgiWBbVovR8>;gt*Ui-Eyy5%W zNsOP|9ygaeM#D)~r%Gla`N9_&F8o9k(gJrFBjnat*sg!;G;GMDgh5}_VJa;PkV!hH zzB4nv-nvOtpJ*fl^5rPsEO7sp7FtLRYeqCtd?ej#Jr5SBObiwAE}|4*i%$JbDvMek zO~)RFLP=J+b6#gBz{UgPO`#flTA&hjR>Y1*=ncZY-{;eW`h)23{y*STU-yqxk$Uz3 z?n-4F#twXQ$G~a#_&Ayf{OnC-6{4A$gq_$ z15tx^F#x=H!Q7=XIlVf@s>rjie{aTpFmi9j4!#F4)eTpk$EJDyV^U^YOBS_8a74^C zvtY~FiBU7w6;Lto^w?RaQW-= zanCauchIxbh-!p0)Bie9v%6IL)%bzP^yc>}u}^7+qgj6CNS&Kv;ibTYMai{SfgE&>Rs9tMOCJ30;DQFIzntQrdb083at7jT z?I(8L$$(^J_SbqR=;{DfCIeEBQDyUYAca1-C@wRC9_l-#d5N@CVfW|3m8i@-cTs!bIYG+kplOFac*byBiIBrlQ> z*px`6%doj?`TM_ZlL)9aijaB$R2<_@pv6epHRJDkSB&Y#zlDqGV{)AMu#1Msv;&GV zda=|QhOtb@OUIE*`&JhURYswouw&NK7Wf*oX3lz+40IGA; zLpHlgqF0J8HL&LX#&ZHJ#+8RvQ?ZXDPCr$XjhFoi79|H#gNDNrx!Fboj96Os+cjL; zdRt}xMZt2o?@j&eF*N~DxU<25?(Izyd5E}WafFm!Ykgj>U4q4ln>RdAV=|?kQFf)G z7&-&Sm?&RwlP%GR))Xa>&Bu86KW^SRLL0SJo=YDfw3=NWel)z|#X>g+^{KXs(!s;Bj zl~ZT$@(>M|D4}DE4Pt@zfLAl39cQM88bN_ zx!eMDt;FX7=PbwCJbemc#uRKJSU9-;Taq(~t%!ou&ZgfVyDmL_$x{)l(hpK#rLMa0 zjgQlK2l*6YPWag37?_gmxsw8ITsEJqz17KD|xN?jBeY zJs@%_BJP@*cW%_ZA2^j!V@u}m3wW1AX@-zGbwRBP3U ziq1d+Hsi+^M|<)g9jXV1CNoExIo^0-Qb@5D{L9}4NdnGkyOKK?VPU1{ldu1R!{=ET zf&iNg}>O)OH`h@9jB2I9mFkr153GU-G-VOozA6yLsJPs_z9 z=}N292L&b_B6Waww2R*#VFwlqlP*kisE^5R_B}*diS@+Na`^bhS)g-Rg6TR!G~-Et zFrv}Wja9fgRq^=K`Yt_@eL=rxiZe2Q>|-*f!(kBN?eH2k{F>)jT78Dt0K@D&{@@b< z6jLh9gf!u|yvEMs=V|#G)Xh_=s^df|6iKK9@uC(2-xW>;1IfC_-Ag19H$j}-OJ7#O zru}CaRvmRx;iWG&aX8vCGf&M5yd4Zp(fo}sunQW~q*_tt%lzsI z>QX+}U94#AQK*(+ApIFnVWQzJg2 zc&YF>Sm$deh9nGb|=u_EyBm-K_T6pEX+0@;NHpdnzxe{I59RdWP)QHWr)fN0f! zT`O^rA-ROK_)EeRf8cU^y~Ee8(4W&@q?UY6T6IDUBcVs))hDv632`YzhKS4&1l;$G zt4J*l+H1Pbe(G_VEFDC?EkC97J4c-`2p7-m{GJv$ppm;)PF#)$jPmMVQCRl*k-$^4 z_9f=Q@XmqFHUy&n8gty__rr}$nNz7^n=hMDkXqt1^5}n+Lhz%8F;wxovRfh#&?et_ z0up#}43$*V=`jAW^q)DkA6#aAp`nNxQvVsaLpGR)G|1ZiXC97a66L&waIL)Q26P}N z1HL)ZZ)cb)Vr|Ag@{?YBr*60u_X!LJXGP=N3z0f7AS9K^z>nLKr5;Rc#UbBtV_#^J z#r}r+O&@*p8os_B=2X^>Rnw%f8H$OJTHbaR(e6)-JUwgDlpH#JQy&GYkSE((fS!}d z#tUK${@WwUf8l?>2L^PQ$x=jqkrRCFs0=&z>?}JQn@kf6H}`K2ifblB`EOs=!UM~| zovDE^TB}hc@j!m~tE--RZeF5F9wGrscvVD1Jx3e-jzD)*ww26%~^r zX^b4jL z9ky^Vy3m(*Xe68dyC7@^tG*fnP7a7oR68sA)re7Y^5W|-U-kV&TrDq}#ME$fJun@9 L9dNg5c(DHiZrTr` delta 513 zcmV+c0{;EN{s_pR1c0;wRt|rSU0rK~Fcf|6zsOT*p%c>ut*|#&*w_X|yO+I`Sj|@G zx}qzC{rcUH7%k4$x7x(3`M}(pdvXq*qQ5V;LJBESF+us)KT%6k!-_wHn4e-nDs|dAwVn5mdx|A6j+(U?PEo@QdrfxQsp# z;ae^UGfE-=k105hlk$5H0nd00z9UNjz-qo)#ev#vrY&Ir_}7g-l%T=*VHrQ+RNJJl zE2M-MWh8t9-^&Y-DkvR?>b$qaY(LWp`T-gHeS%Qcx3qfAKSL=pY~QGF6?2-pJv D_KyUc diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index 1bc5bf08ee..9a84a5f816 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-62"; + patchSuffix = "-108"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-62-gc493f6a0e4 + glibc-2.33-108-g3e2a15c666 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix deleted file mode 100644 index 4aa510f360..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, gtk2 -, mono -, gtk-sharp-2_0 -, gnome2 -, autoconf -, automake -, libtool -, which -}: - -stdenv.mkDerivation rec { - pname = "gnome-sharp"; - version = "2.24.4"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "gnome-sharp"; - rev = version; - sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; - }; - - nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; - buildInputs = [ gtk2 mono gtk-sharp-2_0 ] - ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); - - patches = [ ./fix-mono-path.patch ]; - - preConfigure = '' - ./bootstrap-${lib.versions.majorMinor version} - ''; - - dontStrip = true; - - meta = with lib; { - homepage = "https://www.mono-project.com/docs/gui/gtksharp/"; - description = "A .NET language binding for assorted GNOME libraries"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch deleted file mode 100644 index 706f119c8b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am -index a0ee802..8260694 100644 ---- a/sample/gconf/Makefile.am -+++ b/sample/gconf/Makefile.am -@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES) - $(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES) - - Settings.cs: $(SCHEMA) -- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs -+ MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs - - CLEANFILES = sample.exe Settings.cs - diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix index f560529530..627e5f46f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, automake, libidn, libiconv +, perl, gmp, autoconf, automake, libidn2, libiconv , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , guileBindings ? config.gnutls.guile or false, guile @@ -21,11 +21,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.7.2"; + version = "3.7.3"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - sha256 = "646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752"; + sha256 = "16n4yvw3792gcdxkikjmhddr6cbs4wlk027zfxlhmchsqcxw8ngw"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn zlib gmp libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index 25b7770101..667d50ca4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -46,6 +46,15 @@ stdenv.mkDerivation rec { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) + # Fix build with meson 0.61.0 + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/827494d6415b696a98fa195cbd883b50cc893bfc.patch"; + sha256 = "sha256-imVWzU760FRsX+eXREQDQ6mDcmzZ5ASLT9rBf4oyBGQ="; + }) + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch"; + sha256 = "sha256-o7a0qDT5IYcYcz8toeZu+nPj3SwS52sNgmxgzsmlp4Q="; + }) ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 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 016a7a992e..e575173d72 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -8,18 +8,20 @@ , python3 , gst-plugins-base , orc +, gstreamer , gobject-introspection , enableZbar ? false , faacSupport ? false , faac , faad2 +, ldacbt , libass , libkate -, libmms , lrdf , ladspaH , libnice , webrtc-audio-processing +, webrtc-audio-processing_1 , lilv , lv2 , serd @@ -27,7 +29,7 @@ , sratom , libbs2b , libmodplug -, mpeg2dec +, libmpeg2 , libmicrodns , openjpeg , libopus @@ -39,6 +41,7 @@ , fdk_aac , flite , gsm +, json-glib , libaom , libdc1394 , libde265 @@ -46,7 +49,7 @@ , libdvdnav , libdvdread , libgudev -, libofa +, qrencode , libsndfile , libusb1 , neon @@ -88,24 +91,20 @@ , CoreVideo , Foundation , MediaToolbox +, enableGplPlugins ? true }: stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oWSSO5Tw0IV4pvyuqsbgwF2niKRpA6EIaHDpykWtZ44="; + sha256 = "sha256-AVuNTZo5Xr9ETUCHaGeiA03TMEs61IvDoN0MHucdwR0="; }; - patches = [ - # Use pkgconfig to inject the includedirs - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja @@ -113,6 +112,7 @@ stdenv.mkDerivation rec { orc # for orcc python3 gettext + gstreamer # for gst-tester-1.0 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner @@ -124,14 +124,14 @@ stdenv.mkDerivation rec { # gobject-introspection has to be in both nativeBuildInputs and # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection - faad2 + json-glib + ldacbt libass libkate - libmms - webrtc-audio-processing # webrtc + webrtc-audio-processing # required by webrtcdsp + #webrtc-audio-processing_1 # required by isac libbs2b libmodplug - mpeg2dec libmicrodns openjpeg libopenmpt @@ -145,9 +145,9 @@ stdenv.mkDerivation rec { libde265 libdvdnav libdvdread + qrencode libsndfile libusb1 - mjpegtools neon openal opencv4 @@ -166,7 +166,6 @@ stdenv.mkDerivation rec { libGLU libgme openssl - x265 libxml2 libintl srt @@ -175,6 +174,11 @@ stdenv.mkDerivation rec { zbar ] ++ lib.optionals faacSupport [ faac + ] ++ lib.optionals enableGplPlugins [ + libmpeg2 + mjpegtools + faad2 + x265 ] ++ lib.optionals stdenv.isLinux [ bluez libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs @@ -193,7 +197,6 @@ stdenv.mkDerivation rec { libdrm libgudev libnice - libofa sbc spandsp @@ -229,7 +232,7 @@ stdenv.mkDerivation rec { "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" - "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing + "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing, also this is AGPL so update license when adding support "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support # As of writing, with `libmpcdec` in `buildInputs` we get @@ -255,6 +258,10 @@ stdenv.mkDerivation rec { "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing + "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3 + "-Dgs=disabled" # depends on `google-cloud-cpp` + "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing + "-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235 ] ++ lib.optionals (!stdenv.isLinux) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` @@ -286,7 +293,17 @@ stdenv.mkDerivation rec { "-Dapplemedia=disabled" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dintrospection=disabled" - ]; + ] ++ (if enableGplPlugins then [ + "-Dgpl=enabled" + ] else [ + "-Ddts=disabled" + "-Dfaad=disabled" + "-Diqa=disabled" + "-Dmpeg2enc=disabled" + "-Dmplex=disabled" + "-Dresindvd=disabled" + "-Dx265=disabled" + ]); # Argument list too long strictDeps = true; @@ -311,7 +328,7 @@ stdenv.mkDerivation rec { something - be it a good code review, some documentation, a set of tests, a real live maintainer, or some actual wide use. ''; - license = licenses.lgpl2Plus; + license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch deleted file mode 100644 index c687fffc9c..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 271f327f3..7e2afa754 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', join_paths(get_option('prefix'))) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 8b6073cb95..82d9084567 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -41,19 +41,15 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M="; + sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja @@ -120,7 +116,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ - common/scangobj-merge.py \ + scripts/meson-pkg-config-file-fixup.py \ scripts/extract-release-date-from-doap-file.py ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch deleted file mode 100644 index 04486a4647..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 04abfbee5..88c86b431 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - pkgconf.set('LIBM', libm.found() ? '-lm' : '') diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 268da01716..fa11883477 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "bin" @@ -34,13 +34,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao="; + sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch deleted file mode 100644 index db16842693..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index edb0586c2..7ed46dfce 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', join_paths(get_option('prefix'))) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('libexecdir', '${prefix}/@0@'.format(get_option('libexecdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - pkgconf.set('LIBM', mathlib.found() ? '-lm' : '') diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 0b7be2bd03..aa92410e0e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, cairo , meson , ninja , pkg-config @@ -12,17 +13,13 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/s/8hkR9r1wqBoQ8dXqZHXRcqiBpRGoNdG6ZsT98sHk="; + sha256 = "sha256-afyHVuydk+XFJYyZCIQ08gPpH9vFryjR8sWD/YGbeh0="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - outputs = [ "out" "dev" @@ -40,6 +37,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cairo python3 json-glib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch deleted file mode 100644 index ff19c7cbf6..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build -index a612b21b..c017eaff 100644 ---- a/validate/pkgconfig/meson.build -+++ b/validate/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 0bfe6f3e0e..4630ce6d0c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" @@ -26,13 +26,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ivSoOU0FHz4YKAaG20mm76zMlcDFmhfw9WTjIABZDfU="; + sha256 = "sha256-+Detz0Bz0ZpZCJhOh5zQOfQZLKNo5x056MzYpWuf7t8="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch deleted file mode 100644 index 1e12f3bbfb..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index a612b21b..c017eaff 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - 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 a6ed248b66..3b686e4c7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -48,13 +48,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Oq7up3Zfv4gBrM5KUDqbBfc/BOijU1Lp0AIyz9VVeWs="; + sha256 = "sha256-LRGcFauMnnn4zTxr9YL/egULKMyuUqtIZeGhRkmRZZw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 7f2828253c..0d9f22d7d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , python3 +, gstreamer , gst-plugins-base , gettext , libav @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gi4AipEOndE67b3Y3GP+3vQEDA7i6Se6sxEuneaTpUg="; + sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc="; }; outputs = [ "out" "dev" ]; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gstreamer gst-plugins-base libav ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index a75af25224..80190200c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BNY79IgWxvQcc/beD5EqfO8KqznEQWKnvOzhkj38nR8="; + sha256 = "sha256-wgn17ZBtpxP91EqIROkJqmyK89+2MCWbCSz7d6d1WEM="; }; outputs = [ @@ -25,15 +26,6 @@ stdenv.mkDerivation rec { # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs ]; - patches = [ - # To use split outputs, we need this so double prefix won't be used in the - # pkg-config files. Hopefully, this won't be needed on the next release, - # _if_ - # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1 - # will be merged. For the current release, this merge request won't apply. - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch deleted file mode 100644 index d31fe19fb0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build -index 8ed8299..594cbfe 100644 ---- i/pkgconfig/meson.build -+++ w/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 7c4b21f7c8..05133271f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -19,17 +19,18 @@ , IOKit , CoreFoundation , DiskArbitration +, enableGplPlugins ? true }: stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3zKAPpj4qZeTc/osp+BeYvl3sQl1dtOoBhnZ9cafZtk="; + sha256 = "sha256-To3LXSZVLwpJN/a8Ynm9kHD1XKauDqoy1y0mTEQAHC4="; }; nativeBuildInputs = [ @@ -43,14 +44,15 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc + libintl + opencore-amr + ] ++ lib.optionals enableGplPlugins [ a52dec libcdio libdvdread libmad libmpeg2 x264 - libintl - opencore-amr ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation @@ -60,7 +62,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing - ]; + ] ++ (if enableGplPlugins then [ + "-Dgpl=enabled" + ] else [ + "-Da52dec=disabled" + "-Dcdio=disabled" + "-Ddvdread=disabled" + "-Dmpeg2dec=disabled" + "-Dsidplay=disabled" + "-Dx264=disabled" + ]); postPatch = '' patchShebangs \ @@ -76,7 +87,7 @@ stdenv.mkDerivation rec { the plug-ins or the supporting libraries might not be how we'd like. The code might be widely known to present patent problems. ''; - license = licenses.lgpl2Plus; + license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index 5de9a247a5..c8b6230cd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SkYPuVVZ9BRE6ySGStLZ43kitu6pQVEDEDGfw+C6cns="; + sha256 = "sha256-95pHNG39XlheBj53B45fxJiwbe6JW/y/R9iGP8rJ6jI="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix index f35f5e0552..b083ca02cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk2 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer , autoconf @@ -54,8 +46,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ - mono glib pango gtk2 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk2 + libxml2 ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix index 6b996244a9..8b594a00a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk3 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer }: @@ -30,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - mono glib pango gtk3 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk3 + libxml2 ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix index f5aba82956..afb6c0d037 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.4.1"; + version = "1.4.3"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iZGWteZvA7jiXwRqemWM0qaFG+y4Py1VNFqzKBZV3Aw="; + sha256 = "sha256-FO2nd5NNot90PQckiZM72YETMre1v0Fia4Ay77KLM7o="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index cc6287eace..1e36f1e7f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -24,7 +24,7 @@ }: let - version = "3.1.2"; + version = "3.2.0"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "sha256-1xndbJhx+1AzJNnpvvdEcBHPZMPaMI03h6sG2h1d3qs="; + sha256 = "sha256-iNYp/hyJTaaF6e09YpUL7ktBhq2wRN9zKiEH59WLbYU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix index 70e9a39e03..ffe534ede4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "0dzigvmwbg20b33xn0sklnf489m8g84yrcm8kqlrsd7x8iymsg63"; + sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/idnkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/idnkit/default.nix index 472a23a2b7..37354f8be4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/idnkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/idnkit/default.nix @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; meta = with lib; { - homepage = "https://www.nic.ad.jp/ja/idn/idnkit"; + homepage = "https://jprs.co.jp/idn/index-e.html"; description = "Provides functionalities about i18n domain name processing"; - license = "idnkit-2 license"; + license = { + fullName = "Open Source Code License version 1.1"; + url = "https://jprs.co.jp/idn/idnkit2-OSCL.txt"; + }; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix index b61f4e442b..1447a327e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.3"; + version = "1.7.5"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; + url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; + hash = "sha256-RY2DAKp6bUzjU1GDi7pdn9+wiES9WxU8WTjs/kP/Ngo="; }; buildInputs = [ @@ -28,11 +28,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = '' - substituteInPlace imlib2-config.in \ - --replace "@my_libs@" "" - ''; - # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors configureFlags = optional stdenv.isDarwin "--enable-amd64=no" @@ -40,10 +35,6 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - postInstall = '' - moveToOutput bin/imlib2-config "$dev" - ''; - meta = with lib; { description = "Image manipulation library"; @@ -56,7 +47,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://docs.enlightenment.org/api/imlib2/html"; - license = licenses.mit; + changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; + license = licenses.imlib2; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 644975ca66..8581ab729a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.0.1"; + version = "22.0.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "1s46vwcs26hdlsa8h51gq4fyi9i8k5hrcx5ffbv9g7v3x706nplf"; + sha256 = "001kkm1l4s9i7ikaqpf78l5h0a5dy1m9w5r5g0yrlqpi54h6ph28"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix index 074dc2be01..73b5d0d140 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,17 +1,17 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4"; pname = "commons-fileupload"; src = fetchurl { url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72"; + sha256 = "1avfv4gljp7flra767yzas54vfb6az9s1nhxfjv48jj2x0llxxkx"; }; installPhase = '' tar xf ${src} mkdir -p $out/share/java - cp lib/*.jar $out/share/java/ + cp commons-fileupload-*-bin/*.jar $out/share/java/ ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix deleted file mode 100644 index a7270bbfa2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gwt-dnd"; - version = "2.6.5"; - - src = fetchurl { - url = "http://gwt-dnd.googlecode.com/files/gwt-dnd-${version}.jar"; - sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - - runHook postInstall - ''; - - meta = with lib; { - platforms = platforms.unix; - license = licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix deleted file mode 100644 index ebba854801..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/java/gwt-widgets/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gwt-widgets"; - version = "0.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/gwt-widget/gwt-widgets-${version}-bin.tar.gz"; - sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp gwt-widgets-*.jar $out/share/java - - runHook postInstall - ''; - - meta = with lib; { - platforms = platforms.unix; - license = with licenses; [ afl21 lgpl2 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix index 11f6141872..c65a3af9c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix @@ -1,37 +1,31 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "2.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw"; + hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM="; }; - patches = [ - # Can be removed when upgrading beyond 2.2.0 - ./reproducible-manpages.patch - ]; + + outputs = [ "out" "dev" ]; enableParallelBuilding = true; - - preInstall = '' - mkdir -p $out/include - substituteInPlace Makefile \ - --replace "install -m 0755 -s" \ - 'install -m 0755 -s --strip-program $(STRIP)' - ''; + hardeningDisable = [ "fortify" ]; # avoid warnings installFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" ]; - meta = { + meta = with lib; { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; - license = with lib.licenses; [ gpl2 bsd3 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ johnazoidberg ]; + changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; + license = with licenses; [ bsd3 /* OR */ gpl2Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ johnazoidberg c0bw3b ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch b/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch deleted file mode 100644 index 68de5a8ae7..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4ff069b..3b8714a 100644 ---- a/Makefile -+++ b/Makefile -@@ -58,7 +58,7 @@ cppcheck: - install: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -+ gzip -n -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) - install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) diff --git a/third_party/nixpkgs/pkgs/development/libraries/judy/cross.patch b/third_party/nixpkgs/pkgs/development/libraries/judy/cross.patch new file mode 100644 index 0000000000..a4e53c08a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/judy/cross.patch @@ -0,0 +1,22 @@ +--- a/src/Judy1/Makefile.am ++++ b/src/Judy1/Makefile.am +@@ -18,7 +18,7 @@ + libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE + + Judy1Tables.c: Judy1TablesGen.c +- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen ++ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen + + Judy1ByCount.c:../JudyCommon/JudyByCount.c + cp -f ../JudyCommon/JudyByCount.c Judy1ByCount.c +--- a/src/JudyL/Makefile.am ++++ b/src/JudyL/Makefile.am +@@ -18,7 +18,7 @@ + libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE + + JudyLTables.c: JudyLTablesGen.c +- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen ++ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen + + JudyLByCount.c: ../JudyCommon/JudyByCount.c + cp -f ../JudyCommon/JudyByCount.c JudyLByCount.c diff --git a/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix index bec72ac802..da8e89f935 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, pkgsBuildBuild, autoreconfHook }: stdenv.mkDerivation rec { pname = "judy"; @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; - # gcc 4.8 optimisations break judy. - # https://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = lib.optionalString stdenv.cc.isGNU '' - configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") - ''; + nativeBuildInputs = [ autoreconfHook ]; + depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; + patches = [ ./cross.patch ]; # Disable parallel builds as manpages lack some dependencies: # ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 4135f6bfd7..ac077b73d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -59,23 +59,24 @@ xdgDataSubdirs=( \ "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ ) -ecmHostPathSeen=( ) +# ecmHostPathsSeen is an associative array of the paths that have already been +# seen by ecmHostPathHook. +declare -gA ecmHostPathsSeen -ecmUnseenHostPath() { - for pkg in "${ecmHostPathSeen[@]}" - do - if [ "${pkg:?}" == "$1" ] - then - return 1 - fi - done - - ecmHostPathSeen+=("$1") - return 0 +ecmHostPathIsNotSeen() { + if [[ -n "${ecmHostPathsSeen["$1"]:-}" ]]; then + # The path has been seen before. + return 1 + else + # The path has not been seen before. + # Now it is seen, so record it. + ecmHostPathsSeen["$1"]=1 + return 0 + fi } ecmHostPathHook() { - ecmUnseenHostPath "$1" || return 0 + ecmHostPathIsNotSeen "$1" || return 0 local xdgConfigDir="$1/etc/xdg" if [ -d "$xdgConfigDir" ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index 825e757c7a..50204bc0ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.89/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.90/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 3465fc63da..1ffc5df68c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/attica-5.89.0.tar.xz"; - sha256 = "03q2ajvwrl1x6h0jcvc6nh0avj7dqhx4k1lx5qa3xgfxwk01kgp9"; - name = "attica-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/attica-5.90.0.tar.xz"; + sha256 = "0zs37qyh9biafk76ps2xfc41hbd1n4dq42qqqcvbqcrwfgqz2wlk"; + name = "attica-5.90.0.tar.xz"; }; }; baloo = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/baloo-5.89.0.tar.xz"; - sha256 = "091gjzn4armm4xs61csavwgij54mv8v9hx3gvva18g06gjkajyis"; - name = "baloo-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/baloo-5.90.0.tar.xz"; + sha256 = "1nnfys8dyiivd2if81qrgrmpprfni77an9l3wff0l5k85ac86i56"; + name = "baloo-5.90.0.tar.xz"; }; }; bluez-qt = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/bluez-qt-5.89.0.tar.xz"; - sha256 = "00wczjvvhxzi12ijf65d66x36gm0x6j5z3b6cwqgdz2s66wr0jw5"; - name = "bluez-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/bluez-qt-5.90.0.tar.xz"; + sha256 = "056i5ndrg5fqm1bx49a0plfhlladphha128wi766zdhcm6np11z3"; + name = "bluez-qt-5.90.0.tar.xz"; }; }; breeze-icons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/breeze-icons-5.89.0.tar.xz"; - sha256 = "12l2wzc3pah5qapznriaffh4wz97s6nqxlj9i119k9qw295d6wfw"; - name = "breeze-icons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/breeze-icons-5.90.0.tar.xz"; + sha256 = "06dfh571rf8gp4gnnqn13xqgc1bpc4ycn6bmxf38x53fxxfl3fnn"; + name = "breeze-icons-5.90.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/extra-cmake-modules-5.89.0.tar.xz"; - sha256 = "0bzhd6xcphrcnbg8ylx91rq5y3vvl3jfcgik19bvh8sr4ad25mrx"; - name = "extra-cmake-modules-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/extra-cmake-modules-5.90.0.tar.xz"; + sha256 = "1c5wza7srib3mdkf29ygmyj5b6jq322s6h7k5hlljqm5xhy7q07k"; + name = "extra-cmake-modules-5.90.0.tar.xz"; }; }; frameworkintegration = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/frameworkintegration-5.89.0.tar.xz"; - sha256 = "0f7cqxmgnwi4n8fa8vifqaysbk7839x1qbmp9qfa998jxnn1w92f"; - name = "frameworkintegration-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/frameworkintegration-5.90.0.tar.xz"; + sha256 = "1v7vlq2gk7j5b6gzbawgnpii7csh2zclp5v24qhx4qrmpfssylan"; + name = "frameworkintegration-5.90.0.tar.xz"; }; }; kactivities = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kactivities-5.89.0.tar.xz"; - sha256 = "1dhxl487246kpx4w5zhhdgk94jwns09dvragvh2bb787mszqq5v9"; - name = "kactivities-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kactivities-5.90.0.tar.xz"; + sha256 = "0wf7nnf3bjz2iq2wqxnyay1100ks0zscsh7sa8xfcijrl7pp305w"; + name = "kactivities-5.90.0.tar.xz"; }; }; kactivities-stats = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kactivities-stats-5.89.0.tar.xz"; - sha256 = "1pp3vkkadaday0pzd09hdhccw6hbrqp481hcdzzyqj1x2ckb59bj"; - name = "kactivities-stats-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kactivities-stats-5.90.0.tar.xz"; + sha256 = "0qamy8xggjlnm8pkv6vxbaagcp1hg9vgi2ws2yb9xpqk8mdlfbvp"; + name = "kactivities-stats-5.90.0.tar.xz"; }; }; kapidox = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kapidox-5.89.0.tar.xz"; - sha256 = "0a3vwh3rzpcaylz77fs4biiadljchs2lfh6svg149yg95yqwng3b"; - name = "kapidox-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kapidox-5.90.0.tar.xz"; + sha256 = "16jl519sx7pirjp5x57x5gbgv477457063rrbwpvyf2ldb6lc29p"; + name = "kapidox-5.90.0.tar.xz"; }; }; karchive = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/karchive-5.89.0.tar.xz"; - sha256 = "1s45mns9km1fy2d07d2nmslf4dc2pl5i169ncq2dc7vabjvyh59b"; - name = "karchive-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/karchive-5.90.0.tar.xz"; + sha256 = "0411rpgr9dy0zf9mmhj7n7ax0afrn7zvkpzpnjvpvvqsrfkz7qm6"; + name = "karchive-5.90.0.tar.xz"; }; }; kauth = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kauth-5.89.0.tar.xz"; - sha256 = "1ys9xr7js8rj07ff7ncp9d52rcn10bg49jcyg4ldam07bfpq36nz"; - name = "kauth-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kauth-5.90.0.tar.xz"; + sha256 = "1g4i1prspcczpx25wvd8lgdk8c3my7kp3wv489gvcci40rl5z913"; + name = "kauth-5.90.0.tar.xz"; }; }; kbookmarks = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kbookmarks-5.89.0.tar.xz"; - sha256 = "16bh5daimpjwy0gz56v32vslnmzmyfsf8z92s5gi13bkjfp03syn"; - name = "kbookmarks-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kbookmarks-5.90.0.tar.xz"; + sha256 = "1svc1i9zxbxf65crfhnv6sz5gknb7x87lzjd8cn11y5lwnsw36kx"; + name = "kbookmarks-5.90.0.tar.xz"; }; }; kcalendarcore = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcalendarcore-5.89.0.tar.xz"; - sha256 = "1xy045d5jl3qk9ka13ximk7x70q5pswh143kqk7cf6x0f7bvgpap"; - name = "kcalendarcore-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcalendarcore-5.90.0.tar.xz"; + sha256 = "0qbds2ysjv9rqwpvrhisvdd6wyhq5qwhbw5xcbj7ndxwpf8lpa8w"; + name = "kcalendarcore-5.90.0.tar.xz"; }; }; kcmutils = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcmutils-5.89.0.tar.xz"; - sha256 = "0za9x8v9lnwyib1gip6wbmda19wfjaf2yh6yiqlszxcbsfq7kzhm"; - name = "kcmutils-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcmutils-5.90.0.tar.xz"; + sha256 = "04crq3j48xwlvp047p3waqrv1gg5sv1950jh02w85q00yjjh0qxk"; + name = "kcmutils-5.90.0.tar.xz"; }; }; kcodecs = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcodecs-5.89.0.tar.xz"; - sha256 = "1j2pmsyi8lvhnzhrrvsm98x7inf503vr2b58yl070zp293fyhd9q"; - name = "kcodecs-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcodecs-5.90.0.tar.xz"; + sha256 = "0kwqyhjs63pqslqcmv3sngyqvl6ah8iaa6nn045sb8a58xb09inh"; + name = "kcodecs-5.90.0.tar.xz"; }; }; kcompletion = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcompletion-5.89.0.tar.xz"; - sha256 = "0bv9kxrdprk1jvsf9mqkag0pkq7h1wngdpvdx9wfy4kkbj7y46zf"; - name = "kcompletion-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcompletion-5.90.0.tar.xz"; + sha256 = "0hd3nsixibw5z846mpib2lap3ar65rqvasifdnlmqsrvxfmw0ggk"; + name = "kcompletion-5.90.0.tar.xz"; }; }; kconfig = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kconfig-5.89.0.tar.xz"; - sha256 = "0ixil0qyd8byn4ix5w9mp5kdvkscnwhamknrnbqzikhmmknprccf"; - name = "kconfig-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kconfig-5.90.0.tar.xz"; + sha256 = "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn"; + name = "kconfig-5.90.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kconfigwidgets-5.89.0.tar.xz"; - sha256 = "0rzqx2knc8bc26jyislb1dw5qdhmkga3cqlyiyynbawx3scind60"; - name = "kconfigwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kconfigwidgets-5.90.0.tar.xz"; + sha256 = "1sm1x64x2v3xfcz9ia6qk8d8y1q02fggrc2q0yy5ag5xh1yr9zwq"; + name = "kconfigwidgets-5.90.0.tar.xz"; }; }; kcontacts = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcontacts-5.89.0.tar.xz"; - sha256 = "1yjgrzn3bx8fzmr6mjd2c99gxlh0nqm1fi3sgmcn1bj07jdrp52r"; - name = "kcontacts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcontacts-5.90.0.tar.xz"; + sha256 = "0vv2136da5a6lwdj2x38jx2qwrk96hgn8iwaad4yynvc2csx6dim"; + name = "kcontacts-5.90.0.tar.xz"; }; }; kcoreaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcoreaddons-5.89.0.tar.xz"; - sha256 = "0ss27wz8z2lfhn0njads2rwd62aciamr0vcbj4gyfiv2ddw8bl71"; - name = "kcoreaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcoreaddons-5.90.0.tar.xz"; + sha256 = "02m4h4r0kdy94zq8c6d2fhnd8qwrp4a0v5i4wf6khk4yf4fqy5kf"; + name = "kcoreaddons-5.90.0.tar.xz"; }; }; kcrash = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcrash-5.89.0.tar.xz"; - sha256 = "07pc449qqvz6rfs1wk6r2jgfncpliig8c1cxzhbkzqrkcf1gj6ba"; - name = "kcrash-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcrash-5.90.0.tar.xz"; + sha256 = "0634jqzbvr8xkv53n2q3fcqlkcmq843w7g455v3swnlaqi92l04f"; + name = "kcrash-5.90.0.tar.xz"; }; }; kdav = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdav-5.89.0.tar.xz"; - sha256 = "1wyg6bxfp1r1snk40y6q70ix00aqwx4sl4z7jrg12h38cnc8sa6v"; - name = "kdav-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdav-5.90.0.tar.xz"; + sha256 = "0181ray8vigmwlamx4j5dinw10al0g4l965kyx4wjq9k59nxxgbi"; + name = "kdav-5.90.0.tar.xz"; }; }; kdbusaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdbusaddons-5.89.0.tar.xz"; - sha256 = "1yh5xx01wsjcj6axcw1r94p32rrs111078prssgnngbrihbhbjzh"; - name = "kdbusaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdbusaddons-5.90.0.tar.xz"; + sha256 = "0g609bymfixwaic30y7i0q96anf7pi3galipmjbbfg85ghj9rsa4"; + name = "kdbusaddons-5.90.0.tar.xz"; }; }; kdeclarative = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdeclarative-5.89.0.tar.xz"; - sha256 = "18a4rcx60h5j44d79bhr2l46f3lhgnf2x0sb64dr7dcc0m5rmsay"; - name = "kdeclarative-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdeclarative-5.90.0.tar.xz"; + sha256 = "1z7zyj6pw2ym3izi19kpgy12mqpar6mbdbsn6jpxy36l6m3jld1y"; + name = "kdeclarative-5.90.0.tar.xz"; }; }; kded = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kded-5.89.0.tar.xz"; - sha256 = "1rr3g7b60zlx8j7d7k2hlhhv2wa67lakfpyd1zgpy2y3k281hbfl"; - name = "kded-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kded-5.90.0.tar.xz"; + sha256 = "094g6p87nd5cxcars71315w6zrxjgiw2080p6cf6g72ww54k7sps"; + name = "kded-5.90.0.tar.xz"; }; }; kdelibs4support = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdelibs4support-5.89.0.tar.xz"; - sha256 = "1672f75f0wmdrqhx9vynzgflm3ssmngkpp1r5li53ppb11wg6sbr"; - name = "kdelibs4support-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kdelibs4support-5.90.0.tar.xz"; + sha256 = "0zxc11jbg06qz79ljrd6wl36jp73hafcmbk29d0hcvxnkscg3k29"; + name = "kdelibs4support-5.90.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdesignerplugin-5.89.0.tar.xz"; - sha256 = "0g8y51i70m8s7y829qyqnki57s8d4l3xdpdbn1p2rr1szglj8hvf"; - name = "kdesignerplugin-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kdesignerplugin-5.90.0.tar.xz"; + sha256 = "18gsy8f32hjadzjnavi3dsknc6hflcnfpr0107lwfc735fd2x2iq"; + name = "kdesignerplugin-5.90.0.tar.xz"; }; }; kdesu = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdesu-5.89.0.tar.xz"; - sha256 = "0jmww11l6709cpfriwklhij5izsh948mki9grzzq3jijw8zs0mrx"; - name = "kdesu-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdesu-5.90.0.tar.xz"; + sha256 = "1q8k2q7c41fzw9gwx9nq4zjpjdwvh29zyh3zd0w3r2kxf6vhf1wp"; + name = "kdesu-5.90.0.tar.xz"; }; }; kdewebkit = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdewebkit-5.89.0.tar.xz"; - sha256 = "0xwd346z928yk4iwykgashc36m2xqnwn49jix5jbk1w57dbia2da"; - name = "kdewebkit-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kdewebkit-5.90.0.tar.xz"; + sha256 = "19dqlxy2sl822aldqy1jj7fvxabmg97a0av7d5ayzhnbhhy5izx1"; + name = "kdewebkit-5.90.0.tar.xz"; }; }; kdnssd = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdnssd-5.89.0.tar.xz"; - sha256 = "0v72g137l8kl2xapfrcrw8w6zmn94h08hvwdggzr9fvgswzdbvsh"; - name = "kdnssd-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdnssd-5.90.0.tar.xz"; + sha256 = "17szlqsafz6p4h7s9wascaggn5909c1ig452wy6y4z4402s2lsrr"; + name = "kdnssd-5.90.0.tar.xz"; }; }; kdoctools = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdoctools-5.89.0.tar.xz"; - sha256 = "1x8q45y2sgi3d9j79qcx02z2939j52mp1jrs3rjqq42xxvvrlcg1"; - name = "kdoctools-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdoctools-5.90.0.tar.xz"; + sha256 = "1l2a9mlcm8np3s8myq0hj08l82284r90yhx3z2gn7h68b8fzyx0s"; + name = "kdoctools-5.90.0.tar.xz"; }; }; kemoticons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kemoticons-5.89.0.tar.xz"; - sha256 = "0mcyq20ca6x73jhwwhhwq8jzqpadnazjy5y9dyfa2wz8ijbnjqzw"; - name = "kemoticons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kemoticons-5.90.0.tar.xz"; + sha256 = "08mgk56dafj3q9gs69qcx17qfc45s8ifkjrpzg44p8zs0q51q6cb"; + name = "kemoticons-5.90.0.tar.xz"; }; }; kfilemetadata = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kfilemetadata-5.89.0.tar.xz"; - sha256 = "04abysdijmpdd05grihawpbw8f9h3fhlv3y7wjz76kl66gyqg035"; - name = "kfilemetadata-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kfilemetadata-5.90.0.tar.xz"; + sha256 = "18y4bn6hz8xa68m0nxv88a1f3xkkks7c7pbiqb1vkrp9bbh52yax"; + name = "kfilemetadata-5.90.0.tar.xz"; }; }; kglobalaccel = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kglobalaccel-5.89.0.tar.xz"; - sha256 = "0jxxlhmwsgrx1p6w1al9c11bglxn5im181wqih7ds5h2naa7b8kj"; - name = "kglobalaccel-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kglobalaccel-5.90.0.tar.xz"; + sha256 = "04qd1fcc22x70jacqzrv44q1jg5ldzynlfpw5cg2679409r0wnxw"; + name = "kglobalaccel-5.90.0.tar.xz"; }; }; kguiaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kguiaddons-5.89.0.tar.xz"; - sha256 = "17mxkk4w4q6bkqblkdinw2b0jdfxhk7xkfy5hw730gjm6is6p861"; - name = "kguiaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kguiaddons-5.90.0.tar.xz"; + sha256 = "0m9l8xyc7xyj29fzxwp8ahr2l1rzs5rw1c26x446kb7smxvy8awx"; + name = "kguiaddons-5.90.0.tar.xz"; }; }; kholidays = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kholidays-5.89.0.tar.xz"; - sha256 = "0ry0n73dkjxv7ani753mh8ymy4yblhj841ca5y5kci8wr9h6358w"; - name = "kholidays-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kholidays-5.90.0.tar.xz"; + sha256 = "1p1kgy110ijk5a3ix4g9y1i7w0gsnzf82jdkwbdza95vibm82iz8"; + name = "kholidays-5.90.0.tar.xz"; }; }; khtml = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/khtml-5.89.0.tar.xz"; - sha256 = "072pawwp62mx5shh8x4mcpr8h6a24qr82zyyiricz4jba0r7z3yr"; - name = "khtml-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/khtml-5.90.0.tar.xz"; + sha256 = "1bi839x4dhlkqxmv98pq01725b8i8szdxf9b1hf1jv37fk468mja"; + name = "khtml-5.90.0.tar.xz"; }; }; ki18n = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ki18n-5.89.0.tar.xz"; - sha256 = "1zlq0ywd8hnaniwdv3vd76xmv91cdn6pqs6k9y6dz3fayl15p0g6"; - name = "ki18n-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/ki18n-5.90.0.tar.xz"; + sha256 = "13k8kbkmgdywclcdbfj5ri3gmdblv8yzalmvqd0hn7sym6pkdqfw"; + name = "ki18n-5.90.0.tar.xz"; }; }; kiconthemes = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kiconthemes-5.89.0.tar.xz"; - sha256 = "1hv8blvvg12agjynl0yvvsl8dfsyk2aa9clmq60igcs5lm4jpvaa"; - name = "kiconthemes-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kiconthemes-5.90.0.tar.xz"; + sha256 = "0w3wi4xy1yy2s1a927cj4my63q0fqhw06ghy9zjw830m31xwpx1k"; + name = "kiconthemes-5.90.0.tar.xz"; }; }; kidletime = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kidletime-5.89.0.tar.xz"; - sha256 = "0547yj8yn9nly3bkq3in38ljhwbg0bvj0wp3yxp2dl05wpyvzqfz"; - name = "kidletime-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kidletime-5.90.0.tar.xz"; + sha256 = "1xzwmk0aqv1lcdi51nl1k0lyiinnqxwla6w0xxmsh6193qa3fpvq"; + name = "kidletime-5.90.0.tar.xz"; }; }; kimageformats = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kimageformats-5.89.0.tar.xz"; - sha256 = "1m3fl14lzsfl0fam38nnalapc1xhpryf1ibvcm7bgh4g1cm1bvnw"; - name = "kimageformats-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kimageformats-5.90.0.tar.xz"; + sha256 = "0r3ihkly0hf20aqbn7b9171mzqjna078rksdp96z6f7f1qy99v1v"; + name = "kimageformats-5.90.0.tar.xz"; }; }; kinit = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kinit-5.89.0.tar.xz"; - sha256 = "1llaqz7yv011k4g1fvy1rzlff8bdgvqwqvh3s3nrqahwq2gx2rr9"; - name = "kinit-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kinit-5.90.0.tar.xz"; + sha256 = "0z65hfhj68ahjm558p2pj7dlrczcww8f2xyw9f44w10bp3p5hf1a"; + name = "kinit-5.90.0.tar.xz"; }; }; kio = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kio-5.89.0.tar.xz"; - sha256 = "1ka8s6cj7ms74w4xj6x91hx1ijlh883x3ibjwmbhva6mbzk1z0nx"; - name = "kio-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kio-5.90.0.tar.xz"; + sha256 = "0ds6465fyzjj2azwdghrkxr9wvih0m96lv4kp6syqwii8nv2w7rs"; + name = "kio-5.90.0.tar.xz"; }; }; kirigami2 = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kirigami2-5.89.0.tar.xz"; - sha256 = "1jn5c0lhh7hcp81278kagw0r96nri80x9vrg51jg7cs42h7pfp98"; - name = "kirigami2-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kirigami2-5.90.0.tar.xz"; + sha256 = "0r48n11pv3yqsf11phl19cs52ph5ldabrfmq3xmsvxsknm6c4f9b"; + name = "kirigami2-5.90.0.tar.xz"; }; }; kitemmodels = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kitemmodels-5.89.0.tar.xz"; - sha256 = "10bag80kjz4x22097z9w1liw73kkirk72266vr0qplyr00jwqi33"; - name = "kitemmodels-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kitemmodels-5.90.0.tar.xz"; + sha256 = "0f7zlif7kskbwpw8yrzlfyl954b623icdd9qn0algjcc2i9gqbzi"; + name = "kitemmodels-5.90.0.tar.xz"; }; }; kitemviews = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kitemviews-5.89.0.tar.xz"; - sha256 = "180n41gkv6vgmljcqh2sg5922glq59z56zq7y299vwnkgix9aqns"; - name = "kitemviews-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kitemviews-5.90.0.tar.xz"; + sha256 = "10s285vxaaxjcy3am4bvch5wd7wv64wwcjvj7lqk2866aql9hmzp"; + name = "kitemviews-5.90.0.tar.xz"; }; }; kjobwidgets = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kjobwidgets-5.89.0.tar.xz"; - sha256 = "02ysdzn25a9lms70fawnz3h5vdxy9p528qmbxslsnpz29r5h2wb8"; - name = "kjobwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kjobwidgets-5.90.0.tar.xz"; + sha256 = "1jv3c68mlsxhnd6jgqw5d4qqd66jf8bh6zbcs6bq0bad52ad2r8d"; + name = "kjobwidgets-5.90.0.tar.xz"; }; }; kjs = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kjs-5.89.0.tar.xz"; - sha256 = "0yxk4qwl4cxv3kklvla5q3xx2vgj4lwp4pb3bplkkbighm01naih"; - name = "kjs-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kjs-5.90.0.tar.xz"; + sha256 = "1z5d1ixzvaq6x9x0jhmh5bdrdqpsl1x7mh3s8wnycfxwmln6bawv"; + name = "kjs-5.90.0.tar.xz"; }; }; kjsembed = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kjsembed-5.89.0.tar.xz"; - sha256 = "08ajxgh1lfbx8nf4vsljzcwkfjih8fyqp9nr2xbv2a9dbv51x1sf"; - name = "kjsembed-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kjsembed-5.90.0.tar.xz"; + sha256 = "0ydrsg7z1b5hkskjvkb0b9lhx60aqcby2alhfbmkac197sf2frn4"; + name = "kjsembed-5.90.0.tar.xz"; }; }; kmediaplayer = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kmediaplayer-5.89.0.tar.xz"; - sha256 = "0hf44hij1bqcfvxhs7ka00habgh3lc39xajnblpm9br8xybgkaz0"; - name = "kmediaplayer-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kmediaplayer-5.90.0.tar.xz"; + sha256 = "010m5qrn41hcxsmxsq72m83qxikfvn3mgibkgy4bn2x8kxibzmlq"; + name = "kmediaplayer-5.90.0.tar.xz"; }; }; knewstuff = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knewstuff-5.89.0.tar.xz"; - sha256 = "1qw3lm4vjxal7r314y0zqj59fmzj4b9z2dsd10r3mxpiwjra0s45"; - name = "knewstuff-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/knewstuff-5.90.0.tar.xz"; + sha256 = "0q30p7z5zg3p24gp8q83i7my5bg4yfcdwsblmhl230kih8aap2cg"; + name = "knewstuff-5.90.0.tar.xz"; }; }; knotifications = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knotifications-5.89.0.tar.xz"; - sha256 = "1jghpawqp0zy1scs2l0dqz2sqv4xd65xiavabpjwhycx5pxpvbhs"; - name = "knotifications-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/knotifications-5.90.0.tar.xz"; + sha256 = "15qb3jh5y1z84dp6wddwid4bk3ks05knkxlwv79hb9cdj8m4m7gi"; + name = "knotifications-5.90.0.tar.xz"; }; }; knotifyconfig = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knotifyconfig-5.89.0.tar.xz"; - sha256 = "041qnnxhsi35xygyzlppvpghfd8fxraas824dz7rfjiym2zid7jh"; - name = "knotifyconfig-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/knotifyconfig-5.90.0.tar.xz"; + sha256 = "1qss40sr7az9x4yvl59mblzzgjm3hd8nvxgqmqlylargvggw496c"; + name = "knotifyconfig-5.90.0.tar.xz"; }; }; kpackage = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpackage-5.89.0.tar.xz"; - sha256 = "198n0gr2v9r11ml2vkx9xazxf3rbw3qgc44l7x134rpn1jv9b0s3"; - name = "kpackage-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kpackage-5.90.0.tar.xz"; + sha256 = "1rig9aws8530sav0pmginqmdcrnz10qjbxfc5lw6mmb3sfig53z0"; + name = "kpackage-5.90.0.tar.xz"; }; }; kparts = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kparts-5.89.0.tar.xz"; - sha256 = "0vdz1sxqkx2nynlsywyp8j2ciq226cs40c3m70lqs0j5w283i5ra"; - name = "kparts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kparts-5.90.0.tar.xz"; + sha256 = "1x8kxd8kgzabd9dyqx2yx1qrrzl1mms4hm3lyg3f1nxki7xl6ra2"; + name = "kparts-5.90.0.tar.xz"; }; }; kpeople = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpeople-5.89.0.tar.xz"; - sha256 = "12bry15lr7xpgmfgpw1mdd805n1af6050vaa3pk4mbf0vc6clg5y"; - name = "kpeople-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kpeople-5.90.0.tar.xz"; + sha256 = "1632k365bn9n3n8babq620v0px2hmapk8fprx28xpfp27zakhfgw"; + name = "kpeople-5.90.0.tar.xz"; }; }; kplotting = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kplotting-5.89.0.tar.xz"; - sha256 = "1asqzv5jl2nb9ml5vwlpcsi9f2vw7y8rcihlvkf569s7kxsrswns"; - name = "kplotting-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kplotting-5.90.0.tar.xz"; + sha256 = "0i5ganvpzkpkd2p1avw0fpbp3mgbbifg8mmpvdf28ayh75dvrh9y"; + name = "kplotting-5.90.0.tar.xz"; }; }; kpty = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpty-5.89.0.tar.xz"; - sha256 = "0053sx30d1w2m03wqv3mhkjrxdf7ps1xj8h74fv0a0clf9ab0i4x"; - name = "kpty-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kpty-5.90.0.tar.xz"; + sha256 = "1p5ny9ry0wwwprhpj9s9xg96h9476rldly7mawvfp5q3ihys8c4a"; + name = "kpty-5.90.0.tar.xz"; }; }; kquickcharts = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kquickcharts-5.89.0.tar.xz"; - sha256 = "05syj1162j1zhg9wws81kk9z2ri3jvlvnq95l3gv29zf582j7h91"; - name = "kquickcharts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kquickcharts-5.90.0.tar.xz"; + sha256 = "1vf9vwrb03z6f19xyc1dc50s3kz21s4mkrv85mmyia0by4qvq5fi"; + name = "kquickcharts-5.90.0.tar.xz"; }; }; kross = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kross-5.89.0.tar.xz"; - sha256 = "0j88ikhxypyy4yickcz3hcdfaj8g7qjinf5va7g5ghzjar7q9x4y"; - name = "kross-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kross-5.90.0.tar.xz"; + sha256 = "1gs7h03j753pq78q0fmajgd5pw8j3mc105rsph1c22l23vccya3z"; + name = "kross-5.90.0.tar.xz"; }; }; krunner = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/krunner-5.89.0.tar.xz"; - sha256 = "11wzn33k6gwfiwc6idhsr8fj441c82bbzz8bx8i228ymvnqrdcqx"; - name = "krunner-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/krunner-5.90.0.tar.xz"; + sha256 = "1q3hsml5274v8dy8rnqpnwxliad2q7a8mbs8k6kpqzih9z94crgi"; + name = "krunner-5.90.0.tar.xz"; }; }; kservice = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kservice-5.89.0.tar.xz"; - sha256 = "0srbjazz302w7zsxh5zcq5zhgz8ad09zxld1rpfkyxg5z820lrq5"; - name = "kservice-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kservice-5.90.0.tar.xz"; + sha256 = "121y8bbq3m4pv5m9pj753v2nk914216a86ksmdqbgffw217qckdd"; + name = "kservice-5.90.0.tar.xz"; }; }; ktexteditor = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ktexteditor-5.89.0.tar.xz"; - sha256 = "02bg84dmqadjlwfmccviz0d0wj0qf9fy2i9igq4mv150hqy93bb7"; - name = "ktexteditor-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/ktexteditor-5.90.0.tar.xz"; + sha256 = "1g1dky9bgr2zjr0rw9c730shz588ykyw7qw3sgf0dr3sh8aq222n"; + name = "ktexteditor-5.90.0.tar.xz"; }; }; ktextwidgets = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ktextwidgets-5.89.0.tar.xz"; - sha256 = "0yz2y111hjs1zq1f8887sn334gpf0sv4lrfq3i5dj0x3vcjgmccl"; - name = "ktextwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/ktextwidgets-5.90.0.tar.xz"; + sha256 = "02g85zahh6hfsw3fcac7hp8kv4d1ha2asmmhnknqd054yl0adxjg"; + name = "ktextwidgets-5.90.0.tar.xz"; }; }; kunitconversion = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kunitconversion-5.89.0.tar.xz"; - sha256 = "1bmnlcsi8qbba38ywr3f4vd7kddiwzmrnn9n69c6626jg4aj3g1q"; - name = "kunitconversion-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kunitconversion-5.90.0.tar.xz"; + sha256 = "1vrvbsd8limfsmgjcv5kvzyf7g62rv1a0rvbdyq15z23zf4rsmf3"; + name = "kunitconversion-5.90.0.tar.xz"; }; }; kwallet = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwallet-5.89.0.tar.xz"; - sha256 = "1yy34asal5jni78jxywddh3hjpzsr1myck0f89h78a2zc28xnd1h"; - name = "kwallet-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwallet-5.90.0.tar.xz"; + sha256 = "06ffg84jvrc8xhymg1g5j311vq3ajfqg3arx2cxa98aqld213akl"; + name = "kwallet-5.90.0.tar.xz"; }; }; kwayland = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwayland-5.89.0.tar.xz"; - sha256 = "1sq4zy9bifbqlg8s3af2vwxyyg84kmxfyvdi479cn46vdavylp2j"; - name = "kwayland-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwayland-5.90.0.tar.xz"; + sha256 = "0n7f4rx695q889j8g4sdpdi3jhk29z8zc4wrk5srs2diqi4y0qqi"; + name = "kwayland-5.90.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwidgetsaddons-5.89.0.tar.xz"; - sha256 = "1rs30ialmrhwvxah6rvzbavjnp4ziaaf0j0jcm63kyqbb5nywgmk"; - name = "kwidgetsaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwidgetsaddons-5.90.0.tar.xz"; + sha256 = "1c17iq0q2w80p7v7k32db0pc5sbzqhvh0w5d145a1nkgr3nbnk6a"; + name = "kwidgetsaddons-5.90.0.tar.xz"; }; }; kwindowsystem = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwindowsystem-5.89.0.tar.xz"; - sha256 = "1h0v72mb7s36ggw8nv70rpk16q0cflbhgvqwzlfqvh68kbs35a4q"; - name = "kwindowsystem-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwindowsystem-5.90.0.tar.xz"; + sha256 = "0fj7a86dk833ld76c3b1s4ri47bhpvjsi6ryfgdv5q7h2fwh6ia5"; + name = "kwindowsystem-5.90.0.tar.xz"; }; }; kxmlgui = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kxmlgui-5.89.0.tar.xz"; - sha256 = "0mjfg0hd9rswz3jpmc8xjw5jqgip58cx3bavijdlnp7pla7r7j56"; - name = "kxmlgui-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kxmlgui-5.90.0.tar.xz"; + sha256 = "1q8v1wrx67c37jnd874ilkk8kfk3zvf3f86qg51k16ml0nrwjysg"; + name = "kxmlgui-5.90.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kxmlrpcclient-5.89.0.tar.xz"; - sha256 = "0ri3z76r1v1vfp3j0mrpvan6jzmp57a5g4vwshv4zgyvr484qhlp"; - name = "kxmlrpcclient-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kxmlrpcclient-5.90.0.tar.xz"; + sha256 = "0mq2wgi4qnvscjdkis7jhs004k3s1b3wg0vijjai7xzy772kvclc"; + name = "kxmlrpcclient-5.90.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/modemmanager-qt-5.89.0.tar.xz"; - sha256 = "1sam8cr638h9gyp60dhgmrpddy6y7waf9xaij46kvc0xdan501fi"; - name = "modemmanager-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/modemmanager-qt-5.90.0.tar.xz"; + sha256 = "08nlvg5lwvl3rspi848gp2b2b5pki6sy8c3ww9nn4afy4lk7p609"; + name = "modemmanager-qt-5.90.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/networkmanager-qt-5.89.0.tar.xz"; - sha256 = "1x1pxsf4dm8h0bj6my9rg2j95nnn81919fv9apvqglf6i3xd2pq4"; - name = "networkmanager-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/networkmanager-qt-5.90.0.tar.xz"; + sha256 = "0i9wvrxbkbil21zndiq4cmnldbqsrdp9gnhmp2ns78xdih8wysa7"; + name = "networkmanager-qt-5.90.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/oxygen-icons5-5.89.0.tar.xz"; - sha256 = "1gmx2k5hqfa0lap2y9sv7csi09s8nl3rvab5nz731wr3s9m2frpr"; - name = "oxygen-icons5-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/oxygen-icons5-5.90.0.tar.xz"; + sha256 = "1izfh6cxivmwiymy7lwbmf9j1hxy2skv6z1lbjr0c4snmx6pqx1g"; + name = "oxygen-icons5-5.90.0.tar.xz"; }; }; plasma-framework = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/plasma-framework-5.89.0.tar.xz"; - sha256 = "0wx6a3agplfmf2p86ljhgd3pjx7f15g1hp660i62zw84zvpsh2dp"; - name = "plasma-framework-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/plasma-framework-5.90.0.tar.xz"; + sha256 = "1msqjnwvb815kii0rjhn1lvsnvq5wr8iprdjzsviw67va6gaz4p1"; + name = "plasma-framework-5.90.0.tar.xz"; }; }; prison = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/prison-5.89.0.tar.xz"; - sha256 = "0jd3qfj5k4fxqpbkjpr81mvni9kqppcq0gn5yyc9nys4wk4nr934"; - name = "prison-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/prison-5.90.0.tar.xz"; + sha256 = "0z2k2hyjj86va5rqgd8qrvhflfppcl2d3f9smxb5w9pp19ashvyk"; + name = "prison-5.90.0.tar.xz"; }; }; purpose = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/purpose-5.89.0.tar.xz"; - sha256 = "1sfhwzw1ghr1yg4fkrz0r2myd5569mscsr98pnc3plr78ppq9lwy"; - name = "purpose-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/purpose-5.90.0.tar.xz"; + sha256 = "182196hj3mdy1k7wfgadfxy7m1kbqzk6kksn7yd681h2gpky82l1"; + name = "purpose-5.90.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/qqc2-desktop-style-5.89.0.tar.xz"; - sha256 = "1q2y0hb69f3ldaslbpw8v0xapchqndjp4wzgmghd1zqab8lqjl5c"; - name = "qqc2-desktop-style-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/qqc2-desktop-style-5.90.0.tar.xz"; + sha256 = "05g1rydx0innmiz28mslix4bjsrhsnci227gadngzijncp2v288r"; + name = "qqc2-desktop-style-5.90.0.tar.xz"; }; }; solid = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/solid-5.89.0.tar.xz"; - sha256 = "1gy8ddg5803fpdifg68gkjrl9l2dwjrmwyzq5jzsfr6yabcfih93"; - name = "solid-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/solid-5.90.0.tar.xz"; + sha256 = "10hk4mh426dhi7is5hxa1varn15ijzra5a420zk297pzkphvx0ip"; + name = "solid-5.90.0.tar.xz"; }; }; sonnet = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/sonnet-5.89.0.tar.xz"; - sha256 = "0fdkx68hyp5fq0fyfbq0691vcx70qm7md2nd4028gmpcbxxaixa1"; - name = "sonnet-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/sonnet-5.90.0.tar.xz"; + sha256 = "0d4xxm9vw1rc2mypv4z0yihcn679sab0afxr2kbzq01wr6p759y7"; + name = "sonnet-5.90.0.tar.xz"; }; }; syndication = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/syndication-5.89.0.tar.xz"; - sha256 = "186dw32jhgfwz7dz9payx645gvhgzcf6qy5qiad6ifkvda50g9cw"; - name = "syndication-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/syndication-5.90.0.tar.xz"; + sha256 = "0a9j443w42jwvlzjh5mfxn25kwjrz1ya6sgy0c4y3n5xbg031zmx"; + name = "syndication-5.90.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/syntax-highlighting-5.89.0.tar.xz"; - sha256 = "0iy9ryjf6bcxwp9kni00p82mx1bg101z8331ykixffn41vfgxb9a"; - name = "syntax-highlighting-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/syntax-highlighting-5.90.0.tar.xz"; + sha256 = "19mckdfdxb5i26y75cgmda91s864jbh1wmf98bv8xa1iqxwkwj5z"; + name = "syntax-highlighting-5.90.0.tar.xz"; }; }; threadweaver = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/threadweaver-5.89.0.tar.xz"; - sha256 = "03yrlp9ixfb3wsrfmgxfhryzy2jsfnk4wnphmlk5nh98nxa9706x"; - name = "threadweaver-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/threadweaver-5.90.0.tar.xz"; + sha256 = "1frhzlzmnrp5y3lrl0ahzxh8syj4vlkjvaypsmbm2bkkn4akizg3"; + name = "threadweaver-5.90.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch deleted file mode 100644 index 0f33815b6e..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 Mon Sep 17 00:00:00 2001 -From: TBK -Date: Wed, 26 Feb 2020 21:12:45 +0100 -Subject: [PATCH] Fix Linux build error with musl libc - -Commit bf5953c549a6d279977df69ffe89b2ba51460eaf caused a build failure -on non-glibc Linux build environments. Change the conditionalization -so that __GLIBC_PREREQ will only be used if it is defined. - -[ghudson@mit.edu: simplified conditionals; rewrote commit message] - -ticket: 8880 (new) -tags: pullup -target_version: 1.18-next ---- - src/util/support/plugins.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c -index 3329db7dc3..1644d16fd0 100644 ---- a/src/util/support/plugins.c -+++ b/src/util/support/plugins.c -@@ -62,8 +62,7 @@ - * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects - * anyway. - */ --#ifdef __linux__ --#include -+#ifdef __GLIBC__PREREQ - #if ! __GLIBC_PREREQ(2, 25) - #define dlclose(x) - #endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch deleted file mode 100644 index f8718606a7..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b009cca2026b615ef5386faa4c0230bc27c4161d Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Thu, 12 Mar 2020 00:44:10 -0400 -Subject: [PATCH] Fix typo in musl build fix - -Commit cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 checked for -__GLIBC__PREREQ instead of __GLIBC_PREREQ, thus accidentally reverting -the workaround introduced in commit -bf5953c549a6d279977df69ffe89b2ba51460eaf. Fix the typo. - -ticket: 8880 ---- - src/util/support/plugins.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c -index 1644d16fd0..1ff10c354d 100644 ---- a/src/util/support/plugins.c -+++ b/src/util/support/plugins.c -@@ -62,7 +62,7 @@ - * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects - * anyway. - */ --#ifdef __GLIBC__PREREQ -+#ifdef __GLIBC_PREREQ - #if ! __GLIBC_PREREQ(2, 25) - #define dlclose(x) - #endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index ebec5936b5..c632c2fdac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -19,23 +19,13 @@ in with lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.18"; # remove patches below with next upgrade - version = majorVersion; + version = "1.19.2"; src = fetchurl { - url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk"; + url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz"; + sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h"; }; - patches = optionals stdenv.hostPlatform.isMusl [ - # TODO: Remove with next release > 1.18 - # Patches to fix musl build with 1.18. - # Not using `fetchpatch` for these for now to avoid infinite recursion - # errors in downstream projects (unclear if it's a nixpkgs issue so far). - ./krb5-Fix-Linux-build-error-with-musl-libc.patch - ./krb5-Fix-typo-in-musl-build-fix.patch - ]; - outputs = [ "out" "dev" ]; configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 24bec8ec35..874c567ed4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.6"; + version = "1.12.7"; src = fetchFromGitHub { - sha256 = "sha256-k5Lt/NCSlBaTGhpR4T3Q4Ih+RR1xKROxz+RNYor7zaQ="; + sha256 = "sha256-a79/seKO6Efn6g4RWdqsP83pL5AIBAp1InjnMdOs3Qk="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix index 8e9a34716f..2a1ea4f606 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.15"; + version = "4.3.16"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-S2/ecWC78Q4ihVLtDQ6DD8/qX1cDslnTjqd5IkKCjc4="; + sha256 = "sha256-aBLNdw9LhHFwnIt70vIYlX1/j2IUTmpm5Ub+ZImF8FI="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix index b0c02eaa6b..73277d30de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcangjie/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }: +{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; version = "1.4_rev_${rev}"; rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; - src = fetchFromGitLab { - owner = "Cangjians"; - repo = "libcangjie"; - inherit rev; - sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw="; + # fetchFromGitLab isn't working for some reason + src = fetchurl { + url = "https://gitlab.freedesktop.org/cangjie/libcangjie/-/archive/a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d/libcangjie-a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d.tar.gz"; + sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libesmtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libesmtp/default.nix index 542cff712c..3193f383d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libesmtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libesmtp/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, openssl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libESMTP"; - version = "1.0.6"; + version = "1.1.0"; - src = fetchurl { - url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2"; - sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ openssl ]; + + src = fetchFromGitHub { + owner = "libesmtp"; + repo = pname; + rev = "v${version}"; + sha256 = "1bhh8hlsl9597x0bnfl563k2c09b61qnkb9mfyqcmzlq63m1zw5y"; }; meta = with lib; { - homepage = "http://brianstafford.info/libesmtp/index.html"; description = "A Library for Posting Electronic Mail"; - license = licenses.lgpl21; + longDescription = '' + libESMTP is an SMTP client library which manages submission of electronic mail + via a preconfigured Mail Transport Agent (MTA) such as Exim or Postfix. + It implements many SMTP extensions including TLS for security + and PIPELINING for high performance. + ''; + homepage = "https://libesmtp.github.io/"; + license = licenses.lgpl21Plus; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix index 5a5d8b9305..a2cb4d2bd2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Makefile is missing depepdencies on generated headers: + # main.c:4:10: fatal error: signal1.h: No such file or directory + enableParallelBuilding = false; + meta = { description = "F2c converts Fortran 77 source code to C"; homepage = "http://www.netlib.org/f2c/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix deleted file mode 100644 index b00e7b3245..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome, - libstartup_notification, libgtop, perlPackages, - autoreconfHook, intltool, docbook_xsl, xauth -}: - -stdenv.mkDerivation rec { - version = "2.0.12"; - pname = "libgksu"; - - src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; - sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; - }; - - nativeBuildInputs = [ - pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook - ]; - - buildInputs = [ - gtk2 gnome2.GConf libstartup_notification - gnome.libgnome-keyring libgtop gnome2.libglade - ] ++ (with perlPackages; [ perl XMLParser ]); - - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; - - patches = [ - # Patches from the gentoo ebuild - - # Fix compilation on bsdc - ./libgksu-2.0.0-fbsd.patch - - # Fix wrong usage of LDFLAGS, gentoo bug #226837 - ./libgksu-2.0.7-libs.patch - - # Use po/LINGUAS - ./libgksu-2.0.7-polinguas.patch - - # Don't forkpty; gentoo bug #298289 - ./libgksu-2.0.12-revert-forkpty.patch - - # Make this gmake-3.82 compliant, gentoo bug #333961 - ./libgksu-2.0.12-fix-make-3.82.patch - - # Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues). - ./libgksu-2.0.12-notests.patch - - # Fix automake-1.11.2 compatibility, gentoo bug #397411 - ./libgksu-2.0.12-automake-1.11.2.patch - ]; - - postPatch = '' - # gentoo bug #467026 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac - - # Fix some binary paths - sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c - sed -i -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|g' libgksu/libgksu.c - sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/bin/su\1|g' libgksu/libgksu.c - - touch NEWS README - ''; - - preConfigure = '' - intltoolize --force --copy --automake - ''; - - configureFlags = [ - "--disable-gtk-doc" - ]; - - meta = { - description = "A library for integration of su into applications"; - longDescription = '' - This library comes from the gksu program. It provides a simple API - to use su and sudo in programs that need to execute tasks as other - user. It provides X authentication facilities for running - programs in an X session. - ''; - homepage = "https://www.nongnu.org/gksu/"; - license = lib.licenses.lgpl2; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch b/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch deleted file mode 100644 index 5c007be5b4..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c ---- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 -+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 -@@ -23,7 +23,12 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#include -+#else - #include -+#endif - #include - #include - #include -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am ---- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - - EXTRA_DIST = libgksu.ver -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in ---- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 -@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- - gksu_run_helper_SOURCES = gksu-run-helper.c - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - EXTRA_DIST = libgksu.ver - all: all-am - -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am ---- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in ---- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 -@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - all: all-am - - .SUFFIXES: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch deleted file mode 100644 index 0f22166fb8..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -Due to the following change, pkglib_PROGRAMS is invalid: - http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf - -https://savannah.nongnu.org/bugs/index.php?35241 -https://bugs.gentoo.org/show_bug.cgi?id=397411 - ---- - libgksu/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am -index 49362f9..3cb1090 100644 ---- a/libgksu/Makefile.am -+++ b/libgksu/Makefile.am -@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} - pkgconfigdir = ${libdir}/pkgconfig - pkgconfig_DATA = libgksu2.pc - --pkglibdir = ${libdir}/${PACKAGE} --pkglib_PROGRAMS = gksu-run-helper -+gksulibdir = ${libdir}/${PACKAGE} -+gksulib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch deleted file mode 100644 index dd52b8247f..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libgksu/Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 -+++ libgksu/Makefile.am 2010-08-22 16:11:55.289599110 -0500 -@@ -17,11 +17,11 @@ - - if GCONF_SCHEMAS_INSTALL - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -- for p in $(schemas_DATA) ; do \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -- done \ -- fi -+ if test -z "$(DESTDIR)" ; then \ -+ for p in $(schemas_DATA) ; do \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -+ done \ -+ fi - else - install-data-local: - endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch b/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch deleted file mode 100644 index 3787ef6bfc..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libgksu-2.0.12/libgksu/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksu/Makefile.am -+++ libgksu-2.0.12/libgksu/Makefile.am -@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` - gksu_run_helper_SOURCES = gksu-run-helper.c - --noinst_PROGRAMS = test-gksu -+EXTRA_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la - test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -Index: libgksu-2.0.12/libgksuui/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksuui/Makefile.am -+++ libgksu-2.0.12/libgksuui/Makefile.am -@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - --noinst_PROGRAMS = test-gksuui -+EXTRA_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la - test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch b/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch deleted file mode 100644 index 2c3a8cc786..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch +++ /dev/null @@ -1,359 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c ---- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 -+++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 -@@ -1,7 +1,6 @@ - /* - * Gksu -- a library providing access to su functionality - * Copyright (C) 2004-2009 Gustavo Noronha Silva -- * Portions Copyright (C) 2009 VMware, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -56,9 +55,6 @@ - static void - gksu_context_launch_complete (GksuContext *context); - --static void --read_line (int fd, gchar *buffer, int n); -- - GType - gksu_error_get_type (void) - { -@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, - for (i = 0 ; cmd[i] != NULL ; i++) - g_free (cmd[i]); - g_free(cmd); -- -- _exit(1); - } - else if (pid == -1) - { -@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, - /* drop the \n echoed on password entry if su did request - a password */ - if (password_needed) -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); - } -@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, - { - int retval = 0; - -- /* Red Hat's su shows the full path to su in its error messages. */ -- if (!strncmp (buf, "su:", 3) || -- !strncmp (buf, "/bin/su:", 7)) -+ if (!strncmp (buf, "su", 2)) - { - gchar **strings; - -@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, - } - - strings = g_strsplit (buf, ":", 2); -- -- /* Red Hat and Fedora use 'incorrect password'. */ -- if (strings[1] && -- (g_str_has_prefix(strings[1], " Authentication failure") || -- g_str_has_prefix(strings[1], " incorrect password"))) -+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) - { - if (used_gnome_keyring) - g_set_error (error, gksu_quark, -@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, - { - char **cmd; - char buffer[256] = {0}; -- char *child_stderr = NULL; -- /* This command is used to gain a token */ -- char *const verifycmd[] = -- { -- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL -- }; - int argcount = 8; - int i, j; - -@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, - - pid_t pid; - int status; -- FILE *fdfile = NULL; -- int fdpty = -1; -+ FILE *infile, *outfile; -+ int parent_pipe[2]; /* For talking to the parent */ -+ int child_pipe[2]; /* For talking to the child */ - - context->sudo_mode = TRUE; - -@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, - cmd[argcount] = g_strdup("-S"); - argcount++; - -- /* Make sudo noninteractive (we should already have a token) */ -- cmd[argcount] = g_strdup("-n"); -- argcount++; -- - /* Make sudo use next arg as prompt */ - cmd[argcount] = g_strdup("-p"); - argcount++; -@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); - } - -- pid = forkpty(&fdpty, NULL, NULL, NULL); -- if (pid == 0) -+ if ((pipe(parent_pipe)) == -1) - { -- // Child -- setsid(); // make us session leader -- -- execv(verifycmd[0], verifycmd); -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -- _("Failed to exec new process: %s"), -+ if ((pipe(child_pipe)) == -1) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), - strerror(errno)); - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -- else if (pid == -1) -+ -+ pid = fork(); -+ if (pid == -1) - { - g_set_error (error, gksu_quark, GKSU_ERROR_FORK, - _("Failed to fork new process: %s"), -@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -+ else if (pid == 0) -+ { -+ // Child -+ setsid(); // make us session leader -+ close(child_pipe[1]); -+ dup2(child_pipe[0], STDIN_FILENO); -+ dup2(parent_pipe[1], STDERR_FILENO); - -+ execv(cmd[0], cmd); -+ -+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -+ _("Failed to exec new process: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - else - { - gint counter = 0; - gchar *cmdline = NULL; -- struct termios tio; - - // Parent -- fdfile = fdopen(fdpty, "w+"); -+ close(parent_pipe[1]); - -- /* make sure we notice that ECHO is turned off, if it gets -- turned off */ -- tcgetattr (fdpty, &tio); -- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) -- { -- usleep (1000); -- tcgetattr (fdpty, &tio); -- } -+ infile = fdopen(parent_pipe[0], "r"); -+ if (!infile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- fcntl (fdpty, F_SETFL, O_NONBLOCK); -+ outfile = fdopen(child_pipe[1], "w"); -+ if (!outfile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } -+ -+ /* -+ we are expecting to receive a GNOME_SUDO_PASS -+ if we don't there are two possibilities: an error -+ or a password is not needed -+ */ -+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); - - { /* no matter if we can read, since we're using - O_NONBLOCK; this is just to avoid the prompt -@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, - struct timeval tv; - - FD_ZERO(&rfds); -- FD_SET(fdpty, &rfds); -+ FD_SET(parent_pipe[0], &rfds); - tv.tv_sec = 1; - tv.tv_usec = 0; - -- select (fdpty + 1, &rfds, NULL, NULL, &tv); -+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); - } - - /* Try hard to find the prompt; it may happen that we're -@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, - if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) - break; - -- read_line (fdpty, buffer, 256); -+ read_line (parent_pipe[0], buffer, 256); - - if (context->debug) - fprintf (stderr, "buffer: -%s-\n", buffer); -@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, - - usleep (1000); - -- write (fdpty, password, strlen(password) + 1); -- write (fdpty, "\n", 1); -+ fprintf (outfile, "%s\n", password); -+ fclose (outfile); - - nullify_password (password); - -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ /* turn NONBLOCK off */ -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - /* ignore the first newline that comes right after sudo receives - the password */ -- fgets (buffer, 255, fdfile); -- /* this is the status we are interested in */ -- fgets (buffer, 255, fdfile); -+ fgets (buffer, 255, infile); -+ /* this is the status we are interessted in */ -+ fgets (buffer, 255, infile); - } - else - { -@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); - - /* turn NONBLOCK off, also if have no prompt */ -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - - should_display = gconf_client_get_bool (context->gconf_client, - BASE_PATH "display-no-pass-info", NULL); -@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "%s", buffer); - } - -- if (g_str_has_prefix (buffer, "Sorry, try again.")) -+ if (!strcmp (buffer, "Sorry, try again.\n")) - g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, - _("Wrong password.")); -+ else if (!strncmp (buffer, "Sorry, user ", 12)) -+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -+ _("The underlying authorization mechanism (sudo) " -+ "does not allow you to run this program. Contact " -+ "the system administrator.")); - else - { - gchar *haystack = buffer; -@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- /* If we have an error, let's just stop sudo right there. */ -- if (error) -- close(fdpty); -- - cmdline = g_strdup("sudo"); - /* wait for the child process to end or become something other - than sudo */ -@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, - if (context->sn_context) - gksu_context_launch_complete (context); - -+ while (read (parent_pipe[0], buffer, 255) > 0) -+ { -+ fprintf (stderr, "%s", buffer); -+ bzero(buffer, 256); -+ } -+ - /* if the process is still active waitpid() on it */ - if (pid_exited != pid) - waitpid(pid, &status, 0); - sudo_reset_xauth (context, xauth, xauth_env); - -- /* -- * Did token acquisition succeed? If so, spawn sudo in -- * non-interactive mode. It should either succeed or die -- * immediately if you're not allowed to run the command. -- */ -- if (WEXITSTATUS(status) == 0) -- { -- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, -- NULL, &child_stderr, &status, -- error); -- } -- - if (exit_status) - { - if (WIFEXITED(status)) { -@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, - - if (WEXITSTATUS(status)) - { -- if (g_str_has_prefix(child_stderr, "Sorry, user ")) -- { -- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -- _("The underlying authorization mechanism (sudo) " -- "does not allow you to run this program. Contact " -- "the system administrator.")); -- } - if(cmdline) - { - /* sudo already exec()ed something else, don't report -@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, - if (!g_str_has_suffix (cmdline, "sudo")) - { - g_free (cmdline); -- g_free (child_stderr); - return FALSE; - } - g_free (cmdline); -@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- fprintf(stderr, child_stderr); -- g_free(child_stderr); -- - /* if error is set we have found an error condition */ -- return (error == NULL); -+ if (error) -+ return FALSE; -+ -+ return TRUE; - } - - /** diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch b/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch deleted file mode 100644 index b9fb77f271..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch +++ /dev/null @@ -1,76 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25362 -# https://bugs.gentoo.org/show_bug.cgi?id=226837 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 -+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 -@@ -43,6 +43,9 @@ - PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) - PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) - -+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) -+ - # Checks for library functions. - ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" - -diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am ---- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 -@@ -3,7 +3,7 @@ - AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" - - bin_PROGRAMS = gksu-properties --gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} -+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} - gksu_properties_SOURCES = gksu-properties.c - - gladedir = ${prefix}/share/${PACKAGE} -diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am ---- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 -@@ -8,8 +8,8 @@ - # major -> breaks backward compatibility (changes to existing ABI) - # minor -> keeps compatibility (additions to the API) - # micro -> no change to the API/ABI --libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la --libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 - if USE_VERSION_SCRIPT - libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver - endif -@@ -24,12 +24,11 @@ - - pkglibdir = ${libdir}/${PACKAGE} - pkglib_PROGRAMS = gksu-run-helper --gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` -+gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c --test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} - - EXTRA_DIST = libgksu.ver -diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am ---- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 -@@ -4,12 +4,13 @@ - - noinst_LTLIBRARIES = libgksuui1.0.la - libgksuui1_0_la_SOURCES = gksuui-dialog.c --libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` -+libgksuui1_0_la_LDFLAGS = -Wl,-O1 -+libgksuui1_0_la_LIBADD = ${GTK_LIBS} - - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c --test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} -+ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch b/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch deleted file mode 100644 index e423af16b4..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch +++ /dev/null @@ -1,40 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25360 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 -+++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 -@@ -50,7 +50,7 @@ - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - --IT_PROG_INTLTOOL -+IT_PROG_INTLTOOL([0.35.5]) - AM_GLIB_GNU_GETTEXT - - ################################################## -diff -Nura a/po/LINGUAS b/po/LINGUAS ---- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 -@@ -0,0 +1,23 @@ -+# please keep this list sorted alphabetically -+# http://live.gnome.org/GnomeGoals/PoLinguas -+# -+ca -+cs -+da -+de -+es -+eu -+fr -+hu -+it -+ko -+lt -+pl -+pt_BR -+ro -+ru -+sk -+sv -+nb -+nl -+zh_CN diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix index 63015fdf6c..6da4c9a53a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.27"; + version = "2.5.28"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg="; + sha256 = "sha256-e3zMinUUBKzZlQQzkS0oPWAzIVlmQoLj73Spj0XiTIE="; }; depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index 909ee73e69..f4a1959a51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.10"; + version = "3.0.11"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-fLmEJlkZLYLcKZqZwitf8rH261QDPTJZf/+/+FMsGIg="; + sha256 = "sha256-9kMYqWITZ2LlBDebJUZFWyVclAjfIZtc3Dm7lii9ZMc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix index 54843486e1..89bdc15ff6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -1,47 +1,71 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja -, libevdev, mtdev, udev, libwacom -, documentationSupport ? false, doxygen, graphviz # Documentation -, eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support -, testsSupport ? false, check, valgrind, python3 +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, libevdev +, mtdev +, udev +, libwacom +, documentationSupport ? false +, doxygen +, graphviz +, runCommand +, eventGUISupport ? false +, cairo +, glib +, gtk3 +, testsSupport ? false +, check +, valgrind +, python3 , nixosTests }: let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; - sphinx-build = if documentationSupport then - python3.pkgs.sphinx.overrideAttrs (super: { - propagatedBuildInputs = super.propagatedBuildInputs ++ (with python3.pkgs; [ recommonmark sphinx_rtd_theme ]); - - postFixup = super.postFixup or "" + '' - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - }) - else null; + sphinx-build = + let + env = python3.withPackages (pp: with pp; [ + sphinx + recommonmark + sphinx_rtd_theme + ]); + in + # Expose only the sphinx-build binary to avoid contaminating + # everything with Sphinx’s Python environment. + runCommand "sphinx-build" { } '' + mkdir -p "$out/bin" + ln -s "${env}/bin/sphinx-build" "$out/bin" + ''; in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.1"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-C9z1sXg7c3hUt68coi32e8Nqb+fJz6cfAekUn5IgRG0="; - }; + version = "1.19.3"; outputs = [ "bin" "out" "dev" ]; - mesonFlags = [ - (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "debug-gui") - (mkFlag testsSupport "tests") - "--sysconfdir=/etc" - "--libexecdir=${placeholder "bin"}/libexec" + src = fetchurl { + url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; + sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; + }; + + patches = [ + ./udev-absolute-path.patch ]; - nativeBuildInputs = [ pkg-config meson ninja ] - ++ lib.optionals documentationSupport [ doxygen graphviz sphinx-build ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ] ++ lib.optionals documentationSupport [ + doxygen + graphviz + sphinx-build + ]; buildInputs = [ libevdev @@ -53,20 +77,34 @@ stdenv.mkDerivation rec { pyyaml setuptools ])) - ] ++ lib.optionals eventGUISupport [ cairo glib gtk3 ]; + ] ++ lib.optionals eventGUISupport [ + # GUI event viewer + cairo + glib + gtk3 + ]; + + propagatedBuildInputs = [ + udev + ]; checkInputs = [ check valgrind ]; - propagatedBuildInputs = [ udev ]; + mesonFlags = [ + (mkFlag documentationSupport "documentation") + (mkFlag eventGUISupport "debug-gui") + (mkFlag testsSupport "tests") + "--sysconfdir=/etc" + "--libexecdir=${placeholder "bin"}/libexec" + ]; - patches = [ ./udev-absolute-path.patch ]; + doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; postPatch = '' patchShebangs \ - tools/helper-copy-and-exec-from-tmp.sh \ test/symbols-leak-test \ test/check-leftover-udev-rules.sh \ test/helper-copy-and-exec-from-tmp.sh @@ -75,17 +113,15 @@ stdenv.mkDerivation rec { sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; - doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; - passthru.tests = { libinput-module = nixosTests.libinput; }; meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; + homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index 36c1c0dc09..9672d1ccec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -10,13 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; - postPatch = '' - substituteInPlace Makefile \ - --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ - --replace "ar" "${stdenv.cc.targetPrefix}ar" - ''; - - makeFlags = [ "INSTALLPREFIX=$(out)" ]; + makeFlags = [ + "INSTALLPREFIX=$(out)" + "CC:=$(CC)" + ]; postFixup = '' chmod +x $out/lib/* diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix index 3d1e2b7ac4..7913515df6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "2.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; - rev = "refs/tags/v${version}"; - sha256 = "16a0f0gvrmyrqvmh6vinqny3qhm6wyzw5ijnn3r82b1gqlpws0fz"; + rev = "v${version}"; + sha256 = "1ngji3sa44y27lnq4x5dzbd117s9psx4w0j50b4c2b72cf2z139q"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix index f0ddd26900..c9b346936f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.17.3"; + version = "2.18.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-XpC5gb19jPakYS3QSgOU6WnGad+VEoEtxyT38d9Beug="; + sha256 = "sha256-IPdaBT6hRNHo8kuOsiKdyiQkRxA/l+44U3qGGG89BTo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index fb5313ecf0..94492132b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "4.192.0"; + version = "4.192.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "19i7p9z8mmki5yq26059dp9055cccgxs0vfdlx0w1qak7pmv1vpm"; + sha256 = "13z2f0vwf9fgfzqgkqzvqwa8c8nkymrg5hv7xslfx53dacjfidhy"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix index c5d6bc4612..f6bf1e8166 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -5,8 +5,8 @@ , zlib , dbus , networkmanager -, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_68 -, spidermonkey_68 +, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_78 +, spidermonkey_78 , pcre , gsettings-desktop-schemas , glib @@ -17,9 +17,7 @@ , JavaScriptCore }: -let - jsRuntime = if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_68; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libproxy"; version = "0.4.17"; @@ -43,7 +41,7 @@ in stdenv.mkDerivation rec { python3 zlib ] ++ lib.optionals enableJavaScript [ - jsRuntime + (if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_78) ] ++ (if stdenv.hostPlatform.isDarwin then [ SystemConfiguration CoreFoundation diff --git a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix index e5123fa61a..53aab44310 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -6,13 +6,13 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12"; + version = "0.12.4"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "0ayhp3ym30hzp5f6dz7mmp9hpxf6a48nx3kq5crcmzycm5fllbn7"; + sha256 = "sha256-CZZ5/uCls2tY3PKmD+hBBvp7d7KX8nZuCPf03sa4iXc="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 8b1213e637..6d9de18562 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.52.4"; + version = "2.52.5"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Zg7Ig2o6kVh7yThJIBMtTDjR0XGMZ/4WDFIT/k3sKSg="; + sha256 = "QHy7q1GBN+oYo/MiC+oYD77nXz5b1roQp6hiwab3TYI="; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librtlsdr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librtlsdr/default.nix index 61f4045b78..c09575924a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librtlsdr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librtlsdr/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libusb1 ]; + propagatedBuildInputs = [ libusb1 ]; meta = with lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix index e987e5a892..7443ec4c50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -13,12 +13,12 @@ , libsoup , gtk4 , xvfb-run -, unstableGitUpdater +, gnome }: stdenv.mkDerivation rec { pname = "libshumate"; - version = "unstable-2021-10-06"; + version = "1.0.0.alpha.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libshumate"; - rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; - sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; + rev = version; + sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg="; }; nativeBuildInputs = [ @@ -68,11 +68,14 @@ stdenv.mkDerivation rec { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput share/doc/libshumate-0.0 "$devdoc" + moveToOutput share/doc/libshumate-1.0 "$devdoc" ''; - passthru.updateScript = unstableGitUpdater { - url = meta.homepage; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index 52a88e2194..470b9137f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -46,5 +46,6 @@ in stdenv.mkDerivation { license = licenses.bsd3; maintainers = [ ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix index 9e6cec471d..7dee1d6b1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "4.3"; + version = "5.0"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx"; + sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix index b00b4cf9ac..e2dc63609c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.13.0"; + version = "0.13.1"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "sha256-y7INvhqJLCpNiJi6xDFhduWFOSaT1Jh2bMu8aM8guiA="; + sha256 = "sha256-MhPzPSuPcQ65IOsauyeewEv4rmNh9E8lE8KMINM2MIM="; }; checkInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix b/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix index e68c60ebbd..a711fab631 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.10.0"; + version = "1.12.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-uJ39NQCk3scREyzXv/clmeZ9VqQZ0ABzDhS7mVR1Ccw="; + sha256 = "sha256-YjnJwVUjQQeY1mMV3mtJFxKrMACboYDz4N0HbZsAdKw="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix index e96914157b..f28420229a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "5.2.0"; + version = "5.2.2"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "1zfhfiwk8cnfbmkagaia4xhsc133icl1pryzync28kzsjxzlwfzc"; + sha256 = "113sk7hxjpfbz3nrgjsc7bi6zrlwb3qq5s6h0zh37hz9bd1brq54"; }; nativeBuildInputs = [ perl cmake gfortran ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix index 821edd3336..0f650e7474 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -14,13 +14,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; - version = "1.6.3"; # TODO: Check postPatch script on update + version = "1.7.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; rev = "v${version}"; - sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571"; + sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8="; }; nativeBuildInputs = [ @@ -35,20 +35,6 @@ stdenv.mkDerivation rec { fflas-ffpack ]; - patches = [ - # Remove inappropriate `const &` qualifiers on data members that can be - # modified via member functions. - # See also: https://github.com/linbox-team/linbox/pull/256 - ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update - ]; - - postPatch = '' - # Remove @LINBOXSAGE_LIBS@ that is actually undefined. - # See also: https://github.com/linbox-team/linbox/pull/249 - # TODO: Remove on 1.7.0 update - find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \; - ''; - configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch deleted file mode 100644 index ec8571a7d7..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/linbox/algorithms/det-rational.h -+++ b/linbox/algorithms/det-rational.h -@@ -79,8 +79,8 @@ - struct MyRationalModularDet { - const Blackbox &A; - const MyMethod &M; -- const Integer &mul;//multiplicative prec; -- const Integer ÷ -+ Integer mul;//multiplicative prec; -+ Integer div; - - MyRationalModularDet(const Blackbox& b, const MyMethod& n, - const Integer & p1, const Integer & p2) : diff --git a/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix index 29531a2999..d3e3187bf7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liquidfun/default.nix @@ -1,21 +1,15 @@ { lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: -let - sourceInfo = rec { - version="1.1.0"; - name="liquidfun-${version}"; - url="https://github.com/google/liquidfun/releases/download/v${version}/${name}"; - hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + pname = "liquidfun"; + version = "1.1.0"; + src = requireFile { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - name = sourceInfo.name + ".tar.gz"; + url = "https://github.com/google/liquidfun/releases/download/v${version}/liquidfun-${version}"; + sha256 = "5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; + name = "liquidfun-${version}.tar.gz"; }; - inherit (sourceInfo) name version; nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL libX11 libXi ]; @@ -34,15 +28,12 @@ stdenv.mkDerivation { cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. ''; - meta = { + meta = with lib; { description = "2D physics engine based on Box2D"; - maintainers = with lib.maintainers; - [ - qknight - ]; - platforms = lib.platforms.linux; - hydraPlatforms = []; - license = lib.licenses.bsd2; + maintainers = with maintainers; [ qknight ]; + platforms = platforms.linux; + hydraPlatforms = [ ]; + license = licenses.bsd2; homepage = "https://google.github.io/liquidfun/"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix index 6ff8d54ca3..2e5ec92cf4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -3,6 +3,9 @@ , fetchurl , darwin , openssl + +# major and only downstream dependency +, vlc }: stdenv.mkDerivation rec { @@ -62,6 +65,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit vlc; + }; + meta = with lib; { homepage = "http://www.live555.com/liveMedia/"; description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lzlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lzlib/default.nix index 9c5311d742..d0064947c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lzlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lzlib/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl, texinfo, lzip }: stdenv.mkDerivation rec { pname = "lzlib"; - version = "1.12"; + version = "1.13"; outputs = [ "out" "info" ]; - nativeBuildInputs = [ texinfo ]; + nativeBuildInputs = [ texinfo lzip ]; src = fetchurl { - url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jl2EJC61LPHcyY5YvZuo7xrvpQFDGr3QJzoiv0zjN7E="; + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; + sha256 = "sha256-3ea9WzJTXxeyjJrCS2ZgfgJQUGrBQypBEso8c/XWYsM="; }; - makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; + makeFlags = [ "CC:=$(CC)" ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix index 87e7657662..49a7f26220 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.6"; + version = "1.7.7.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw="; + hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 9210f18ed9..8bba8f0efe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { # versions. See # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d - version = "2.26.0"; # nixpkgs-update: no auto update + version = "2.28.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"; + sha256 = "sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g="; }; nativeBuildInputs = [ cmake ninja perl python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index 69f43d31da..b91e140345 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.3.4"; + version = "21.3.5"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,7 +47,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0zd6skf9qcwlk1k1ljgwijwlyz5si3pgi0h97gd6kkivm7a4y43p"; + sha256 = "0k2ary16ixsrp65m2n5djpr51nbwdgzpv81pfrnqbvk44jfjlfyr"; }; # TODO: diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix index a4f0289cd5..b73289ca82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper -, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif +, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 , jack2, ladspa-sdk, swig, which, ncurses @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev + SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 ladspa-sdk ] ++ lib.optional enablePython ncurses; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix index 6c97b37a25..efab246bb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "--enable-symlinks" "--with-manpage-format=normal" "--disable-stripping" + "--with-versioned-syms" ] ++ lib.optional unicodeSupport "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/0.29.nix b/third_party/nixpkgs/pkgs/development/libraries/neon/0.29.nix deleted file mode 100644 index e0437fb7ce..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/neon/0.29.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, libxml2, pkg-config, perl -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, static ? false -, shared ? true -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert static || shared; - -let - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { - version = "0.29.6"; - pname = "neon"; - - src = fetchurl { - url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; - }; - - patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [libxml2 openssl] - ++ lib.optional compressionSupport zlib; - - configureFlags = [ - (lib.enableFeature shared "shared") - (lib.enableFeature static "static") - (lib.withFeature compressionSupport "zlib") - (lib.withFeature sslSupport "ssl") - ]; - - passthru = {inherit compressionSupport sslSupport;}; - - checkInputs = [ perl ]; - doCheck = false; # fails, needs the net - - meta = with lib; { - description = "An HTTP and WebDAV client library"; - homepage = "http://www.webdav.org/neon/"; - platforms = platforms.unix; - license = licenses.lgpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch b/third_party/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch rename to third_party/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix index 739c5e07d2..a39ece28aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng"; }; - patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; + patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 21b9fdf419..fc2416c2cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config -, cunit, file +, cunit, file, ncurses }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E="; }; - nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; + checkInputs = [ cunit ncurses ]; preConfigure = '' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -23,12 +24,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = true; + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/ngtcp2/nghttp3"; description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C."; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index dfe07c39e3..650516d360 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config -, cunit, file -, jemalloc, libev, nghttp3, quictls +, cunit, file, ncurses +, libev, nghttp3, quictls +, withJemalloc ? false, jemalloc }: stdenv.mkDerivation rec { @@ -15,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M="; }; - nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; - buildInputs = [ jemalloc libev nghttp3 quictls ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; + buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; + checkInputs = [ cunit ncurses ]; preConfigure = '' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -25,12 +27,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = true; + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/ngtcp2/ngtcp2"; description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization."; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix index 033b9d8c61..a10434d90b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }: +{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python3 }: stdenv.mkDerivation rec { pname = "ntrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkg-config python2 ]; + nativeBuildInputs = [ pkg-config python3 ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix index b7f438e9d0..a9e0bb4ea6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "039ryhwfbbrrhavzyr999kngj10nk9n81i6qigxj6igfl4fzjy87"; + sha256 = "sha256-ogA7ycqdMUTN/KHV2oZzytnhZ7XVuhx+ArXZqLlmwjk="; }; nativeBuildInputs = [ cmake pkg-config pandoc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix index d28f7b2579..d2cdebdf35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix @@ -23,9 +23,12 @@ stdenv.mkDerivation rec { --replace "@OUT@" $out ''; + strictDeps = true; + nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional alsaSupport alsa-lib + buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix b/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix index 627d5bbe29..3e98956147 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }: +{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python3, cairo, pcre, pkg-config }: stdenv.mkDerivation rec { pname = "openbabel"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib libxml2 eigen python2 cairo pcre ]; + buildInputs = [ zlib libxml2 eigen python3 cairo pcre ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openh264/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openh264/default.nix index 3858cb4dc2..93fc495d38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openh264/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openh264/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nasm }: +{ lib, stdenv, fetchFromGitHub, nasm, windows }: stdenv.mkDerivation rec { pname = "openh264"; @@ -13,10 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; + makeFlags = [ "PREFIX=${placeholder "out"}" "ARCH=${stdenv.hostPlatform.linuxArch}" - ]; + ] ++ lib.optional stdenv.hostPlatform.isWindows "OS=mingw_nt"; + + enableParallelBuilding = true; + + hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "stackprotector"; meta = with lib; { description = "A codec library which supports H.264 encoding and decoding"; 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 34a3788d78..df6e364d2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -1,34 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, which -, gettext, libffi, libiconv, libtasn1 +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, docbook-xsl-nons +, gtk-doc +, installShellFiles +, libxslt # for xsltproc +, pkg-config +, which +, libffi +, libiconv +, libintl +, libtasn1 }: stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "sha256-jvUzOhMvbq05SxQ+kjKQHDDMzNwo4U6nFHu3JjygJHw="; + hash = "sha256-1QIMEGBZsqLYU3v5ZswD5K9VcIGLBovJlC10lBHhH7c="; }; - outputs = [ "out" "dev"]; - outputBin = "dev"; + outputs = [ "out" "bin" "dev"]; - # for cross platform builds of p11-kit, libtasn1 in nativeBuildInputs + # For cross platform builds of p11-kit, libtasn1 in nativeBuildInputs # provides the asn1Parser binary on the hostPlatform needed for building. # at the same time, libtasn1 in buildInputs provides the libasn1 library # to link against for the target platform. - # hence, libtasn1 is required in both native and build inputs. - nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ]; - buildInputs = [ gettext libffi libiconv libtasn1 ]; + # Hence, libtasn1 is required in both native and build inputs. + nativeBuildInputs = [ + autoreconfHook + docbook-xsl-nons + gtk-doc + installShellFiles + libtasn1 + libxslt.bin + pkg-config + which + ]; + + buildInputs = [ + libffi + libiconv + libintl + libtasn1 + ]; autoreconfPhase = '' NOCONFIGURE=1 ./autogen.sh ''; configureFlags = [ + "--enable-doc" "--sysconfdir=/etc" "--localstatedir=/var" "--with-trust-paths=${lib.concatStringsSep ":" [ @@ -53,6 +80,10 @@ stdenv.mkDerivation rec { "exampledir=${placeholder "out"}/etc/pkcs11" ]; + postInstall = '' + installShellCompletion --bash bash-completion/{p11-kit,trust} + ''; + meta = with lib; { description = "Library for loading and sharing PKCS#11 modules"; longDescription = '' @@ -61,6 +92,10 @@ stdenv.mkDerivation rec { PKCS#11 modules in such a way that they're discoverable. ''; homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html"; + changelog = [ + "https://github.com/p11-glue/p11-kit/raw/${version}/NEWS" + "https://github.com/p11-glue/p11-kit/releases/tag/${version}" + ]; platforms = platforms.all; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix index 724a1b1247..8393cb8c59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.37"; + version = "10.39"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-TZWpbouAUpiTtFYr4SZI15i5V7G6Gq45YGu8KrlW0nA="; + hash = "sha256-DwPK9X+B2f82KsKM04nAVewr8GeNJ3NJoaS+4ArW1EA="; }; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch index 84238bf6e5..230f1b3039 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch @@ -1,19 +1,19 @@ diff --git a/meson_options.txt b/meson_options.txt -index 71c2e35e9..a0f380c04 100644 +index 961ae2a76..692b84dfd 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -176,6 +176,9 @@ option('udev', +@@ -179,6 +179,9 @@ option('udev', option('udevrulesdir', type : 'string', description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') +option('pipewire_pulse_prefix', + type : 'string', + description: 'Install directory for the pipewire-pulse daemon') - option('systemd-user-unit-dir', + option('systemd-system-unit-dir', type : 'string', - description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') + description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 5bd134537..5a3ca9ed5 100644 +index d17f3794f..34afe4f1a 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build @@ -9,7 +9,7 @@ install_data( diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index ea968e28ea..b4c9f8ed2a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -1,8 +1,8 @@ -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index 648e13069..50f767f0c 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -131,7 +131,7 @@ context.modules = [ +diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in +index 6464839a0..05546201f 100644 +--- a/src/daemon/minimal.conf.in ++++ b/src/daemon/minimal.conf.in +@@ -110,7 +110,7 @@ context.modules = [ # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ @@ -11,7 +11,27 @@ index 648e13069..50f767f0c 100644 #] # An array of rejected paths. -@@ -235,12 +235,12 @@ context.exec = [ +@@ -298,5 +298,5 @@ context.exec = [ + # It can be interesting to start another daemon here that listens + # on another address with the -a option (eg. -a tcp:4713). + # +- #@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ #@pulse_comment@{ path = "" args = "-c pipewire-pulse.conf" } + ] +diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in +index a948a1b9b..4ece43c6f 100644 +--- a/src/daemon/pipewire.conf.in ++++ b/src/daemon/pipewire.conf.in +@@ -132,7 +132,7 @@ context.modules = [ + # access.allowed to list an array of paths of allowed + # apps. + #access.allowed = [ +- # @session_manager_path@ ++ # + #] + + # An array of rejected paths. +@@ -246,12 +246,12 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index f1159017de..79682d7ace 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -27,7 +27,6 @@ , ncurses , readline81 # meson can't find <7 as those versions don't have a .pc file , lilv -, openssl , makeFontsConf , callPackage , nixosTests @@ -55,8 +54,13 @@ , libpulseaudio , zeroconfSupport ? true , avahi +, raopSupport ? true +, openssl , rocSupport ? true , roc-toolkit +, x11Support ? true +, libcanberra +, xorg }: let @@ -65,7 +69,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.43"; + version = "0.3.45"; outputs = [ "out" @@ -83,7 +87,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-vjMA9dQvZe7dPbF9BNtCYf1V240RUBdtxeyqFjWA4j4="; + sha256 = "sha256-OnQd98qfOekAsVXLbciZLNPrM84KBX6fOx/f8y2BYI0="; }; patches = [ @@ -120,7 +124,6 @@ let libsndfile lilv ncurses - openssl readline81 udev vulkan-headers @@ -134,7 +137,9 @@ let ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi - ++ lib.optional rocSupport roc-toolkit; + ++ lib.optional raopSupport openssl + ++ lib.optional rocSupport roc-toolkit + ++ lib.optionals x11Support [ libcanberra xorg.libxcb ]; # Valgrind binary is required for running one optional test. checkInputs = lib.optional withValgrind valgrind; @@ -160,8 +165,10 @@ let "-Dbluez5-backend-hsphfpd=${mesonEnableFeature hsphfpdSupport}" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" + "-Draop=${mesonEnableFeature raopSupport}" "-Dsession-managers=" "-Dvulkan=enabled" + "-Dx11=${mesonEnableFeature x11Support}" ]; # Fontconfig error: Cannot load default config file @@ -191,6 +198,8 @@ let moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" moveToOutput "bin/pipewire-pulse" "$pulse" + + moveToOutput "bin/pw-jack" "$jack" ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index dc14a4b801..9ab197278d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.7"; + version = "0.4.8"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -36,18 +36,9 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-yp4xtp+s+h+43LGVtYonoJ2tQaLRfwyMY4fp8z1l0CM="; + sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y="; }; - patches = [ - # backport a fix for default device selection - # FIXME remove this after 0.4.8 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317.patch"; - sha256 = "sha256-EGcbJ8Rq/5ft6SV0VC+mTkhVE7Ycze4TL6AVc9KH7+M="; - }) - ]; - nativeBuildInputs = [ meson pkg-config diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix index 08ca1456ea..6fa07bcaf8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ="; + sha256 = "sha256-fTSTBWtbhkE+XGk8LK4CxcBs2OYY0UwsMeLIS2eyMT4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix index df8d53b9f1..fdbbed733d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.16.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.16.0"; - sha256 = "0jc523ys6xh1fk3l52f5mfqxhb4g8aim1js7330v0fdc3fjr8ncf"; + version = "3.16.1"; + sha256 = "sha256-eOwUyZtrmyh3HwLQ1kLnk+briaXQPrlUqtbFol/nGBo="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix index 63fc9b218d..0d5d2c652c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.18.1"; - sha256 = "sha256-5PK0uuk7Du9hX/hHy0gninHIKu6b8THdfVh87Gn7y2Q="; + version = "3.18.2"; + sha256 = "sha256-IXxVTZOAKVMuGCJtD32rVQRBJRWUJMEK2d+fPEmgzRU="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix index 727bf511d5..7e2be4bec0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.19.0"; - sha256 = "0rx4r4d7hqr0gi3v90jbkm2lnkj9p37dhgwx9d0w7kgh3rvr4i7g"; + version = "3.19.3"; + sha256 = "sha256-nA6L064MuyP5Si4MCLk2yg8PDM7RWggFEGQyibputYQ="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix b/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix index 7d423ac034..e364b90779 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0="; }; - vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So="; + vendorSha256 = "sha256-2XbBiiiPvZCnlKUzGDLFnxA34N/LmHoPbvRKZckmhx4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/protozero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/protozero/default.nix index 6bff5998b5..1e35ab700a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protozero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protozero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "protozero"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "mapbox"; repo = "protozero"; rev = "v${version}"; - sha256 = "0fdihfl5j68wayjjxvpvhvnjq1anzcfnfl09f68wpzbkg3zmhblz"; + sha256 = "sha256-R8lGewsEOxPNbKlkIeiM4yIwUcTzi2Dm0+xJ2WrBTBQ="; }; nativeBuildInputs = [ cmake ]; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { description = "Minimalistic protocol buffer decoder and encoder in C++"; homepage = "https://github.com/mapbox/protozero"; license = with licenses; [ bsd2 asl20 ]; + changelog = [ + "https://github.com/mapbox/protozero/releases/tag/v${version}" + "https://github.com/mapbox/protozero/blob/v${version}/CHANGELOG.md" + ]; maintainers = with maintainers; [ das-g ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 637335b862..9dc05edd69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.3.2"; + version = "10.4.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "sha256-fhn6hE/MLYiaOxZYfaVcj17V+h8Yvn18QTewS0rPIXE="; + sha256 = "sha256-IYXH1Pcd0eRzlbRouAB17wsCUGNuIlJfwJLbXiaC5dk="; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 21b4f55a3d..7cba1ae63f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -38,7 +38,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) qtwebengine = let - branchName = "5.15.7"; + branchName = "5.15.8"; rev = "v${branchName}-lts"; in { @@ -46,7 +46,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "fssBN/CDgXAuiNj14MPeIDI15ZDRBGuF7wxSXns9exU="; + sha256 = "04xhg5qpnxm8hzgkanml45za64c9i5pbxhki2l2wcq4b4y7f3hyr"; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 68945625f5..01d0c59328 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -19,7 +19,7 @@ , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , cups, openbsm, runCommand, xcbuild, writeScriptBin -, ffmpeg ? null +, ffmpeg_4 ? null , lib, stdenv, fetchpatch , version ? null , qtCompatVersion @@ -115,6 +115,7 @@ qtModule { ] ++ lib.optionals stdenv.isDarwin [ "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12" "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12" + "-Wno-elaborated-enum-base" # # Prevent errors like @@ -153,7 +154,7 @@ qtModule { harfbuzz icu libevent - ffmpeg + ffmpeg_4 ] ++ lib.optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 9364fdf75d..dd7719c8c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.27.3"; + version = "6.28.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s3vBW/vN6lUvOp3vlx/Wo2ZrzobZ2s8MHujFouSU2NM="; + sha256 = "sha256-0T/ANHTRzk0ymezRQbvJt6aL350Z004gcj4JapAyAnQ="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 35a37fbddb..395e5d0c75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.0"; + version = "1.3.4"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU="; + hash = "sha256-/kZI/NOZO8T5jlG9Qtfr14aCJDKrP7wEQLgJ6qe9VzY="; }; nativeBuildInputs = [ cmake ]; 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 2ac1ba9536..60f5e51ae9 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 @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-Ik62kbOetA2vSMpnwrSiNRNJqOgmqlCB2+KNhpBo9TA="; + sha256 = "sha256-U3Q0WUEDRn0zfBIdHXFp5Zcaf+M6HrSFnpeu5aAkjks="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix index 3f0cf45062..b189691765 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix @@ -1,94 +1,38 @@ { lib, stdenv -, fetchurl -, fetchpatch +, autoreconfHook +, gengetopt +, pkg-config +, fetchFromGitLab , pari }: stdenv.mkDerivation rec { - version = "1.23"; + version = "2.0.5"; pname = "lcalc"; - src = fetchurl { - # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available - # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source - url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2"; - sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43"; + src = fetchFromGitLab { + owner = "sagemath"; + repo = pname; + rev = version; + sha256 = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; }; - preConfigure = "cd src"; + nativeBuildInputs = [ + autoreconfHook + gengetopt + pkg-config + ]; buildInputs = [ pari ]; - patches = [ - # Port to newer pari - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/pari-2.7.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1x3aslldm8njjm7p9g9s9w2c91kphnci2vpkxkrcxfihw3ayss6c"; - }) - - # Uncomment the definition of lcalc_to_double(const long double& x). - # (Necessary for GCC >= 4.6.0, cf. https://trac.sagemath.org/ticket/10892) - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/Lcommon.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0g4ybvsrcv48rmlh1xjnkms19jp25k58azv6ds1f2cm34hxs8fdx"; - }) - - # Include also in Lcommandline_numbertheory.h (at least required - # on Cygwin, cf. https://trac.sagemath.org/ticket/9845) - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/time.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1brf04n11kkc43ylagf8dm32j5r2g9zv51dp5wag1mpm4p04l7cl"; - }) - - # Fix for gcc >4.6 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_1.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0i2yvxm5fx4z0v6m4srgh8rj98kijmlvyirlxf1ky0bp2si6bpka"; - }) - - # gcc 5.1 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_2.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vlh"; - }) - - # based on gentoos makefile patch -- fix paths, adhere to flags - ./makefile.patch - - # (fetchpatch { - # name = "default-double.patch"; - # url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch"; - # sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla"; - # }) - - (fetchpatch { - name = "c++11.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/3607b97df5a8c231191115b0cb5c62426b339e71/trunk/lcalc-c++11.patch"; - sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; - }) - ] ++ lib.optional stdenv.isDarwin - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; - sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; - }); - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile --replace g++ c++ - ''; - - installFlags = [ - "DESTDIR=$(out)" - ]; - - makeFlags = [ - "PARI_DEFINE=-DINCLUDE_PARI" - "PARI_PREFIX=${pari}" + configureFlags = [ + "--with-pari" ]; meta = with lib; { - homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; + homepage = "https://gitlab.com/sagemath/lcalc"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/makefile.patch b/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/makefile.patch deleted file mode 100644 index 5c22cf0b84..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/lcalc/makefile.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 84e4e88..56ca676 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -58,7 +58,7 @@ ifeq ($(G5),TRUE) - #MACHINE_SPECIFIC_FLAGS = -mpowerpc -mpowerpc64 -m64 - endif - --CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) -+CCFLAGS = $(CXXFLAGS) $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) - #CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) - #CCFLAGS = -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) - -@@ -68,12 +68,12 @@ CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MA - - ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) - #location of pari.h. -- LOCATION_PARI_H = /usr/local/include/pari #usual location -+ LOCATION_PARI_H = $(PARI_PREFIX)/include/pari #usual location - - #location of libpari.a or of libpari.so - #depending on whether static or dynamic libraries are being used. - #On mac os x it's the former, on linux I think usually the latter. -- LOCATION_PARI_LIBRARY = /usr/local/lib #usual location -+ LOCATION_PARI_LIBRARY = $(PARI_PREFIX)/lib #usual location - else - #supplied as a dummy so as to avoid more ifeq's below - LOCATION_PARI_H = . -@@ -89,24 +89,24 @@ INCLUDEFILES= -I../include - - ifeq ($(OS_NAME),Darwin) - LDFLAGS2 = -- DYN_OPTION=dynamiclib -+ DYN_OPTION=-dynamiclib - else -- LDFLAGS1 = -Xlinker -export-dynamic #not sure why pari calls these when linking but on the web I found -+ LDFLAGS1 = #not sure why pari calls these when linking but on the web I found - #'Libtool provides the `-export-dynamic' link flag (see section Link mode), which does this declaration. - #You need to use this flag if you are linking a shared library that will be dlopened' - #see notes below - #ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) -- LDFLAGS2 = $(LDFLAGS1) -Xlinker -rpath -Xlinker $(LOCATION_PARI_LIBRARY) -+ LDFLAGS2 = $(LDFLAGS) - #else - # LDFLAGS2 = $(LDFLAGS1) - #endif -- DYN_OPTION=shared -+ DYN_OPTION=$(LDFLAGS) -shared -Wl,-soname,libLfunction.so - endif - - ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) -- LDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari -+ MYLDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari - else -- LDFLAGS = $(LDFLAGS2) -+ MYLDFLAGS = $(LDFLAGS2) - endif - - -@@ -129,7 +129,8 @@ endif - #become clear which libraries the computer can find. - - --INSTALL_DIR= /usr/local -+INSTALL_DIR= $(DESTDIR) -+LIB_DIR ?=lib - - #object files for the libLfunction library - OBJ_L = Lglobals.o Lgamma.o Lriemannsiegel.o Lriemannsiegel_blfi.o Ldokchitser.o -@@ -141,9 +142,8 @@ OBJECTS = $(OBJ3) - - all: - # make print_vars -- make libLfunction.so -- make lcalc -- make examples -+ ${MAKE} libLfunction.so -+ ${MAKE} lcalc - # make find_L - # make test - -@@ -151,7 +151,7 @@ print_vars: - @echo OS_NAME = $(OS_NAME) - - lcalc: $(OBJECTS) -- $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(LDFLAGS) -o lcalc $(GMP_FLAGS) -+ $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(MYLDFLAGS) -o lcalc $(GMP_FLAGS) - - examples: - $(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so -o example_programs/example $(GMP_FLAGS) -@@ -262,15 +262,18 @@ Lcommandline.o: ../include/Lcommandline_values_zeros.h - - - libLfunction.so: $(OBJ_L) -- g++ -$(DYN_OPTION) -o libLfunction.so $(OBJ_L) -+ g++ $(DYN_OPTION) -o libLfunction.so $(OBJ_L) - - clean: - rm -f *.o lcalc libLfunction.so example_programs/example - - install: -- cp -f lcalc $(INSTALL_DIR)/bin/. -- cp -f libLfunction.so $(INSTALL_DIR)/lib/. -- cp -rf ../include $(INSTALL_DIR)/include/Lfunction -+ install -d $(INSTALL_DIR)/bin -+ install -d $(INSTALL_DIR)/$(LIB_DIR) -+ install -d $(INSTALL_DIR)/include/Lfunction -+ install lcalc $(INSTALL_DIR)/bin -+ install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR) -+ install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h - - - SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/primecount/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/primecount/default.nix index 7985b9d6db..e1390ce641 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/primecount/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/primecount/default.nix @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo="; }; + cmakeFlags = [ + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTS=ON" + "-DBUILD_PRIMECOUNT=ON" + "-DBUILD_LIBPRIMESIEVE=ON" + ]; + meta = with lib; { description = "Fast prime counting function implementations"; homepage = "https://github.com/kimwalisch/primecount"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 3b1fb98a42..9a7374f4f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,22 +1,36 @@ { lib, stdenv, fetchFromGitHub, cmake, openssh -, gfortran, mpi, blas, lapack +, mpi, blas, lapack } : -assert (!blas.isILP64) && (!lapack.isILP64); +assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; + sha256 = "0hiap5i9ik6xpvl721n2slanlqygagc1pg2bcjb27ans6balhsfh"; }; - nativeBuildInputs = [ cmake openssh gfortran ]; - buildInputs = [ mpi blas lapack ]; + passthru = { inherit (blas) isILP64; }; + + # Required to activate ILP64. + # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 + postPatch = lib.optionalString passthru.isILP64 '' + sed -i 's/INTSZ = 4/INTSZ = 8/g' TESTING/EIG/* TESTING/LIN/* + sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/EIG/* TESTING/LIN/* + + # These tests are not adapted to ILP64 + sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ openssh ]; + buildInputs = [ blas lapack ]; + propagatedBuildInputs = [ mpi ]; doCheck = true; @@ -25,6 +39,11 @@ stdenv.mkDerivation rec { -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DLAPACK_LIBRARIES="-llapack" -DBLAS_LIBRARIES="-lblas" + -DCMAKE_Fortran_COMPILER=${mpi}/bin/mpif90 + ${lib.optionalString passthru.isILP64 '' + -DCMAKE_Fortran_FLAGS="-fdefault-integer-8" + -DCMAKE_C_FLAGS="-DInt=long" + ''} ) ''; @@ -52,5 +71,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ costrouc markuskowa ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index ba4c8fcd0e..d7fa0f0ff0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-btgv/GwwQhT/DtWhjM/g081UYLT7E76ZhqXZdMiIWsk="; + sha256 = "sha256-DMVMS7Mshglg7+QkHzZvmZ2dhEFbQRqcHU98JiaysCg="; }; 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 3ce41e3193..c24c336c72 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.11"; + version = "2020.3.12"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-u438vCo7AUPR/88B0alh5WbvId0z2cx2jW2apYcdTzw="; + sha256 = "sha256-W7KZzFU5qZE6tOv9YSzH3yoNi8YET2yzmThMcl23140="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix index c3c4f8610c..3bf22261f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.39"; + version = "3.1.44"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "0n5hmnw66gxqikp6frgfd9ywsvr2azyg5nl7ix89digqlzcljkbg"; + sha256 = "sha256-9a9OC18jyFpmFXffYOYHZ0j01j4NCF5zwrSYr1fZwqo="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix index 5b8f93d7bc..b17fbe1665 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix @@ -1,5 +1,6 @@ { cmake , fetchFromGitHub +, fetchpatch , sqlite , postgresql , boost @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE="; }; + patches = [ + (fetchpatch { + name = "fix-backend-search-path.patch"; + url = "https://github.com/SOCI/soci/commit/56c93afc467bdba8ffbe68739eea76059ea62f7a.patch"; + sha256 = "sha256-nC/39pn3Cv5e65GgIfF3l64/AbCsfZHPUPIWETZFZAY="; + }) + ]; + # Do not build static libraries cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; 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 bbee609eb2..6bb1113950 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.6"; + version = "1.13.7"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "0b1gq499ksgsi16f5nf3dzbj6s8knwkiak5j810jzdfm7vkm0vvm"; + sha256 = "sha256-gBejwt5YAkCKQh0vzN00J4y1ifcdc4TglA+SqEevaGQ="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix index bf2145c68c..39b2d7fd8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "sha256-M5PF15Ok+rJLWlfHsC8F8JXJonAR0wwTUbWxegBZ/qQ="; + sha256 = "sha256-w78YO5EQWtEiySOm9NpPbaMChbJppNBoZNOBs9fibbM="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix index ee0f6be169..4f639cf29f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { postPatch = '' install ${doxygen_sh} doxygen.sh patchShebangs build-aux + + # https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 + substituteInPlace subprojects/spice-common/meson.build \ + --replace \ + "cmd = run_command(python, '-m', module)" \ + "cmd = run_command(python, '-c', 'import @0@'.format(module))" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix index 49c7612310..c74780148a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1f60vlfxhh9bhafws82c3301whjlz5gy92jz9a9ymwfg5h53bv1j"; + sha256 = "sha256-OfcMHH+MSOGY9pxpXt19EIGdP4FJFssSv/lENX+iIf8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix index febf1b97eb..f040022cc9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE="; + sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 79895a63a3..4dedc13db2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; # https://github.com/tdlib/td/issues/1790 - rev = "b3ab664a18f8611f4dfcd3054717504271eeaa7a"; - sha256 = "OBgzFBi+lIBbKnHDm5D/F3Xi4s1x4geb+1OoBP3F+qY="; + rev = "92c2a9c4e521df720abeaa9872e1c2b797d5c93f"; + sha256 = "ZoKsgdkS78mptfbxkkV4pgcgJEaWwKZWK2cvmxgJN4E="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index e3c74bd2fe..10307c35f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -127,7 +127,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 727634a9fd..68a29919f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkg-config to install dbus service/s - ]; + ] ++ checkInputs; # gi is in the main meson.build and checked regardless of + # whether tests are enabled buildInputs = [ glib @@ -85,7 +86,6 @@ stdenv.mkDerivation rec { checkInputs = with python3.pkgs; [ pygobject3 - tappy ]; mesonFlags = [ @@ -132,7 +132,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 73fef21ecc..61696d232f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.24"; + version = "1.25"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z"; + sha256 = "0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi"; }; postPatch = lib.optionalString doCheck '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix index 0aa77b771e..49e0e01872 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/waylandpp/default.nix @@ -16,13 +16,13 @@ assert docSupport -> doxygen != null; with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; + sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index e9026d46bc..0894457f98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.4"; + version = "2.34.5"; outputs = [ "out" "dev" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-l19QGRmbp2mRkYNc914BoYuU47zQEH2nOJ1N3LGrpAY="; + sha256 = "sha256-aJMGQ696R6OvBfRtZueEQiQzdT2rM10ygvMZqFpWKbQ="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix new file mode 100644 index 0000000000..1ce3c2d9fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, darwin }: + +stdenv.mkDerivation rec { + pname = "webrtc-audio-processing"; + version = "0.3.1"; + + src = fetchurl { + url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz"; + sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; + }; + + patches = [ ./enable-riscv.patch ]; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + + patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 + ''; + + meta = with lib; { + homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix index 1ce3c2d9fa..5a53564603 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,19 +1,34 @@ -{ lib, stdenv, fetchurl, darwin }: +{ lib, stdenv, fetchurl +, darwin +, abseil-cpp_202111 +, meson +, ninja +}: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; - version = "0.3.1"; + version = "1.0"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz"; - sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; + url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v1.0/webrtc-audio-processing-v${version}.tar.gz"; + sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; }; - patches = [ ./enable-riscv.patch ]; + nativeBuildInputs = [ + meson + ninja + ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = [ + abseil-cpp_202111 + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); - patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' + patchPhase = '' + # this is just incorrect upstream + # see https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4 + substituteInPlace meson.build \ + --replace "absl_flags_registry" "absl_flags_reflection" + '' + lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; @@ -21,6 +36,8 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - platforms = platforms.unix; + # attempts to inline 256bit AVX instructions on x86 + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 + platforms = lib.lists.subtractLists platforms.i686 platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix index cf188756ff..398a09ff2a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.14.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, seatd +, libpng, ffmpeg_4, xcbutilrenderutil, seatd , enableXWayland ? true, xwayland ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil seatd + libpng ffmpeg_4 xcbutilrenderutil seatd ] ++ lib.optional enableXWayland xwayland ; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix index 7b7ff1816d..ed3effaa54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/0.15.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang +, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang , nixosTests , enableXWayland ? true, xwayland ? null @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; rev = version; - sha256 = "0wdzs0wpv61pxgy3mx3xjsndyfmbj30v47d3w9ymmnd4r479n41n"; + sha256 = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; }; # $out for the library and $examples for the example programs (in examples): @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]; buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang + libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader ] ++ lib.optional enableXWayland xwayland ; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch new file mode 100644 index 0000000000..ca9eb8bf61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch @@ -0,0 +1,43 @@ +commit 56a60ee50122613d3a356ce74b4bd77b5e7be235 +Author: Tim Kosse +Date: Sat Aug 26 15:37:30 2017 +0200 + + If a wxTopLevelWindow has been instanced, but Create has not been called, calling Destroy on the window results in an assertion in Show(false), at least under wxGTK. Fix this by only hiding a top level window during destruction if it is actually shown. + +diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp +index ef693690c5..8d07812031 100644 +--- a/src/common/toplvcmn.cpp ++++ b/src/common/toplvcmn.cpp +@@ -122,19 +122,21 @@ bool wxTopLevelWindowBase::Destroy() + // any more as no events will be sent to the hidden window and without idle + // events we won't prune wxPendingDelete list and the application won't + // terminate +- for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), +- end = wxTopLevelWindows.end(); +- i != end; +- ++i ) +- { +- wxTopLevelWindow * const win = static_cast(*i); +- if ( win != this && win->IsShown() ) ++ if ( IsShown() ) { ++ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), ++ end = wxTopLevelWindows.end(); ++ i != end; ++ ++i ) + { +- // there remains at least one other visible TLW, we can hide this +- // one +- Hide(); ++ wxTopLevelWindow * const win = static_cast(*i); ++ if ( win != this && win->IsShown() ) ++ { ++ // there remains at least one other visible TLW, we can hide this ++ // one ++ Hide(); + +- break; ++ break; ++ } + } + } + diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix index 8029477708..bc8fc6f5b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,76 +1,117 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, libX11, cairo -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +{ lib +, stdenv +, fetchurl +, cairo +, gtk2 +, libGL +, libGLU +, libSM +, libX11 +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, compat24 ? false +, compat26 ? true +, unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGLU ? null, libGL ? null -, compat24 ? false, compat26 ? true, unicode ? true, }: assert withMesa -> libGLU != null && libGL != null; -with lib; - stdenv.mkDerivation rec { - version = "2.8.12.1"; pname = "wxGTK"; + version = "2.8.12.1"; src = fetchurl { url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; + hash = "sha256-Hz8VPZ8VBMbOLSxLI+lAuPWLgfTLo1zaGluzEUIkPNA="; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] - ++ optional withMesa libGLU; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - - hardeningDisable = [ "format" ]; + buildInputs = [ + cairo + gtk2 + libSM + libX11 + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU; configureFlags = [ "--enable-gtk2" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") "--enable-mediactrl" "--enable-graphics_ctx" - ] ++ optional withMesa "--with-opengl"; + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl"; + + hardeningDisable = [ "format" ]; # These variables are used by configure to find some dependencies. SEARCH_INCLUDE = "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; + + lib.optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - "; + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + ''; - postBuild = "(cd contrib/src && make)"; + postBuild = '' + pushd contrib/src + make + popd + ''; - postInstall = " - (cd contrib/src && make install) - (cd $out/include && ln -s wx-*/* .) - "; + postInstall = '' + pushd contrib/src + make install + popd + pushd $out/include + ln -s wx-*/* . + popd + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; passthru = { inherit compat24 compat26 unicode; gtk = gtk2; }; - - enableParallelBuilding = true; - - meta = { - platforms = platforms.linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix index 5674f076be..46ef04dcb7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,84 +1,127 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, gtk2 +, libGL +, libGLU +, libSM +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, compat24 ? false +, compat26 ? true +, unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGLU ? null, libGL ? null -, compat24 ? false, compat26 ? true, unicode ? true -, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null +, darwin }: assert withMesa -> libGLU != null && libGL != null; - -with lib; - +let + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; +in stdenv.mkDerivation rec { - pname = "wxwidgets"; - version = "2.9.4"; + pname = "wxGTK"; + version = "2.9.5"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + hash = "sha256-izefAPU4lORZxQja7/InHyElJ1++2lDloR+xPudsRNE="; }; patches = [ - (fetchurl { # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ../0001-fix-assertion-using-hide-in-destroy.patch ]; - buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xorgproto ] - ++ optional withMesa libGLU - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; + nativeBuildInputs = [ + autoconf + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + gtk2 + libSM + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU + ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + Kernel + QuickTime + setfile + ]; - propagatedBuildInputs = optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; - configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; + configureFlags = [ + "--disable-precomp-headers" + "--enable-gtk2" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit + "--enable-universal-binaries" + "--with-cocoa" + "--with-macosx-version-min=10.7" + ]; SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' + preConfigure = '' + ./autogen.sh + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' substituteInPlace configure --replace \ - "-framework System" \ - -lSystem + "-framework System" "-lSystem" ''; - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; + postInstall = '' + pushd $out/include + ln -s wx-*/* . + popd + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.darwin ++ platforms.linux; + badPlatforms = [ "x86_64-darwin" ]; + }; passthru = { inherit compat24 compat26 unicode; gtk = gtk2; }; - - enableParallelBuilding = true; - - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - badPlatforms = [ "x86_64-darwin" ]; - }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index 30e807cde0..0469ccbd0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,20 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config -, libXinerama, libSM, libXxf86vm -, gtk2, gtk3 -, xorgproto, gst_all_1, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withMesa ? libGLSupported -, libGLU, libGL -, compat24 ? false, compat26 ? true, unicode ? true +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, gtk2 +, gtk3 +, libGL +, libGLU +, libSM +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, compat24 ? false +, compat26 ? true +, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, AGL, Carbon, Cocoa, Kernel, QTKit +, darwin }: -with lib; - -assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; +assert withGtk2 -> (!withWebKit); +let + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (gst_all_1) gstreamer gst-plugins-base; + gtk = if withGtk2 then gtk2 else gtk3; +in stdenv.mkDerivation rec { pname = "wxwidgets"; version = "3.0.5"; @@ -23,73 +36,103 @@ stdenv.mkDerivation rec { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; + hash = "sha256-p69nNCg552j+nldGY0oL65uFRVu4xXCkoE10F5MwY9A="; }; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optional withGtk2 gtk2 - ++ optional (!withGtk2) gtk3 - ++ optional withMesa libGLU - ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - - propagatedBuildInputs = optional stdenv.isDarwin AGL; - - patches = [ - (fetchurl { # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) + nativeBuildInputs = [ + pkg-config ]; - configureFlags = - [ "--disable-precomp-headers" "--enable-mediactrl" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] - ++ optionals withWebKit - ["--enable-webview" "--enable-webview-webkit"]; + buildInputs = [ + gstreamer + gst-plugins-base + gtk + libSM + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU + ++ lib.optional withWebKit webkitgtk + ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + Kernel + QTKit + setfile + ]; + + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + + patches = [ + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ../0001-fix-assertion-using-hide-in-destroy.patch + ]; + + configureFlags = [ + "--disable-precomp-headers" + "--enable-mediactrl" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit + "--enable-universal-binaries" + "--with-cocoa" + "--with-macosx-version-min=10.7" + ] + ++ lib.optionals withWebKit [ + "--enable-webview" + "--enable-webview-webkit" + ]; SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' substituteInPlace configure --replace \ - "-framework System" \ - -lSystem + "-framework System" "-lSystem" ''; - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat24 compat26 unicode; - gtk = if withGtk2 then gtk2 else gtk3; - }; + postInstall = '' + pushd $out/include + ln -s wx-*/* . + popd + ''; enableParallelBuilding = true; - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; + meta = with lib; { homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux ++ platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; + + passthru = { + inherit gtk; + inherit compat24 compat26 unicode; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 17c2ee9efa..e1f732929c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,71 +1,99 @@ -{ lib, stdenv, fetchFromGitHub, expat, libiconv, libjpeg, libpng, libtiff, zlib -# darwin only attributes -, derez, rez, setfile -, AGL, Cocoa, Kernel, WebKit +{ lib +, stdenv +, fetchFromGitHub +, expat +, libiconv +, libjpeg +, libpng +, libtiff +, zlib +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; + inherit (darwin.stubs) derez rez setfile; +in stdenv.mkDerivation rec { - version = "3.0.5.1"; pname = "wxmac"; + version = "3.0.5.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0="; + hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0="; }; buildInputs = [ - expat libiconv libjpeg libpng libtiff zlib - derez rez setfile - AGL Cocoa Kernel WebKit + expat + libiconv + libjpeg + libpng + libtiff + zlib + AGL + Cocoa + Kernel + WebKit + derez + rez + setfile ]; postPatch = '' - substituteInPlace configure --replace "-framework System" -lSystem + substituteInPlace configure --replace "-framework System" "-lSystem" ''; configureFlags = [ - "wx_cv_std_libfullpath=/var/empty" - "--with-macosx-version-min=10.7" - "--enable-unicode" - "--with-osx_cocoa" - "--enable-std_string" - "--enable-display" - "--with-opengl" - "--with-libjpeg" - "--with-libtiff" - "--without-liblzma" - "--with-libpng" - "--with-zlib" - "--enable-dnd" + "--disable-mediactrl" + "--disable-precomp-headers" "--enable-clipboard" - "--enable-webkit" - "--enable-svg" - "--enable-graphics_ctx" "--enable-controls" "--enable-dataviewctrl" + "--enable-display" + "--enable-dnd" + "--enable-graphics_ctx" + "--enable-std_string" + "--enable-svg" + "--enable-unicode" + "--enable-webkit" "--with-expat" - "--disable-precomp-headers" - "--disable-mediactrl" + "--with-libjpeg" + "--with-libpng" + "--with-libtiff" + "--with-macosx-version-min=10.7" + "--with-opengl" + "--with-osx_cocoa" + "--with-zlib" + "--without-liblzma" + "wx_cv_std_libfullpath=/var/empty" ]; + doCheck = true; checkPhase = '' ./wx-config --libs ''; NIX_CFLAGS_COMPILE = "-Wno-undef"; - doCheck = true; - enableParallelBuilding = true; meta = with lib; { - platforms = platforms.darwin; - license = licenses.wxWindows; - maintainers = [ maintainers.lnl7 ]; homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; + description = "A Cross-Platform C++ GUI Library - MacOS-only build"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ lnl7 ]; + platforms = platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix index 2c9f476313..dc2b1c40c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for encoding H264/AVC video streams"; homepage = "http://www.videolan.org/developers/x264.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt tadeokondrak ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix index 4610aa5309..20c56f4d90 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -1,103 +1,138 @@ -{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl -, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms -, debugSupport ? false # Run-time sanity checks (debugging) -, werrorSupport ? false # Warnings as errors -, ppaSupport ? false # PPA profiling instrumentation -, vtuneSupport ? false # Vtune profiling instrumentation -, custatsSupport ? false # Internal profiling of encoder work +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, nasm + +# NUMA support enabled by default on NUMA platforms: +, numaSupport ? (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)) +, numactl + +# Multi bit-depth support (8bit+10bit+12bit): +, multibitdepthSupport ? (stdenv.is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) + +# Other options: , cliSupport ? true # Build standalone CLI application -, unittestsSupport ? false # Unit tests +, custatsSupport ? false # Internal profiling of encoder work +, debugSupport ? false # Run-time sanity checks (debugging) +, ppaSupport ? false # PPA profiling instrumentation +, unittestsSupport ? (stdenv.is64bit && !(stdenv.isDarwin && stdenv.isAarch64)) # Unit tests - only testing x64 assembly +, vtuneSupport ? false # Vtune profiling instrumentation +, werrorSupport ? false # Warnings as errors }: let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; - inherit (stdenv) is64bit; - cmakeFlagsAll = [ - "-DSTATIC_LINK_CRT=OFF" + cmakeCommonFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") (mkFlag debugSupport "CHECKED_BUILD") (mkFlag ppaSupport "ENABLE_PPA") (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag unittestsSupport "ENABLE_TESTS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" ]; - version = "3.4"; + cmakeStaticLibFlags = [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ]; - src = fetchFromBitbucket { - owner = "multicoreware"; - repo = "x265_git"; - rev = version; - sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; - }; - - buildLib = has12Bit: stdenv.mkDerivation rec { - name = "libx265-${if has12Bit then "12" else "10"}-${version}"; - inherit src; - - postPatch = '' - sed -i 's/unknown/${version}/g' source/cmake/version.cmake - sed -i 's/0.0/${version}/g' source/cmake/version.cmake - ''; - - cmakeLibFlags = [ - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DENABLE_HDR10_PLUS=ON" - "-DEXPORT_C_API=OFF" - "-DHIGH_BIT_DEPTH=ON" - ]; - cmakeFlags = [(mkFlag has12Bit "MAIN12")] ++ cmakeLibFlags ++ cmakeFlagsAll; - - preConfigure = '' - cd source - ''; - - nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl; - }; - - libx265-10 = buildLib false; - libx265-12 = buildLib true; in stdenv.mkDerivation rec { pname = "x265"; - inherit version src; + version = "3.5"; + + outputs = [ "out" "dev" ]; + + # Check that x265Version.txt contains the expected version number + # whether we fetch a source tarball or a tag from the git repo + src = fetchurl { + url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${version}.tar.gz"; + hash = "sha256-5wozNcrKy7oLOiDsb+zWeDkyKI68gWOtdLzJYGR3yug="; + }; + + sourceRoot = "x265_${version}/source"; + + patches = [ + # More aliases for ARM platforms + do not force CLFAGS for ARM : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/arm-r1.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1hgzq5vxkwh0nyikxjfz8gz3jvx2nq3yy12mz3fn13qvzdlb5ilp"; + }) + # use proper check to avoid undefined symbols when enabling assembly on ARM : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/neon.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1mmshpbyldrfqxfmdajqal4l647zvlrwdai8pxw99qg4v8gajfii"; + }) + # More complete PPC64 matches : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/x265-3.3-ppc64.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1mvw678xfm0vr59n5jilq56qzcgk1gmcip2afyafkqiv21nbms8c"; + }) + # Namespace functions for multi-bitdepth builds so that libraries are self-contained (and tests succeeds) : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/test-ns.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "0zg3g53l07yh7ar5c241x50y5zp7g8nh8rh63ad4bdpchpc2f52d"; + }) + ]; postPatch = '' - sed -i 's/unknown/${version}/g' source/cmake/version.cmake - sed -i 's/0.0/${version}/g' source/cmake/version.cmake + substituteInPlace cmake/Version.cmake \ + --replace "unknown" "${version}" \ + --replace "0.0" "${version}" ''; - cmakeFlags = [ + nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + + # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted + # (we are in x265_/source/build) + preBuild = lib.optionalString (multibitdepthSupport) '' + cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} + make -C ../build-10bits -j $NIX_BUILD_CORES + cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON + make -C ../build-12bits -j $NIX_BUILD_CORES + ln -s ../build-10bits/libx265.a ./libx265-10.a + ln -s ../build-12bits/libx265.a ./libx265-12.a + ''; + + cmakeFlags = cmakeCommonFlags ++ [ + "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=OFF" - ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ - "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" + "-DENABLE_HDR10_PLUS=ON" ] ++ [ (mkFlag cliSupport "ENABLE_CLI") - ] ++ cmakeFlagsAll; + (mkFlag unittestsSupport "ENABLE_TESTS") + ] ++ lib.optionals (multibitdepthSupport) [ + "-DEXTRA_LIB=x265-10.a;x265-12.a" + "-DEXTRA_LINK_FLAGS=-L." + "-DLINKED_10BIT=ON" + "-DLINKED_12BIT=ON" + ]; - preConfigure = '' - cd source + doCheck = unittestsSupport; + checkPhase = '' + runHook preCheck + ./test/TestBench + runHook postCheck ''; postInstall = '' - rm $out/lib/*.a + rm -f ${placeholder "out"}/lib/*.a ''; - nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl; - meta = with lib; { description = "Library for encoding H.265/HEVC video streams"; homepage = "https://www.x265.org/"; - license = licenses.gpl2; + changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${lib.strings.replaceStrings ["."] ["-"] version}"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix index e2d049cd7b..4d23752b24 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.18" "sha256-GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c="; + xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xbase/default.nix index dd5cd21d40..d87bcac982 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xbase/default.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { patches = [ ./xbase-fixes.patch (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?revision=1.1"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; sha256 = "1kpcrkkcqdwl609yd0qxlvp743icz3vni13993sz6fkgn5lah8yl"; }) (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc6.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc6.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; sha256 = "1994pqiip5njkcmm5czb1bg6zdldkx1mpandgmvzqrja0iacf953"; }) (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc7.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc7.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; sha256 = "1304gn9dbdv8xf61crkg0fc8cal0h4qkyhlbqa8y618w134cxh1q"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix index de1953622e..d5e058ef72 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeitgeist/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab -, fetchpatch , pkg-config , glib , sqlite @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; @@ -29,17 +29,9 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp"; + sha256 = "kG1N8DXgjYAJ8fbrGHsp7eTqB20H5smzRnW0PSRUYR0="; }; - patches = [ - # Fix build with Vala 0.52 - (fetchpatch { - url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch"; - sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4="; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix index 8d7cb3a48c..48603000c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zlib/default.nix @@ -22,13 +22,13 @@ assert shared || static; assert splitStaticOutput -> static; stdenv.mkDerivation (rec { - name = "zlib-${version}"; + pname = "zlib"; version = "1.2.11"; src = fetchurl { urls = - [ "https://www.zlib.net/fossils/${name}.tar.gz" # stable archive path - "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" + [ "https://www.zlib.net/fossils/zlib-${version}.tar.gz" # stable archive path + "mirror://sourceforge/libpng/zlib/${version}/zlib-${version}.tar.gz" ]; sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/third_party/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index f8bae89972..7959d1146f 100755 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -51,7 +51,7 @@ url="${ql_src##* }" [ "$ql_src_type" = github ] && { ql_src_type=git url="https://github.com/$url"; - version="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" + version="$("$(dirname "$0")/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" rev="refs/tags/$version"; } @@ -62,7 +62,7 @@ url="${ql_src##* }" ) && { url="${url/git:/https:}" url="${url%.git}" - [ -z "$rev" ] && rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) + [ -z "$rev" ] && rev=$("$(dirname "$0")/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1) [ -z "$version" ] && version="git-$(date +%Y%m%d)"; } @@ -131,7 +131,7 @@ url="${ql_src##* }" [ "$ql_src_type" = froydware-http ] && { dirurl="http://method-combination.net/lisp/files/"; - url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" | + url="$("$(dirname "$0")/urls-from-page.sh" "$dirurl" | grep "/${url}_" | grep -v "[.]asc\$" | tail -n 1)" ql_src_type=http } diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/urls-from-page.sh b/third_party/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh similarity index 99% rename from third_party/nixpkgs/pkgs/build-support/upstream-updater/urls-from-page.sh rename to third_party/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh index db39286ccb..26724d122a 100755 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/urls-from-page.sh +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh @@ -6,7 +6,7 @@ path="${url#$protocol://}" server="${path%%/*}" basepath="${path%/*}" relpath="${path#$server}" - + echo "URL: $url" >&2 curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix new file mode 100644 index 0000000000..62001bc69e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "float-features"; + version = "20210228-git"; + + description = "A portability library for IEEE float features not covered by the CL standard."; + + deps = [ args."documentation-utils" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz"; + sha256 = "1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd"; + }; + + packageName = "float-features"; + + asdFilesToKeep = ["float-features.asd"]; + overrides = x: x; +} +/* (SYSTEM float-features DESCRIPTION + A portability library for IEEE float features not covered by the CL standard. + SHA256 1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd URL + http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz + MD5 77223b9c85dca49d0f599e51ba95953a NAME float-features FILENAME + float-features DEPS + ((NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20210228-git + SIBLINGS (float-features-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix new file mode 100644 index 0000000000..ae18bc99ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix @@ -0,0 +1,37 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lisp-binary"; + version = "20210411-git"; + + description = "Declare binary formats as structs and then read and write them."; + + deps = [ args."alexandria" args."babel" args."cffi" args."closer-mop" args."flexi-streams" args."iterate" args."moptilities" args."quasiquote-2_dot_0" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz"; + sha256 = "1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb"; + }; + + packageName = "lisp-binary"; + + asdFilesToKeep = ["lisp-binary.asd"]; + overrides = x: x; +} +/* (SYSTEM lisp-binary DESCRIPTION + Declare binary formats as structs and then read and write them. SHA256 + 1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb URL + http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz + MD5 29d85f01a1cb17742164bacae940d29c NAME lisp-binary FILENAME lisp-binary + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME moptilities FILENAME moptilities) + (NAME quasiquote-2.0 FILENAME quasiquote-2_dot_0) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel cffi closer-mop flexi-streams iterate moptilities + quasiquote-2.0 trivial-features trivial-gray-streams) + VERSION 20210411-git SIBLINGS (lisp-binary-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix new file mode 100644 index 0000000000..146d5cf06d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix @@ -0,0 +1,31 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "quasiquote-2_dot_0"; + version = "20150505-git"; + + parasites = [ "quasiquote-2.0-tests" ]; + + description = "Writing macros that write macros. Effortless."; + + deps = [ args."fiveam" args."iterate" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; + sha256 = "0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974"; + }; + + packageName = "quasiquote-2.0"; + + asdFilesToKeep = ["quasiquote-2.0.asd"]; + overrides = x: x; +} +/* (SYSTEM quasiquote-2.0 DESCRIPTION + Writing macros that write macros. Effortless. SHA256 + 0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974 URL + http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz + MD5 7c557e0c10cf7608afa5a20e4a83c778 NAME quasiquote-2.0 FILENAME + quasiquote-2_dot_0 DEPS + ((NAME fiveam FILENAME fiveam) (NAME iterate FILENAME iterate)) + DEPENDENCIES (fiveam iterate) VERSION 20150505-git SIBLINGS NIL PARASITES + (quasiquote-2.0-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 51e4627cb8..4eb9be0b97 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -137,6 +137,7 @@ fast-io file-attributes fiveam flexi-streams +float-features form-fiddle fset generic-cl @@ -162,6 +163,7 @@ lfarm-client lfarm-server lfarm-ssl lift +lisp-binary lisp-namespace lla local-time diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 018cba19c0..60338d0ea0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -345,6 +345,16 @@ let quicklisp-to-nix-packages = rec { })); + "quasiquote-2_dot_0" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."quasiquote-2_dot_0" or (x: {})) + (import ./quicklisp-to-nix-output/quasiquote-2_dot_0.nix { + inherit fetchurl; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + "lfarm-common" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lfarm-common" or (x: {})) @@ -2836,6 +2846,24 @@ let quicklisp-to-nix-packages = rec { })); + "lisp-binary" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-binary" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-binary.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "moptilities" = quicklisp-to-nix-packages."moptilities"; + "quasiquote-2_dot_0" = quicklisp-to-nix-packages."quasiquote-2_dot_0"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -3257,6 +3285,16 @@ let quicklisp-to-nix-packages = rec { })); + "float-features" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."float-features" or (x: {})) + (import ./quicklisp-to-nix-output/float-features.nix { + inherit fetchurl; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "flexi-streams" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."flexi-streams" or (x: {})) diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index 697034ef04..80891e4293 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -415,6 +415,10 @@ let buildInputs = [ pkgs.libusb1 ]; }; + uppy-companion = super."@uppy/companion".override { + name = "uppy-companion"; + }; + vega-cli = super.vega-cli.override { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ 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 cf97f904d9..e4b9e6f402 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -13,6 +13,7 @@ , "@nestjs/cli" , "@squoosh/cli" , "@tailwindcss/language-server" +, "@uppy/companion" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" 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 47adf03bdb..029df3a466 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -85,13 +85,22 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1301.4" = { + "@ampproject/remapping-2.1.0" = { + name = "_at_ampproject_slash_remapping"; + packageName = "@ampproject/remapping"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.0.tgz"; + sha512 = "d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g=="; + }; + }; + "@angular-devkit/architect-0.1302.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1301.4"; + version = "0.1302.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1301.4.tgz"; - sha512 = "p6G8CEMnE+gYwxRyEttj3QGsuNJ3Kusi7iwBIzWyf2RpJSdGzXdwUEiRGg6iS0YHFr06/ZFfAWfnM2DQvNm4TA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.2.tgz"; + sha512 = "kkydqB0PA6ZvaUgHCePoqUAzLzx+x62xOGx5z4FtIlYO9zCYHbv9q4V1jtM0ufj9PZmHCM9HNafp68hx2dcCpg=="; }; }; "@angular-devkit/core-13.0.2" = { @@ -112,13 +121,13 @@ let sha512 = "uXVesIRiCL/Nv+RSV8JM4j8IoZiGCGnqV2FOJ1hvH7DPxIjhjPMdG/B54xMydZpeASW3ofuxeORyAXxFIBm8Zg=="; }; }; - "@angular-devkit/core-13.1.4" = { + "@angular-devkit/core-13.2.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.1.4"; + version = "13.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.1.4.tgz"; - sha512 = "225Gjy4iVxh5Jo9njJnaG75M/Dt95UW+dEPCGWKV5E/++7UUlXlo9sNWq8x2vJm2nhtsPkpnXNOt4pW1mIDwqQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.2.tgz"; + sha512 = "qH0Vu8qwGD5uhmE8PtePA1lm7xL3JtbBCcrQICmLqD6njLDVb2N5pbdDXeiXDlWGUoIRHUhu6Uw4AsY8zXP/FA=="; }; }; "@angular-devkit/schematics-13.0.2" = { @@ -139,13 +148,13 @@ let sha512 = "ayYbHGU8QpMGx8ZyhKOBupz+Zfv/2H1pNQErahYV3qg7hA9hfjTGmNmDQ4iw0fiT04NajjUxuomlKsCsg7oXDw=="; }; }; - "@angular-devkit/schematics-13.1.4" = { + "@angular-devkit/schematics-13.2.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.1.4"; + version = "13.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.1.4.tgz"; - sha512 = "yBa7IeC4cLZ7s137NAQD+sMB5c6SI6UJ6xYxl6J/CvV2RLGOZZA93i4GuRALi5s82eLi1fH+HEL/gvf3JQynzQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.2.tgz"; + sha512 = "kXPLTkSzRCeBX+SYUkC6MIrWCkH90Y8hVegR9R5n2YqhCJyE+dZlcx4d/8d3VHtZlzAs0LL8BU+liC3wMIagjA=="; }; }; "@angular-devkit/schematics-cli-13.1.2" = { @@ -418,688 +427,688 @@ let sha512 = "JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ=="; }; }; - "@aws-sdk/abort-controller-3.47.2" = { + "@aws-sdk/abort-controller-3.49.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.47.2.tgz"; - sha512 = "OpxsJ3b2KlpqTQKq6Py6JtLhA7KaAtHthH1JLLWStaFhU5/Js8nFnfPWdJIDRLpuAGyeRTbkjOEUsOkWAI5dAw=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.49.0.tgz"; + sha512 = "1qLlgOgg3yrtm+AJEP7yoIk90o6ns3Dia8S9DRjj29jY40446etH3v/tIbHPE+em69HLXl1K6e5KD6t7EDxnlg=="; }; }; - "@aws-sdk/chunked-blob-reader-3.47.1" = { + "@aws-sdk/chunked-blob-reader-3.49.0" = { name = "_at_aws-sdk_slash_chunked-blob-reader"; packageName = "@aws-sdk/chunked-blob-reader"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.47.1.tgz"; - sha512 = "D8wcAumX+q/VlX6lbYHWJqsaDBvj1BHVjJlBwLPrUBcsk0bRaJhhbhesej6DkhRX2pFhwXlHgc7CAgYhJCtc/w=="; + url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.49.0.tgz"; + sha512 = "UI1rK4aBgwsQ6dOQs5Im1cNSb3c/RH1wKjD49zcwWyxe8e96C5G2LcshhVH3onWY5NgqQgs/ffEsXziGcNXRIg=="; }; }; - "@aws-sdk/chunked-blob-reader-native-3.47.2" = { + "@aws-sdk/chunked-blob-reader-native-3.49.0" = { name = "_at_aws-sdk_slash_chunked-blob-reader-native"; packageName = "@aws-sdk/chunked-blob-reader-native"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.47.2.tgz"; - sha512 = "29+ZWESaFDQ9QXo7RGcUMuP89GTKo8bKlYplzNsO/B1uG17LgTgVHBapU3UBlF/EkOh1rzN5tEW+XwwstHvlXg=="; + url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.49.0.tgz"; + sha512 = "ppjmDWyufMB41Hmq5Gixd2+/c4kk2IPKKWT9zI9spKOYbbL/vY3FmRq4beQ6n5kWOzDPxKZ6wv04yrMS9yBy1A=="; }; }; - "@aws-sdk/client-s3-3.48.0" = { + "@aws-sdk/client-s3-3.49.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.48.0.tgz"; - sha512 = "zOr7WWr9b5V3nTQnMTz+kjDpLJceI5Vmx3+mwi5a3vFDwJBvMJK0C25A9koDXtrjn8/hszAePh6+rC0oW8QJsQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.49.0.tgz"; + sha512 = "LidddhZFxYb/jlEtHnbBpqVZmjgZNKY/jaZy3jRNcVhw8L0m1IYVigqgw5E6ta9/dma5EwLOA8Z21O/rCuDapw=="; }; }; - "@aws-sdk/client-sso-3.48.0" = { + "@aws-sdk/client-sso-3.49.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.48.0.tgz"; - sha512 = "A9f7B5k+X7bx062OQEcLHIMMIq0H1GlUqdw9xReCLd6W6vcRthbeSK5xbkM7TzHeKHE2/9qQYAy0lyKkxFE6bQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.49.0.tgz"; + sha512 = "rY8uZo4DeNwwKf+Sx0TX/5ysXJKf+0SQSCTWD9S4a0AjtiaLc6hKCX+sJY43VDHvNYieKtXLDYHBdhhqZKwG+g=="; }; }; - "@aws-sdk/client-sts-3.48.0" = { + "@aws-sdk/client-sts-3.49.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.48.0.tgz"; - sha512 = "vOSIYCHjXB9nztZqwjIjV/jRZCfgej1YHpgqeNlfL8hPNhcrHemaoJaKHRPnhljIuHi+H5yQW7Pm4qJUFtGwKA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.49.0.tgz"; + sha512 = "vqHNCuQriMZV1aeXc6cza5S9A/2zgfNiTelsmbDQdlCiZQ+YL3nTp1WFeYHap4ffYlLOAD0xv0yz/+naV4oHtQ=="; }; }; - "@aws-sdk/config-resolver-3.47.2" = { + "@aws-sdk/config-resolver-3.49.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.47.2.tgz"; - sha512 = "uv9U/qDOSqyCPQ71qiwMslqRMxYyt0y0h6X0aQ67GCPq4rbbU/dn8PqnYT0VfX/9Ss+DcbTm7vOTxVKv+8XADA=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.49.0.tgz"; + sha512 = "4kYV+89E9MG+/wfPY3dmwqzquQxNd951jdfjQbSg1ii68X/owqmWda4bLulV0Z4iGUz9TXkbaJCWyRyjsFNe4w=="; }; }; - "@aws-sdk/credential-provider-env-3.47.2" = { + "@aws-sdk/credential-provider-env-3.49.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.47.2.tgz"; - sha512 = "HQKXY8y51kpTrD7P8fZJNf4MdCdu0+NcdOc+HScrQ21oZJv3BXUwXxKiOWY95Z3jYqyFwSKs1/FFuQ1mV0wjPg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.49.0.tgz"; + sha512 = "mx82N0un6URmmiM11X3ObK3ka5R99lEFdhwPc0jqsCPnXRVioUtK5DXkJ8FmgixbDcs5Pdij9A8MINSeBrG0bQ=="; }; }; - "@aws-sdk/credential-provider-imds-3.47.2" = { + "@aws-sdk/credential-provider-imds-3.49.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.47.2.tgz"; - sha512 = "7fCIofgU5pdKGgbCAYQ8H7sIFluN3oebFyFy7C4eXJyNy/8QKjFHEW3NkNCh0Bkd5sLOqkwYU3nyRx0CbNkEoQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.49.0.tgz"; + sha512 = "d/H5VgmRiIupQdPg9QcX16kdvuiS/YytRYCQOncVstNXHvYZM9EgeIXJLXyPNaD2W8SS7CBf4KKWYJn3V+9AZw=="; }; }; - "@aws-sdk/credential-provider-ini-3.48.0" = { + "@aws-sdk/credential-provider-ini-3.49.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.48.0.tgz"; - sha512 = "PSTfzK8V+3WVJOv+wlS4y09KYZx3iYj4Ad8LMGmGE4aqew8eRf6u2WuTmqrWwuOTxDra9PJ1ObcM5vBc+nZcYA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.49.0.tgz"; + sha512 = "QlWfxDwZVyX36pghgkKGBR+fBmX/mjmvc0kzxUmqGhUYAkDQ0YKR11ybpGBrxBKT4lIOE+9z6Tu4nLjp3OlJIg=="; }; }; - "@aws-sdk/credential-provider-node-3.48.0" = { + "@aws-sdk/credential-provider-node-3.49.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.48.0.tgz"; - sha512 = "7CrbUT7yEZvYSQNXxZWN5KUx355wD+xrYIafoEST28T7nwcIiu7l2zpBY3JPhPIPNXqryVKfNQJvKV1dP3wF4g=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.49.0.tgz"; + sha512 = "DonoqOZHcqfNuwMG1fGJpHJTqf1QinihRKzlOoUWzmseqBCiuagGouSN7nOQgee5BrzF0X9/nao9lnPc4on2TA=="; }; }; - "@aws-sdk/credential-provider-process-3.47.2" = { + "@aws-sdk/credential-provider-process-3.49.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.47.2.tgz"; - sha512 = "LBuABkVt/tdSoHy8hdGVnInZx5QADhK90dEHc41+HTTP3bCSNsSBIErkZnmhAD/3AGz7m/4qkPmhJOqzFisY/g=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.49.0.tgz"; + sha512 = "Zn7CJHoXln8O+yBKdTBvcwCz6GDh48s7HtIsqjoOrqoL0oZWhgy8gn8S9KQ+HIqpiO8N0lMMteXuPl5fbC2zGg=="; }; }; - "@aws-sdk/credential-provider-sso-3.48.0" = { + "@aws-sdk/credential-provider-sso-3.49.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.48.0.tgz"; - sha512 = "31Ill3ZW35dueXb09PpOJ4C8oKdRGypbnycAgLYvvqYlO4LOs9FyQAsw+t2+ExvE6DznM0vkeWTQI3y7HUVYCA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.49.0.tgz"; + sha512 = "sFTqbQOyGR88K10Y1OgauEPKDmEibxtAkLSFjkJ6Yw/Jyp+lftchoa+TxRrNvDY1zjZX+XauVI6UmD5Pi4E1NQ=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.47.2" = { + "@aws-sdk/credential-provider-web-identity-3.49.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.47.2.tgz"; - sha512 = "biJo8zJwNk8Dwrd/mkTcu8iLuOlGbsG2Uahta4StkOUhZ733xewOZ4WISLXVLocb/PXLM1lZQgkobwugpFOQRA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.49.0.tgz"; + sha512 = "mlIHUTn04unB0HEwEO12YIY5848uE9B+gYI+YwlNZ70KXGs3lj2horOgPgbxeIfulCVw0aRTKChUg2ActTosYg=="; }; }; - "@aws-sdk/eventstream-marshaller-3.47.2" = { + "@aws-sdk/eventstream-marshaller-3.49.0" = { name = "_at_aws-sdk_slash_eventstream-marshaller"; packageName = "@aws-sdk/eventstream-marshaller"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.47.2.tgz"; - sha512 = "KRWpWBuICxIJOp5vPe2NzT387uW8Q5IpyMNf8SNmFe9a9yTrg2oIRKkbEHHRNyCRnjbDmpU3Td58V9bpmaBXGw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.49.0.tgz"; + sha512 = "EDE7aim4c/G9vCWE+jaHQNWHzrHgF1WlUEok1tgLj+fbvqKduDK/1SNleMZbMLC7tFRARN+KKFB0Ctegyp8j4w=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.47.2" = { + "@aws-sdk/eventstream-serde-browser-3.49.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.47.2.tgz"; - sha512 = "dXjJ0eoNCu9P6uOzNcIL0OoXhVbdR/LPTRJCIR7NcfGCmJ4ZXeYwgYcHFTosrT/+SXAFGgsoU23dqA63TFWlMQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.49.0.tgz"; + sha512 = "XHDHVGmxzEEXzHESzXYiycE3CxHLedBQljQPCIXKJkUhmwf84oUDB/cRsgWoOwOpcRQQBZGUPTPOOOHVWQOlZA=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.47.2" = { + "@aws-sdk/eventstream-serde-config-resolver-3.49.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.47.2.tgz"; - sha512 = "LE481skmmWqoPhGyhFWqf/0eEtAFKSJqyzPZEer6yFUpejaijek4Heo6B+Y3cyDGoASuqY4Wum+9q1Z1xPn2BQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.49.0.tgz"; + sha512 = "7xCaQGfZD0xLpWVUsGEQ2PDAkkfnl1gc10h4jLm0xtEGzr0x3B3fLrmDiZTz+wBxRRuCqjiaBaNuPT+HocGYmA=="; }; }; - "@aws-sdk/eventstream-serde-node-3.47.2" = { + "@aws-sdk/eventstream-serde-node-3.49.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.47.2.tgz"; - sha512 = "hrEsbDFaRr7rNJw+qgua+YhkMgSkgR/YhBe+rdI20maaJARIjLo4C8eRqAqrmlE4i2+PU4CvM/fVdL9M3HQXfQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.49.0.tgz"; + sha512 = "hRZa1QSCtSve3vSgOxtGRn7nlOJFGzaov6hDj+bFEWY6ukHWtG9lbit6ECALcud4BjxvaJet37kqToxnpDFMuQ=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.47.2" = { + "@aws-sdk/eventstream-serde-universal-3.49.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.47.2.tgz"; - sha512 = "Zkfa2kHKNsWSAdO4atr9+JPEtcZzWuJqZHMr8MO5aXAMnKd5BA9XvzyGyhrfpr9HmnoqcbXrcx8iqDxcFEIp5g=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.49.0.tgz"; + sha512 = "oW/k0QdJTEwRLbdWpakIKABYKEOokBaPd+VSOYmCNceYPzv74RTDqlzTTRVIGj51Jp+Bm1af3l0k1cpjPDnWfQ=="; }; }; - "@aws-sdk/fetch-http-handler-3.47.2" = { + "@aws-sdk/fetch-http-handler-3.49.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.47.2.tgz"; - sha512 = "MZwwKtJwkWPm3Tzh+F3gcts13v1OuZih0slOO4GJpMxq46+lcW4DoW04lNHULJsyduXs4CziH8g65DDh0Yhq6w=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.49.0.tgz"; + sha512 = "ougJRsvoIGP0qTgHSGVF1B5Ui95Y/SP5CpY/y6B8vMGrwJ+MmvcCUE3Qd2UJGjO1PfUneno8PHK4u5x7hc2ceA=="; }; }; - "@aws-sdk/hash-blob-browser-3.47.2" = { + "@aws-sdk/hash-blob-browser-3.49.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.47.2.tgz"; - sha512 = "DG8kGFUqXH+eQLLQtzTuBxBEuLHJ03w3X2Geq7aNvfwh06OOJW3FYz+FTLH2f2HxqlKOQtf3MsqpH074zKC5/A=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.49.0.tgz"; + sha512 = "DLLP8dY0eYAXefJJzAYO1QxHW567MN4D2KDxyOKkWOVR2S6ZLgtJb24MhT9RpV3AOM/x686HOv5V4r1rPbuHhw=="; }; }; - "@aws-sdk/hash-node-3.47.2" = { + "@aws-sdk/hash-node-3.49.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.47.2.tgz"; - sha512 = "OpUCNGvchKI1WoOCtCm36gQtECMz2P5mJoXxAHNZQ5qQ69A5Vk/DZs1V24N94M7tl1u7ZpbLsJbWFdu+P4B27g=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.49.0.tgz"; + sha512 = "nRNCmSkcJOzWzKU6NihlKW/6H1HxaaBjUe9ETnwWIgwPC7NZ6IWtri48Cf7Itvveu3dln3ZM2WSXN20TlQpuBw=="; }; }; - "@aws-sdk/hash-stream-node-3.47.2" = { + "@aws-sdk/hash-stream-node-3.49.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.47.2.tgz"; - sha512 = "ModP4kZkkj4j1djuANwETAwYL1uTcXBHVcVLvy/wVDVLIcEW1TgGBgkY0rSGFE4RWDESTjhLCBKNDgvpxReSLQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.49.0.tgz"; + sha512 = "ZsqGEs3yp5YH5vk1LhpIiSAzNzXHW89DvKn+BSSiDPdufPdOjLks8wKIVhAUfADcJ+S/AATTAt4SoA4mD+IHvQ=="; }; }; - "@aws-sdk/invalid-dependency-3.47.2" = { + "@aws-sdk/invalid-dependency-3.49.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.47.2.tgz"; - sha512 = "QLIp0Gv9IbSVXru1kS92M4kF9ZgHmVP7Us8dWSu5UC7LJt6Uxhxjb+e+F0h9qY1Z3Prior12I4r5COgVO3dWxA=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.49.0.tgz"; + sha512 = "MXf/9l/Oiy+KGKDvInv0RT4rtS+iNftYRTlTmUn3RR74Kz8Fvw+O0RcUjzSrNn5SpjCf/UsGrF+KBTm2gFYQCA=="; }; }; - "@aws-sdk/is-array-buffer-3.47.1" = { + "@aws-sdk/is-array-buffer-3.49.0" = { name = "_at_aws-sdk_slash_is-array-buffer"; packageName = "@aws-sdk/is-array-buffer"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.47.1.tgz"; - sha512 = "HQMvT3dP6DCjmn87WkzYxUF9RqkvuXgKfddLEKj/tg/OgDQJv9xIPjEEry8Fd36ncbBqaBmC/z2ETZhpzHQvXA=="; + url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.49.0.tgz"; + sha512 = "tLba+xvlm1+aAnv+bGieVZo8DCENbqfS9kLf/hp+9hrUSiNAsxs9Pqi34JBpMKGn6h9qORp6f8ClRS+gK8yvWg=="; }; }; - "@aws-sdk/md5-js-3.47.2" = { + "@aws-sdk/md5-js-3.49.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.47.2.tgz"; - sha512 = "APIz8mCPscYG6gCxvC2dbrBfpM3jHwAh+VqTmGHHxxO1AAP3y5ohtdl/2MsKtEPKuyT1IX2/YoUwcOyJj65xmw=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.49.0.tgz"; + sha512 = "CJJxl7FfTNseaw3RAPmihpys1cfbCyg7sLTev6PncqBhoVl+5AWOoITeZj3azE3CKevY2V7PEdmHjzKRNLmcdA=="; }; }; - "@aws-sdk/middleware-apply-body-checksum-3.47.2" = { + "@aws-sdk/middleware-apply-body-checksum-3.49.0" = { name = "_at_aws-sdk_slash_middleware-apply-body-checksum"; packageName = "@aws-sdk/middleware-apply-body-checksum"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-3.47.2.tgz"; - sha512 = "sjZZZ7hOR9retsblYOs4cgsVg7r1Sfuvr/aIx16XXv3TeAk7fz8JTRf5STxMM6YkGIVMbvBOHpMNvcGGgJQhZQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-3.49.0.tgz"; + sha512 = "uNUETgYrOLCZNad+vVsTblTqzuaCVCt67o4VawsziR5QuOCxX/27Ni3x1VNtpI5pUhD8FiT/9/lBpcMTvCSIgA=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.47.2" = { + "@aws-sdk/middleware-bucket-endpoint-3.49.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.47.2.tgz"; - sha512 = "VrUrkAUS3CqI7tK3r0c0oT+1SE1L+euyq6j6Jt3XOjRMUXCkArecVkr3jEprbpVDiAkaTXEJE77iL1+98twiYA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.49.0.tgz"; + sha512 = "6GK6BXNRRe+JpBUomW1Wrj7HGU3gdl9XvrQekj772kmiBLx/40ntAxZnhjFjkNKLy7IM+he8yygnEUhbV/dEmg=="; }; }; - "@aws-sdk/middleware-content-length-3.47.2" = { + "@aws-sdk/middleware-content-length-3.49.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.47.2.tgz"; - sha512 = "rpLtN6BczAfJnH1fpXyUOMdDFN3xrky3QZ4SULVgTLXNMOvN5zDJnjwUh/QNgEaEQhxd6lroVJSgosG3357kWg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.49.0.tgz"; + sha512 = "7IaghPT7X92gNoyn9LzZj4V5YpGPDCYQTWhpzZoIlw88vOR4I0zKg7jwYeElRoNfRCI4OYhF26ajKnNHzNMlbA=="; }; }; - "@aws-sdk/middleware-expect-continue-3.47.2" = { + "@aws-sdk/middleware-expect-continue-3.49.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.47.2.tgz"; - sha512 = "sLv5q8+POzpMvp9dx/OInFr6VWJreHOGFoauYN1n7a+8dmhr9tycBLq/j+eBXI2FWwC3dXCBdrC9qs4ieSRe0Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.49.0.tgz"; + sha512 = "i0FMywhvCdn3+gPuUgtM0ZRd3xBHozropbhvs3fu9Y6g1/YiOgTYuVVqHtObvktVWCV72i8fTvn8TEkyFHRDYQ=="; }; }; - "@aws-sdk/middleware-header-default-3.47.2" = { + "@aws-sdk/middleware-header-default-3.49.0" = { name = "_at_aws-sdk_slash_middleware-header-default"; packageName = "@aws-sdk/middleware-header-default"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.47.2.tgz"; - sha512 = "fCcQaQ/ac+h8nS8d8nSrvP/scNTCdkHQ8PpNXo7nSz4a67xbxxln61T4iHOin8z0m62NlFrhtMdlQTtDqDEZVg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.49.0.tgz"; + sha512 = "3xRNPwFMWQqgGKgxDWMgQXNdIr4EVq5ltrLqwsZopXKZli9/fidOrDN9z9j4AW9YAXyEAYB0fscKT7LcsvxFZg=="; }; }; - "@aws-sdk/middleware-host-header-3.47.2" = { + "@aws-sdk/middleware-host-header-3.49.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.47.2.tgz"; - sha512 = "sDIGydvdO1LC7VQntTDMK+YYLRVCJAhrsCT8SxyAX0Jhu7Ek1BfRZzSZDwapL+idbMyyKsB80NpNoTWuKRrrew=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.49.0.tgz"; + sha512 = "5l1ILqHs2mGqNvJb5mRe7hHbTQOO292jghE/LItpNx2tiu7BBGzP1bslHcyEVYoRBX9Oqyfou7s9Ww2yBWtImQ=="; }; }; - "@aws-sdk/middleware-location-constraint-3.47.2" = { + "@aws-sdk/middleware-location-constraint-3.49.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.47.2.tgz"; - sha512 = "b6ozPYnInQB1Iv+UjLyhunTCUcw54AKtUO7Mj2QLT2GqCPDPry7ZmAC9Qtfv4Itv7HyM4VfR1roAGKZwT4zxQw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.49.0.tgz"; + sha512 = "PUQr06/9XQP0JfUY6nFvK5HHcO4aQbzn/iKvB8dl471IXcKVLnJdB2OuIjUUW6fQbKX1K4xcDEifWTSMIECIlg=="; }; }; - "@aws-sdk/middleware-logger-3.47.2" = { + "@aws-sdk/middleware-logger-3.49.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.47.2.tgz"; - sha512 = "Oz14cAaYmtzMYw0/ehlVLvMF4gqQS0qaYWGyyR4a3nONiwEDzxNMEQiEg7i8VgsP4usK7lfYZLXgwSmqo7uCzg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.49.0.tgz"; + sha512 = "OicQ0w5sCJXgpeZ+t3XeJA2R/09YfuSe53Ma6aWZm/2/r8vG/SW0yAnwFvwJeCm3DKtBxU1qO2eWhFqvJuWRVA=="; }; }; - "@aws-sdk/middleware-retry-3.47.2" = { + "@aws-sdk/middleware-retry-3.49.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.47.2.tgz"; - sha512 = "qgAE/+hVGXQDkqbVo+uFeb+N7mr7kBi0Oc1Fm490fm3uLQnXuyu3suIix//wxNejoLwIgKQGSLrQNgnXtuvhxw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.49.0.tgz"; + sha512 = "RSS4R4PNULHA1b1eYR50YPPfOV2jRuXgLNLVVYMEzzC23MabKEXJYPge+pI1Q9rRrbahVj7aQcOTSpT0MsiEeA=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.47.2" = { + "@aws-sdk/middleware-sdk-s3-3.49.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.47.2.tgz"; - sha512 = "KjcrHHDIn4QCh8pTRVT2u8uOnpdPYVB2p+xblwyRvJt2VLhgJbgNpRy8pOwNo2lyfbOKrmWeBk4x0NduiXle8g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.49.0.tgz"; + sha512 = "PeQHJsecGCnXILgOPLgcoZXCa4+2bctus2krhN08ES5oh1obeQB+EOC4v1sWV0DdfyTHEZMDSVLS9qTFHl9IUA=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.47.2" = { + "@aws-sdk/middleware-sdk-sts-3.49.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.47.2.tgz"; - sha512 = "KlO4cYb4Bxf/Jg/uxlxRrFvxUR/DmjMIS+JRZNGqK4XyYA+apYZkfM0XUtMiKc491n/euluf9A0AyTxpMgixxg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.49.0.tgz"; + sha512 = "ZnLV37HKpMdK2x+69ZNqAqKr8rmweyMc//yZQRLtUKpKyQ/XSr0/KUBZXkgIny27aaBsrkplA5g1X2GrClRRZA=="; }; }; - "@aws-sdk/middleware-serde-3.47.2" = { + "@aws-sdk/middleware-serde-3.49.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.47.2.tgz"; - sha512 = "Gjw+fkG4UvvbP5LrGW1FzUq0IJB6QIBFxStE0gbyjkKNYtcb9c0R3dIwH5CSECtelDZScytwmBKaVe8NGi6wJA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.49.0.tgz"; + sha512 = "bMAlwR19uFUZ4om+U+/vnPvkcyYw83HdtERF9wrjAqNUnqYsifA0xn4R7Sakg6CW8V0h82dsST6zVfmHd+E2VA=="; }; }; - "@aws-sdk/middleware-signing-3.47.2" = { + "@aws-sdk/middleware-signing-3.49.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.47.2.tgz"; - sha512 = "r6/2gf5gwkVdI7EOa1TdYdfzOdCF3jkhjLi98c3nAxZNxZFGwoycIy7Bd6sCfOdcmk8NyVmR0APpsgD9q+a3nw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.49.0.tgz"; + sha512 = "9p0xZjxV9zEQdOpA4MtzmblPRUgchevg5Q70E23yAU/Wjwzwf/6J93cUxdcS8HnmOIl0zQjJaYMTcBsvgJF1eg=="; }; }; - "@aws-sdk/middleware-ssec-3.47.2" = { + "@aws-sdk/middleware-ssec-3.49.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.47.2.tgz"; - sha512 = "dRNQJjvlg4omfhAfSYtZva4OpS/58aLO7y8l2o5sQHGPwob5OYO5zfPioi4h68UZw1fagG962hUywOkVJDJAuw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.49.0.tgz"; + sha512 = "S7hfgOCYoqPe4YegSnwhQJ0KBVEhP6dIp7yLa1/yCJkqW2KSnLTvg6ao9vEFf/lhctZ72YZjm8v/2siXWCnDEA=="; }; }; - "@aws-sdk/middleware-stack-3.47.2" = { + "@aws-sdk/middleware-stack-3.49.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.47.2.tgz"; - sha512 = "9wedI1L92stvg5fs6Y3CbUXYLZIYdI3Mrdqex+ulNRuepgZNORsk+dnb8rTkf9cO3nuWRrnfKBLc/uiTcA1dww=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.49.0.tgz"; + sha512 = "OZxs2P7EH58gkvkTI7ESlUPGam0TkE0ZxOX35KjCOcYMuWvTMshKBzHRLX64nz3DYdaHSIGHgB1v8LKELZjltw=="; }; }; - "@aws-sdk/middleware-user-agent-3.47.2" = { + "@aws-sdk/middleware-user-agent-3.49.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.47.2.tgz"; - sha512 = "LF5gOi37lJ3tkuDSqZVKHmqYY8oTIUTEdmPVUbBQtPKsx9xfCNbMNVAP+C+7bnbt6StZIZsvtu0M144yNFXPGQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.49.0.tgz"; + sha512 = "uAcKgafZ12L8UnyeQGgSFtwOKUfiBWDLt4P2fEHvZRz/HAIcK4pu1PXPArjwteinhUiCDNFfPw8hAPvstMoG6w=="; }; }; - "@aws-sdk/node-config-provider-3.47.2" = { + "@aws-sdk/node-config-provider-3.49.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.47.2.tgz"; - sha512 = "POdigo6ZXLRVWhmjE21Y1Q1ziPnM/c3rH0wHgzAtdx0Mfn6/9jS77QHMkZzC8MJ7lzgXVFDWM25evVZqdYrh+g=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.49.0.tgz"; + sha512 = "OCn5c6M/RJDEO80Q+Iy4ADSYgqd/uyEsvp+7lU4di4bMND9kYT4JO2ky2SWjIuARGq/mhMOhaN2DO9MbcqV20g=="; }; }; - "@aws-sdk/node-http-handler-3.47.2" = { + "@aws-sdk/node-http-handler-3.49.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.47.2.tgz"; - sha512 = "X2Y+H2DBoeDnrSe5rsVc63uhext230AuG/+hIFHK2/HkyG9DiiHKNCNj2w8N4FLWEX3l8KDif3C7BqYxj9ZkDg=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.49.0.tgz"; + sha512 = "t7D9hoSigBihC9RRgYrkzgSER0fYzZe7192pJAaP6jk13ZOpccQRfXZoKge/cm42aHJsTy8DdQdGtLg7wLTp0g=="; }; }; - "@aws-sdk/property-provider-3.47.2" = { + "@aws-sdk/property-provider-3.49.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.47.2.tgz"; - sha512 = "0NiVJ6+JtRC8XOvNb1ofHtsjINrinC1/fDKvl/bDtJDhehC5EcIeiDQmHFUhGsgTyD+VpmuHj7E4AlV6BchNPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.49.0.tgz"; + sha512 = "6D48YpriOUpniezVuRI8J+MG+vgwb5C1SzBdgN4+S6DqbsEZy+kdEubXdoMICEd+Z8h7lH3p5zMr6po0icGCfA=="; }; }; - "@aws-sdk/protocol-http-3.47.2" = { + "@aws-sdk/protocol-http-3.49.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.47.2.tgz"; - sha512 = "XAQFbSigJD0fk61nSR6y6TMv3+o1IjymltWuDmGEtoI25pisC2M3A+3/xO9YHag/41CSgt9nQ+lh1iC4UlKKJw=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.49.0.tgz"; + sha512 = "lb9CO7/vm26v4UwveWb4jSapqWWP/p0b9SuHpRExq+yMuvHqwxcoGrxmvS7FsanWbepRF1895dxU/Ar6/4pviA=="; }; }; - "@aws-sdk/querystring-builder-3.47.2" = { + "@aws-sdk/querystring-builder-3.49.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.47.2.tgz"; - sha512 = "rsckQ262jFSDVES6rOuTnSDM9XEbM57zxeBj5BtD6eCnyUD0G4FZa1xZRum4khoxfff6/eJ+i2uncKrEk1v+EQ=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.49.0.tgz"; + sha512 = "+NlgIYihVyUetZcrF1ADY0eg8WW1/ETD5bzTwguTiKduXVHmavSakXK1jJF5vg05mefljToZXjQnOaEs9+K9LA=="; }; }; - "@aws-sdk/querystring-parser-3.47.2" = { + "@aws-sdk/querystring-parser-3.49.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.47.2.tgz"; - sha512 = "28BirdFhZ+Y2pUMuI9r1ATgcQyt4q3cSqqpLSy7ADGb7xHde6oA/ZfRdX/s7OVIHoAfhrjAeI+TbYjwso9F/HA=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.49.0.tgz"; + sha512 = "4bSCHI5A8wi+JjsD1gAhMuGRGjDmlw6MoMWUiv4R2J8Ow/9mV8biKRo2ZytUPiSSu4G5JQ7mEkqFsm/VgkstDQ=="; }; }; - "@aws-sdk/s3-request-presigner-3.48.0" = { + "@aws-sdk/s3-request-presigner-3.49.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.48.0.tgz"; - sha512 = "JEkTJ5FE1MY8NHNLj2AeW2R+mIODHGVSq6eC4+aRBHFZqY+EYM7mkML0brggXjrofUaktZ5Z83ssBwzP2XAj8A=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.49.0.tgz"; + sha512 = "kFLEt2m4Iql4HhF6jdHD9dSMbD48ldYEYTsLThk8zGuepDs7k9md3QziMY1g47LMX+f9rSGLKBLMtfNvArG6JQ=="; }; }; - "@aws-sdk/service-error-classification-3.47.2" = { + "@aws-sdk/service-error-classification-3.49.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.47.2.tgz"; - sha512 = "oJCJbAPYhTNguJUhD8hlD7ibWIDpkvGrhkcq89gxBcXHPl/2/kjsii0gr302IH452IJlumpVe5wOXoZeqZYjaw=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.49.0.tgz"; + sha512 = "iVmf7RcrIsM/We5ip8fe14RzEpSLF5eN8oqhCMftEdmMVnOYMd/9x0f1w69fbyBJNIIpyREqM8eAKz5OWQn5/g=="; }; }; - "@aws-sdk/shared-ini-file-loader-3.47.1" = { + "@aws-sdk/shared-ini-file-loader-3.49.0" = { name = "_at_aws-sdk_slash_shared-ini-file-loader"; packageName = "@aws-sdk/shared-ini-file-loader"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.47.1.tgz"; - sha512 = "f0eVOMYkT4H0gOf1B9lw65/xeTa7rT9hocVB7DbjWk8Ifv46Uvlb4ZyYOLZIBDQyFNFrD/HHvja3BkzfV0MEOA=="; + url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.49.0.tgz"; + sha512 = "TcgKU6U/3JZpenRFhGSy5R5QsBWkYoeawTK1rTK6deu3UbxVwtOkietbfwP3kIwKZ4hz6OkNeHcOJtXX/InZKw=="; }; }; - "@aws-sdk/signature-v4-3.47.2" = { + "@aws-sdk/signature-v4-3.49.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.47.2.tgz"; - sha512 = "zJIhUY8LLiQldfM9wpgVw525dHbILJovyZm3xmm6Tq/t258cawNaeOvOp9w0I3ycA3gs+nKgMXdeMjLH8QLbWg=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.49.0.tgz"; + sha512 = "mQSGclWmv/9/MsgthBuKMHN6nkkhGTLXspkhqJ9xSUhjhoaHQVwMoJc39PowJGbYFn1AtCvHAqJtFXTGsMRwPA=="; }; }; - "@aws-sdk/smithy-client-3.47.2" = { + "@aws-sdk/smithy-client-3.49.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.47.2.tgz"; - sha512 = "vCzZodWyKmLzC+N/B1GzDjKD8I5b/ILTwPHaaH7yJdncISq/3jyTMJVW7mZHbDX61a18rL/bADnIxEd524Y2hQ=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.49.0.tgz"; + sha512 = "ANh9SlEvuru1DcalVoQ7K6wSCYuw4jyeTsIDsJSa13ckrmXAg+ql9vq61ELAXTSNVmuAISuuPjbVaWvOYCtdCQ=="; }; }; - "@aws-sdk/types-3.47.1" = { + "@aws-sdk/types-3.49.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.47.1.tgz"; - sha512 = "c+lxJJLD5Bq8HkrgaIWQfK8oGH53CYpRRJizyQ5qfRo9aXp/qshUnIVcgnA8t0k7jfzcIfa0Q7jSSBw3EerEbg=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.49.0.tgz"; + sha512 = "8bCqEpquTlPN6xkjaJ+s+RoEFIu5r4G8oXOsQ5HYBvBdpx62HnCqzHLFNHycL2b8sE+VysQgNvmdQYR98vdMGQ=="; }; }; - "@aws-sdk/url-parser-3.47.2" = { + "@aws-sdk/url-parser-3.49.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.47.2.tgz"; - sha512 = "xapm+8toLY1FJmdGWl/YWCGSbbzPitiKmcg9+NP1DIyZyHjzeG5vBZ2SYejYtGOf+Qn1VKyNN2+Qs049FOsh6w=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.49.0.tgz"; + sha512 = "l5td6eu+sIjzNsZYVGr7Mz6vssf2j/8/QrrTYF76J2R6OoceCsKdyJgJPP/tXBdcp4HUZDdVcMqtWRbxGC4izQ=="; }; }; - "@aws-sdk/util-arn-parser-3.47.1" = { + "@aws-sdk/util-arn-parser-3.49.0" = { name = "_at_aws-sdk_slash_util-arn-parser"; packageName = "@aws-sdk/util-arn-parser"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.47.1.tgz"; - sha512 = "Q+tZjYyBeWMyPJ6+l42JXS7gt5crXywJbLDGjoLoS+Ba0JDB5zp8IMRLzGzQpTO+VnbL4ZyEEUVEihyqFbB0iw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.49.0.tgz"; + sha512 = "mAF4lzxqMUFMQAf+NQSxW7jC5hYXNM7mPItBFs/yI3F25MXBw88Q+wAof7iIyRnRcpJvgZ3I7P8vJriAwrSbFg=="; }; }; - "@aws-sdk/util-base64-browser-3.47.1" = { + "@aws-sdk/util-base64-browser-3.49.0" = { name = "_at_aws-sdk_slash_util-base64-browser"; packageName = "@aws-sdk/util-base64-browser"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.47.1.tgz"; - sha512 = "asStae2d1xvgs3czWvvVb4JWHfY2iV8yximL4MwF+Lb8XG/b8LH3tG1E5axAFVMBcljdvRB941N7w3rug7V9ig=="; + url = "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.49.0.tgz"; + sha512 = "HFXJbsJC6AfrnO9M8KuFDo4ihvLbCbCFCfpWy0Gs4t8kTcvGqH8fIpfVsQKAtFHMmb8fen2LduOk+NNSA7srYw=="; }; }; - "@aws-sdk/util-base64-node-3.47.2" = { + "@aws-sdk/util-base64-node-3.49.0" = { name = "_at_aws-sdk_slash_util-base64-node"; packageName = "@aws-sdk/util-base64-node"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.47.2.tgz"; - sha512 = "0Oml66+9/uERV1dosecA/1tEd0zdiwI3kEobCF5w2f4gJDzUdaEoztcRwtbLcFv6yVT7XoW4evMQbtlcruypcQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.49.0.tgz"; + sha512 = "xFAzOLZJOEZipG3KVLjB5z1g5PJSi6cmZOGWg2NC2/H5N0/Z+e5ObnIH8mpfO1d6kWchUuo3qJ6fTOvg/ynw7A=="; }; }; - "@aws-sdk/util-body-length-browser-3.47.1" = { + "@aws-sdk/util-body-length-browser-3.49.0" = { name = "_at_aws-sdk_slash_util-body-length-browser"; packageName = "@aws-sdk/util-body-length-browser"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.47.1.tgz"; - sha512 = "qR307MATPC+4JtN7W9sSkchfdB3O4mulLKRpk7rF6Ns6vVwhaPfJstSGe9Qa68zYZXubF9h5WnoWuJz4N0Vqdw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.49.0.tgz"; + sha512 = "4a9Bw33JGKefaZDORlosQRMKxJGEYEiDD5kgNvwIv+KRl5yj2unePia6aFWMqXTWqidOb9WVlqc0Lh73ei5pTg=="; }; }; - "@aws-sdk/util-body-length-node-3.47.1" = { + "@aws-sdk/util-body-length-node-3.49.0" = { name = "_at_aws-sdk_slash_util-body-length-node"; packageName = "@aws-sdk/util-body-length-node"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.47.1.tgz"; - sha512 = "U2K7+gi3bAQBb3WB1/trvA+4rPC2SKH9w/sRtqBwtxHNOjXjiCiF3oEYnbir7cdSfhzMH4HBYKbfkHZwTAHMfw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.49.0.tgz"; + sha512 = "ME5Sc8jo9BzToUjWskQKZM/NqN9PpwRDTOSH6EISDBUiH5bhWfY8MLkZqIN2UZz/XOiV3yOeWAU+fMYNnGdAQQ=="; }; }; - "@aws-sdk/util-buffer-from-3.47.2" = { + "@aws-sdk/util-buffer-from-3.49.0" = { name = "_at_aws-sdk_slash_util-buffer-from"; packageName = "@aws-sdk/util-buffer-from"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.47.2.tgz"; - sha512 = "oLytLGiIeJEk7FcT7bdeQNv7+vvVVPuL5hyXlCjHZwoWuDxepjoDhTaIC9Isq1UyPKfSZaVpk/1nqREe4aYDHw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.49.0.tgz"; + sha512 = "8JbIPYn91f+16QpDk000PdIBlBZu8/SoL1nF2fpAJ+M98jXpKUws3oiCztJ2FPIKRe/3ikKuZM4HxWrDyJa40Q=="; }; }; - "@aws-sdk/util-config-provider-3.47.1" = { + "@aws-sdk/util-config-provider-3.49.0" = { name = "_at_aws-sdk_slash_util-config-provider"; packageName = "@aws-sdk/util-config-provider"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.47.1.tgz"; - sha512 = "kBs+YghZaOqChxLZDTR8dw5RQxJ/qF064EjRpC+TdCegLCO2UtZ97RXBvc5mdt94OxXGjGUjDiD/eAlpjjFNXw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.49.0.tgz"; + sha512 = "oVGT9q9UIGdv9Cra4B51QNciWKYQXTlfh8oD2FgLp91NbGTIkQLvK7Pah4TbBoa5+0u/obBI07UwCVn7wphWBQ=="; }; }; - "@aws-sdk/util-create-request-3.47.2" = { + "@aws-sdk/util-create-request-3.49.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.47.2.tgz"; - sha512 = "AfYWBTfChMaYPnaMpjUOOMnJgkWna4MhhxK2NxzbIg+f6+jKXLa6gA9CC421K+SqvLs+RxVRy25brnZAKdMkkg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.49.0.tgz"; + sha512 = "iFU2NVQHXIcSknCSLVSo0YNO8H5IiFjAm9NYUeMI+c+cROfyuOhqfahEQPpTZLjMR8z64imSZlICRY6i858EXQ=="; }; }; - "@aws-sdk/util-credentials-3.47.2" = { + "@aws-sdk/util-credentials-3.49.0" = { name = "_at_aws-sdk_slash_util-credentials"; packageName = "@aws-sdk/util-credentials"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.47.2.tgz"; - sha512 = "C0L8pfZkJyWfuvLVRcM2Ff11t2mkM4lzjNBnQKdL80wuASZWCnAi50oUKBgwbHZdOsRKGV7C4zqAuTLTRaFpCQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.49.0.tgz"; + sha512 = "RzbKeuylb56m0zPuLGl5/TkN07+c4PKhZu3hikpsvN8n8n7aFHWPUus63QEGgVaUMCZD0QV6HqJfsCVVFF7UIg=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.47.2" = { + "@aws-sdk/util-defaults-mode-browser-3.49.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.47.2.tgz"; - sha512 = "ojAF5k/VFbPvJoj6/G6ekVQhbFvabUBvRhRaoQjkmj8LVEahtzcNcOxhu3FmH17mXR2oxWsGwvq6VAw6V3jLBg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.49.0.tgz"; + sha512 = "MNOvFET5TNBHgvsmfcLuxVDDUV0OIjE1lxrdbXWol7bMgLc2uL3/QOXWKCOUzcFCqTOnWCvbnwkOjs3f7Dpzmw=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.47.2" = { + "@aws-sdk/util-defaults-mode-node-3.49.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.47.2.tgz"; - sha512 = "O35bXeahlepgPxg72XDN+5cXlbs+jZec5AH+7YYI+ldEVu6WxF0MxeQtMG4Fqpb19bpPIPz0SodHM1D1I53S5w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.49.0.tgz"; + sha512 = "bd5/ZJlNIX25n83mvcCh9eYQiDdf6gLHNH6ZftA/EbFfkE0o/qHrFhBhiB9HBY9ZoHhtoqrJNv5W9qKFHx1EIA=="; }; }; - "@aws-sdk/util-format-url-3.47.2" = { + "@aws-sdk/util-format-url-3.49.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.47.2.tgz"; - sha512 = "iH1QLQb7E7YV006QSxroXlM3ZhWdcG7GLGgjGrCT32mIwJwUyXWw5rvWL9Vxc7yCABWD5s0TzUCgf4VXLUA3NA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.49.0.tgz"; + sha512 = "8033WCPOtUfue7QpqDkjFBAsMuy9+VcXtnNQQG4+NNbEjGYsAp2qomUwGstM7qDfoMA4OuCDGF0jlXIF5ghwBQ=="; }; }; - "@aws-sdk/util-hex-encoding-3.47.1" = { + "@aws-sdk/util-hex-encoding-3.49.0" = { name = "_at_aws-sdk_slash_util-hex-encoding"; packageName = "@aws-sdk/util-hex-encoding"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.47.1.tgz"; - sha512 = "9vBhp1E74s6nImK5xk7BkopQ10w6Vk8UrIinu71U7V/0PdjCEb4Jmnn++MLyim2jTT0QEGmJ6v0VjPZi9ETWaA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.49.0.tgz"; + sha512 = "ZbPu8Dd3Qm0BMP71FWUH7KPpZA/6izfkDlxbvHxtHdW7XYZALuJ0cVRpWGIY2fCSuA9X8Jfn60KMyjuSAuzM1w=="; }; }; - "@aws-sdk/util-locate-window-3.47.1" = { + "@aws-sdk/util-locate-window-3.49.0" = { name = "_at_aws-sdk_slash_util-locate-window"; packageName = "@aws-sdk/util-locate-window"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.47.1.tgz"; - sha512 = "dMcBhtyJ7ZMNS8RS4UOVbkiR0gGrBWv+p1s9NLfMNXod9zaTAlMIKl9de8Xdshguvc8//J7heQV/7+HMvFEq2g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.49.0.tgz"; + sha512 = "ryw+t+quF1raaK0nXSplMiCVnahNLNgNDijZCFFkddGTMaCy+L4VRLYyNms3bgwt3G0BmVn9f3uyDWRSkn5sSg=="; }; }; - "@aws-sdk/util-uri-escape-3.47.1" = { + "@aws-sdk/util-uri-escape-3.49.0" = { name = "_at_aws-sdk_slash_util-uri-escape"; packageName = "@aws-sdk/util-uri-escape"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.47.1.tgz"; - sha512 = "CGqm+bT07OCJSgDo48/4Fegh9tNPR3kcOMfNWZ/J6lrt+nfAnOdXx5zZB63PjKCt5zJ7LM0thOQgAeOf2WdJzQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.49.0.tgz"; + sha512 = "NH7iQUYvijYZEOzZkF/QQrp8kBOA9H0Z89hR/63FDCjr1M0Cdcs1bLaFO0a0qbW9NQtoYNsMBMk7pTveDrAzTw=="; }; }; - "@aws-sdk/util-user-agent-browser-3.47.2" = { + "@aws-sdk/util-user-agent-browser-3.49.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.47.2.tgz"; - sha512 = "dstakqLW8hXRMzR/s3uLpfYbMs/qDowG/Fp123cAuln4rUODG29VNFLkMAYRnG6RQ9hf2OtXsCfFGNSm+bnJMg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.49.0.tgz"; + sha512 = "RR4E6WlDSu9SivPjx/Jddo87PeVg6dhRL0XGdDBpew7i8bfwqCvxQydkbWIetxucLrt9zII9QnLDQUPBue1xUw=="; }; }; - "@aws-sdk/util-user-agent-node-3.47.2" = { + "@aws-sdk/util-user-agent-node-3.49.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.47.2.tgz"; - sha512 = "9wYkGvTrOFWb+9QjziQma+l9M0u1tmHiIdL9r4Btsc9WVMsy1Y9HUUeXacM3dLLIzCpQ5dDbjIlAZWA8Rm3ZOQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.49.0.tgz"; + sha512 = "ixUkF6kcDfsWO0kivyOKAnBITJm7InGa04ALbgAfuuE7RU1cVkXVMFIn5vux7QkziK7+JwozM9SNPIwNukElDw=="; }; }; - "@aws-sdk/util-utf8-browser-3.47.1" = { + "@aws-sdk/util-utf8-browser-3.49.0" = { name = "_at_aws-sdk_slash_util-utf8-browser"; packageName = "@aws-sdk/util-utf8-browser"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.47.1.tgz"; - sha512 = "PzHEdiBhfnZbHvZ+dIlIPodDbpgrpKDYslHe9A+tH8ZfuAxxmZEqnukp7QEkFr6mBcmq3H2thcPdNT45/5pA7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.49.0.tgz"; + sha512 = "u9ZgAiTWX9yZFQ/ptlnVpYJ/rXF7aE2Wagar1IjhZrnxXbpVJvcX1EeRayxI1P5AAp2y2fiEKHZzX9ugTwOcEg=="; }; }; - "@aws-sdk/util-utf8-node-3.47.2" = { + "@aws-sdk/util-utf8-node-3.49.0" = { name = "_at_aws-sdk_slash_util-utf8-node"; packageName = "@aws-sdk/util-utf8-node"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.47.2.tgz"; - sha512 = "itgWlytqhbD/pRiGxX7XY7RF8k15ScV816FUlZtOKeRpAphliFT07TGWKmiZcFxEbHpi9r8A5H1FOoPmyU635Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.49.0.tgz"; + sha512 = "QTF5b5OT2y6xsQl8sDiiXqg2n/VtgqFA+tP3WMooOSFd/ZFBbT6HoiSHXHMeTjpB/L9ZT+eUaCoBz8Jq09lBDg=="; }; }; - "@aws-sdk/util-waiter-3.47.2" = { + "@aws-sdk/util-waiter-3.49.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.47.2"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.47.2.tgz"; - sha512 = "3zzOEDPRgHJ3o17Ri0vVmCKvqh9tA2lP9WbpXTjOgEAfdI/hsP2XhqJWVrlyN+wQ6FwPbuX3Jsb7lsp1OZP2bg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.49.0.tgz"; + sha512 = "eKrKOLcIhjA/MyjIfwgLL6ZUfGYf6VxBXryuRf8CmJKAo71ZO6ipAsy1X3uYrfwQQBMKV4VZu48BJx5PUBM7GA=="; }; }; - "@aws-sdk/xml-builder-3.47.1" = { + "@aws-sdk/xml-builder-3.49.0" = { name = "_at_aws-sdk_slash_xml-builder"; packageName = "@aws-sdk/xml-builder"; - version = "3.47.1"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.47.1.tgz"; - sha512 = "SPDSKG7zw7MnGFVl3uIVNBBZo4WyNg8Wu82COfD8XaH+E/XiYiHjjoPq8eIscrQb799TXudHxy5h/C7dFACMxA=="; + url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.49.0.tgz"; + sha512 = "eU5sIZRWq8pNmw++RfpFI8396UtDW8JxYLcKfJLGQC/qDhwCo+sNPKydXFmDrXTIt/khs3K0qx/vZ5V76irc2Q=="; }; }; "@azu/format-text-1.0.1" = { @@ -1120,13 +1129,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.16.8" = { + "@babel/cli-7.17.0" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.16.8.tgz"; - sha512 = "FTKBbxyk5TclXOGmwYyqelqP5IF6hMxaeJskd85jbR5jBfYlwqgwAbJwnixi1ZBbTqKfFuAA95mdmUFeSRwyJA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.0.tgz"; + sha512 = "es10YH/ejXbg551vtnmEzIPe3MQRNOS644o3pf8vUr1tIeNzVNlP8BBvs1Eh7roh5A+k2fEHUas+ZptOWHA1fQ=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1156,22 +1165,22 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.16.8" = { + "@babel/compat-data-7.17.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"; - sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz"; + sha512 = "392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="; }; }; - "@babel/core-7.16.12" = { + "@babel/core-7.17.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.16.12"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; - sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz"; + sha512 = "x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA=="; }; }; "@babel/core-7.9.0" = { @@ -1183,13 +1192,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.16.8" = { + "@babel/generator-7.17.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"; - sha512 = "1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz"; + sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -1219,22 +1228,22 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.10" = { + "@babel/helper-create-class-features-plugin-7.17.1" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.10"; + version = "7.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; - sha512 = "wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz"; + sha512 = "JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.16.7" = { + "@babel/helper-create-regexp-features-plugin-7.17.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; - sha512 = "fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz"; + sha512 = "awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA=="; }; }; "@babel/helper-define-polyfill-provider-0.3.1" = { @@ -1408,13 +1417,13 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.16.7" = { + "@babel/helpers-7.17.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz"; - sha512 = "9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz"; + sha512 = "Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ=="; }; }; "@babel/highlight-7.16.10" = { @@ -1435,15 +1444,6 @@ let sha512 = "V2dopEtPUL4LD+e8UtMIZB6BbsmMsS/7E1ZAvWNINzBfi7Cf3X9MLCpzHVZT4HeeF1lQl72IRtqqVt2RUImwyA=="; }; }; - "@babel/parser-7.16.12" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.16.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"; - sha512 = "VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A=="; - }; - }; "@babel/parser-7.16.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -1453,6 +1453,15 @@ let sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="; }; }; + "@babel/parser-7.17.0" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz"; + sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="; + }; + }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; @@ -2074,13 +2083,13 @@ let sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; }; }; - "@babel/plugin-transform-runtime-7.16.10" = { + "@babel/plugin-transform-runtime-7.17.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.16.10"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz"; - sha512 = "9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz"; + sha512 = "fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A=="; }; }; "@babel/plugin-transform-shorthand-properties-7.16.7" = { @@ -2218,13 +2227,13 @@ let sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; }; }; - "@babel/register-7.16.9" = { + "@babel/register-7.17.0" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.16.9"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.16.9.tgz"; - sha512 = "jJ72wcghdRIlENfvALcyODhNoGE5j75cYHdC+aQMh6cU/P86tiiXTp9XYZct1UxUMo/4+BgQRyNZEGx0KWGS+g=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.17.0.tgz"; + sha512 = "UNZsMAZ7uKoGHo1HlEXfteEOYssf64n/PNLHGqOKq/bgYcu/4LrQWAHJwSCb3BRZK8Hi5gkJdRcwrGTO2wtRCg=="; }; }; "@babel/runtime-7.13.9" = { @@ -2236,13 +2245,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.16.7" = { + "@babel/runtime-7.17.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; - sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.0.tgz"; + sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; }; }; "@babel/runtime-7.9.0" = { @@ -2254,13 +2263,13 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.16.8" = { + "@babel/runtime-corejs3-7.17.0" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz"; - sha512 = "3fKhuICS1lMz0plI5ktOE/yEtBRMVxplzRkdn6mJQ197XiY0JnrzYV0+Mxozq3JZ8SBV9Ecurmw1XsGbwOf+Sg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.0.tgz"; + sha512 = "qeydncU80ravKzovVncW3EYaC1ji3GpntdPgNcJy9g7hHSY6KX+ne1cbV3ov7Zzm4F1z0+QreZPCuw1ynkmYNg=="; }; }; "@babel/template-7.16.7" = { @@ -2272,13 +2281,13 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.16.10" = { + "@babel/traverse-7.17.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.10"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"; - sha512 = "yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz"; + sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg=="; }; }; "@babel/types-7.16.0" = { @@ -2290,13 +2299,13 @@ let sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; }; }; - "@babel/types-7.16.8" = { + "@babel/types-7.17.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"; - sha512 = "smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; + sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; "@blueprintjs/colors-4.0.0-beta.3" = { @@ -2380,40 +2389,40 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@cdktf/hcl2cdk-0.8.6" = { + "@cdktf/hcl2cdk-0.9.0" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.8.6"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.8.6.tgz"; - sha512 = "+1tjR2lX+0tDDyKwGaDWe/3ehEE9cY/DczVz4yR5XtWQQFvubhBy0spxXxOe7bqUjpsFFbImCgZ6qXIg7kRceA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.0.tgz"; + sha512 = "mAF0DlFPNtkaW4sZt0JQSFOTAkk1MamX87liFN1/wc0KQS6r1/POQadU5lO9pQMgUV7BUEviLhiOl23oMazmyA=="; }; }; - "@cdktf/hcl2json-0.8.6" = { + "@cdktf/hcl2json-0.9.0" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.8.6"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.8.6.tgz"; - sha512 = "TcNGuoMwhwxhlFQ/q8Ww866Ww6qeb1+EPAXizHzC8kJXy/KOnBLtANq9N8+tt8UrgJqUYVrikrQFS2ydgTKc0w=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.0.tgz"; + sha512 = "HlpqZD5K6eMzj1qapNBuGDzZGiS1TKdW4pSwQRJv7ugY2dwKPTIb+R3jmWFidUX6N9dG7eWDIyT89spdbpM0Ow=="; }; }; - "@cdktf/provider-generator-0.8.6" = { + "@cdktf/provider-generator-0.9.0" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.8.6"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.8.6.tgz"; - sha512 = "WHrmBeGjts1t8q2EbQ+hb9A7l2qK9nSeiOH5XxcPeVUFnZzkXPVah7Lb0E+2AhbMXXNjWF5WhoYS/8S6sl+kGQ=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.0.tgz"; + sha512 = "Od+G+I6m8GqUX24wwtF+n8btcZEFX2eg3fZnQwbE3Kdbdjlk1pGTIPg/WWiGoXdxNDFC6ZpytDzdARJL2dtizQ=="; }; }; - "@chemzqm/neovim-5.6.4" = { + "@chemzqm/neovim-5.6.10" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.6.4"; + version = "5.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.6.4.tgz"; - sha512 = "PWGv4LizLhbaB3ygOOBfQIcqHPIPzp45DgkKo0fqbBUyQXty6PJ7VN5XoVY5kaqwhxwIqeaLD9iqW1jUoMQWeg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.6.10.tgz"; + sha512 = "4L96dYczb9eRLroilXmhLVoXswUlTCi8cKj1aG5cAR0Q0YW2AxAuy1qdR0VzixCcutRgrRIXzi0U6t72itT4Ag=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -2569,13 +2578,13 @@ let sha512 = "+0FvYOAS39bJ4aKjnYn/7FD4DfWkmQ6G/06I4F0Gvu4KS5twirEg8mIcLhmeRDOOKn4Tp8PwpLwBiSA6npEMQA=="; }; }; - "@corestore/networker-1.2.0" = { + "@corestore/networker-1.2.1" = { name = "_at_corestore_slash_networker"; packageName = "@corestore/networker"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.2.0.tgz"; - sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA=="; + url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.2.1.tgz"; + sha512 = "5wNXodStZRIRYu5u5kXWtI4XIIEPhRrqSRza+A41mN/K6PA7i9aHdU08qIV+4DW4CDWOlwiQz1YUMeU1QlSBQA=="; }; }; "@cronvel/get-pixels-3.4.0" = { @@ -2587,22 +2596,31 @@ let sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw=="; }; }; - "@cspell/cspell-bundled-dicts-5.16.0" = { + "@cspell/cspell-bundled-dicts-5.18.4" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.16.0.tgz"; - sha512 = "7O8Y6FMzTn5pnHUDjnQJ3cgIAHT5jfN05NKGu9FFikmsXsMmDRikr/OeuhK5tDOWLRIxZwmFrVMMGgBe6mj26Q=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.18.4.tgz"; + sha512 = "bzYmnfdKI0qQ0Sng8QtGNJrlyTtHII6FriTSp2lWxJX9paw2cUmKjEyajH9sK/EX78AePJemPGsMSiC65kTLWg=="; }; }; - "@cspell/cspell-types-5.16.0" = { + "@cspell/cspell-pipe-5.18.4" = { + name = "_at_cspell_slash_cspell-pipe"; + packageName = "@cspell/cspell-pipe"; + version = "5.18.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-5.18.4.tgz"; + sha512 = "Wo68JtNwzhkgDhQMwI4mw6+0HNPgWdE/uUiak87IUdPXB+1LSe7TKdhHZBhVe5iT5PIOsJiz36v4dTOpWJjmSg=="; + }; + }; + "@cspell/cspell-types-5.18.4" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.16.0.tgz"; - sha512 = "pKBeOrUyZtp4DVNbikkpeAT/gob7gT2zun4v3jYdQEbDKYMRN7wTKlqfHJ4VxbF/yS45g7jizEc245xMUkxPHQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.18.4.tgz"; + sha512 = "pUxWfhqqwo0k0BsfIr8Mki9c7W7/o//RXsI+RZhbk7ai9EWX/6cMpD8rHRcRB9c+ihwGj7R7jzjuzh+SK09tlA=="; }; }; "@cspell/dict-ada-1.1.2" = { @@ -2623,13 +2641,13 @@ let sha512 = "K21CfB4ZpKYwwDQiPfic2zJA/uxkbsd4IQGejEvDAhE3z8wBs6g6BwwqdVO767M9NgZqc021yAVpr79N5pWe3w=="; }; }; - "@cspell/dict-bash-1.0.17" = { + "@cspell/dict-bash-1.0.18" = { name = "_at_cspell_slash_dict-bash"; packageName = "@cspell/dict-bash"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-1.0.17.tgz"; - sha512 = "BlX+pnDlLmIf776C9d71QjXl4NOIz+yloeixx1ZZjrwvKPLF+ffE/Ez13eV+D9R2Ps1rW10UvW8u3Hbmwme+Fw=="; + url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-1.0.18.tgz"; + sha512 = "kJIqQ+FD2TCSgaaP5XLEDgy222+pVWTc+VhveNO++gnTWU3BCVjkD5LjfW7g/CmGONnz+nwXDueWspProaSdJw=="; }; }; "@cspell/dict-companies-2.0.2" = { @@ -2668,13 +2686,13 @@ let sha512 = "ZzAr+WRP2FUtXHZtfhe8f3j9vPjH+5i44Hcr5JqbWxmqciGoTbWBPQXwu9y+J4mbdC69HSWRrVGkNJ8rQk8pSw=="; }; }; - "@cspell/dict-css-1.0.12" = { + "@cspell/dict-css-1.0.13" = { name = "_at_cspell_slash_dict-css"; packageName = "@cspell/dict-css"; - version = "1.0.12"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-1.0.12.tgz"; - sha512 = "K6yuxej7n454O7dwKG6lHacHrAOMZ0PhMEbmV6qH2JH0U4TtWXfBASYugHvXZCDDx1UObpiJP+3tQJiBqfGpHA=="; + url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-1.0.13.tgz"; + sha512 = "HU8RbFRoGanFH85mT01Ot/Ay48ixr/gG25VPLtdq56QTrmPsw79gxYm/5Qay16eQbpoPIxaj5CAWNam+DX4GbA=="; }; }; "@cspell/dict-django-1.0.26" = { @@ -2713,13 +2731,13 @@ let sha512 = "tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g=="; }; }; - "@cspell/dict-en_us-2.1.4" = { + "@cspell/dict-en_us-2.1.5" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.1.4.tgz"; - sha512 = "W4b+aIvZ637FqtTmrTe/T9i9748cuTQf82eWUgV9O296WzZj7rCxm+rzOrmRTAcCmU+9+6Cdsr0unETFQfuxww=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.1.5.tgz"; + sha512 = "Q+LgFjrQw4gJnP+aHbVW5/TZlx9ccOCcjBsZYpTEXT/VW04NUX7+EN8bOri+wTEppSQVfl6NQ3bVkzPIjGXLzA=="; }; }; "@cspell/dict-filetypes-2.0.1" = { @@ -2875,6 +2893,15 @@ let sha512 = "WkyGYtNmUsOHsWixck7AxNvveDgVPqw0H51hzIY+/5u3c94wZUweIj0vfFOGIfOBq8e1ZxpjumKBxVDGXTmQkw=="; }; }; + "@cspell/dict-r-1.0.1" = { + name = "_at_cspell_slash_dict-r"; + packageName = "@cspell/dict-r"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-1.0.1.tgz"; + sha512 = "Lrtu6ULfA16tZ2nfq1AkH3uO8IbTbAqxSt/Konif698yB7QM5keEInhCRzT/E2nYrIKumayNwqVUZxabIWkoSQ=="; + }; + }; "@cspell/dict-ruby-1.0.15" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; @@ -2902,13 +2929,13 @@ let sha512 = "5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA=="; }; }; - "@cspell/dict-software-terms-2.0.12" = { + "@cspell/dict-software-terms-2.0.14" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "2.0.12"; + version = "2.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.0.12.tgz"; - sha512 = "zsgraHo5PIDY1mTaWGA2NsxhO8g85inD758pEQL1MeKTFlGiFHT4vW+faryzhvBT5LOMH4LnTs0yGrMyn7JlkQ=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.0.14.tgz"; + sha512 = "0tuMmBSsOfL5HH6un8gt/lF9Rvs/jXMEQyjjmd04IznVL7X5kxVhkrS8sbudq2orPgM5HIa8odPYdFuTCKDvNw=="; }; }; "@cspell/dict-swift-1.0.1" = { @@ -2920,13 +2947,13 @@ let sha512 = "M4onLt10Ptld8Q1BwBit8BBYVZ0d2ZEiBTW1AXekIVPQkPKkwa/RkGlR0GESWNTC2Zbmt/qge7trksVdaYVWFQ=="; }; }; - "@cspell/dict-typescript-1.0.19" = { + "@cspell/dict-typescript-1.0.20" = { name = "_at_cspell_slash_dict-typescript"; packageName = "@cspell/dict-typescript"; - version = "1.0.19"; + version = "1.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-1.0.19.tgz"; - sha512 = "qmJApzoVskDeJnLZzZMaafEDGbEg5Elt4c3Mpg49SWzIHm1N4VXCp5CcFfHsOinJ30dGrs3ARAJGJZIw56kK6A=="; + url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-1.0.20.tgz"; + sha512 = "yIuGeeZtQA2gqpGefGjZqBl8iGJpIYWz0QzDqsscNi2qfSnLsbjM0RkRbTehM8y9gGGe7xfgUP5adxceJa5Krg=="; }; }; "@cspell/dict-vue-2.0.1" = { @@ -3577,13 +3604,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.181.0" = { + "@fluentui/react-7.181.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.181.0"; + version = "7.181.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.181.0.tgz"; - sha512 = "GZHYe0rCcWubW6OslY2JOMlM7Hotn3ZdzWJHO/64MHqi1cbCUJppMaA/8IfFF7P5eFr8ojvpVSy9D7CQPDVq3A=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.181.1.tgz"; + sha512 = "d5Z4OKHUhGuEMIPxUP4lMZusv0mkRwlqbRcmOCULayjSe1OY0EybiB7R54MlVo7KJH9DMk0g7sGGJHbrmINlyg=="; }; }; "@fluentui/react-focus-7.18.1" = { @@ -3622,31 +3649,31 @@ let sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; }; }; - "@gitbeaker/core-35.1.0" = { + "@gitbeaker/core-35.3.0" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "35.1.0"; + version = "35.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.1.0.tgz"; - sha512 = "DM9w3wgrS8GoXMLJb0DL2VSxTvP3yoaGDfX2d8n3wMGSjZbCknh3YnbVG/OfnaPbh9PH71kGll3SY5rJgz7XJg=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.3.0.tgz"; + sha512 = "6o0IwAYtnBxNOR6P5LFrZLIfqxZBY3bBeSJ507byDzv01del0rTn8pV8UqI7Eqy4Y2LyDntBG9qD3qI/VgyAsg=="; }; }; - "@gitbeaker/node-35.1.0" = { + "@gitbeaker/node-35.3.0" = { name = "_at_gitbeaker_slash_node"; packageName = "@gitbeaker/node"; - version = "35.1.0"; + version = "35.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.1.0.tgz"; - sha512 = "t0lXqSuY93jVffo6WMeo4tvZtkMQXPKuGb1qNh3HOuW4+KyEqmrdQnorGyyRYH7uRTmQeHEe33BL1Ttc5F5YrA=="; + url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.3.0.tgz"; + sha512 = "72ty8QwLmJqd/bPAvI209lnp4WEQ6HnPDk39PGptIAHKgk0NzLhLkggR3ZPH1UDfvEcZSiE0ZiKcJCK/mYVCrQ=="; }; }; - "@gitbeaker/requester-utils-35.1.0" = { + "@gitbeaker/requester-utils-35.3.0" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "35.1.0"; + version = "35.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.1.0.tgz"; - sha512 = "00aQYCxs3wBHrD5HGWh0l1FRsX1NYJ1GEq4Reyo1NpVgjwzO/T1jjMFy3jikjJ+UGeg0sfqV9h91mwtCQ4SmRA=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.3.0.tgz"; + sha512 = "VgTmiyXbh65eiTMvbKYfBof/T1eo6hldNc/2sId3ziFtUoE03s/oQznRoYXTbBAadLxH12mx9GI3Tl6jNKNhjQ=="; }; }; "@google-cloud/paginator-3.0.6" = { @@ -3685,22 +3712,22 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-2.18.4" = { + "@google-cloud/pubsub-2.18.5" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.18.4"; + version = "2.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.18.4.tgz"; - sha512 = "mgKZ7XdXN7MEGK+MCmRKuoq3GBiuYIa9ytYuV1DIHbd+eYqqyPYZHvL8g/73eogkNYK5TxSydja7TCRDzfJaxA=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.18.5.tgz"; + sha512 = "5AQHB8ul3vtVPLYFJ6EuWVdd6gO44su+y0ZXTDnRlEK2goIJrho7JugGgj+6aBhDeIQyJUdIFaZsfQxnlyHNPQ=="; }; }; - "@grammyjs/types-2.5.1" = { + "@grammyjs/types-2.6.0" = { name = "_at_grammyjs_slash_types"; packageName = "@grammyjs/types"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.5.1.tgz"; - sha512 = "ZJ+X+w5qo6YxCRDWt63+SD2iX+xitP3Z7ieLUWw1b7OanljAMjPRry2PvBRoA1Zg0nFqulxFtiAHxxN1v8BXiQ=="; + url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.6.0.tgz"; + sha512 = "eWckBf25l6xwSS2YO6Ioyf2BDEO7tyNZhgRLl5PzsdvqlHQR+XYTdKwhevsqLG4Y+zmF6hEXnuNTYu+HF8W8Sg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -3829,13 +3856,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.1" = { + "@graphql-tools/merge-8.2.2" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.1.tgz"; - sha512 = "Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.2.tgz"; + sha512 = "2DyqhIOMUMKbCPqo8p6xSdll2OBcBxGdOrxlJJlFQvinsSaYqp/ct3dhAxNtzaIcvSVgXvttQqfD7O2ziFtE7Q=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -3865,13 +3892,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.7.0" = { + "@graphql-tools/url-loader-7.7.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.7.0"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.0.tgz"; - sha512 = "mBBb+aJqI4E0MVEzyfi76Pi/G6lGxGTVt/tP1YtKJly7UnonNoWOtDusdL3zIVAGhGgLsNrLbGhLDbwSd6TV6A=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.1.tgz"; + sha512 = "K/5amdeHtKYI976HVd/AXdSNvLL7vx5QVjMlwN0OHeYyxSgC+UOH+KkS7cshYgL13SekGu0Mxbg9ABfgQ34ECA=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -3937,33 +3964,6 @@ let sha512 = "a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA=="; }; }; - "@grpc/grpc-js-1.4.5" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.5.tgz"; - sha512 = "A6cOzSu7dqXZ7rzvh/9JZf+Jg/MOpLEMP0IdT8pT8hrWJZ6TB4ydN/MRuqOtAugInJe/VQ9F8BPricUpYZSaZA=="; - }; - }; - "@grpc/grpc-js-1.4.6" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.6.tgz"; - sha512 = "Byau4xiXfIixb1PnW30V/P9mkrZ05lknyNqiK+cVY9J5hj3gecxd/anwaUbAM8j834zg1x78NvAbwGnMfWEu7A=="; - }; - }; - "@grpc/grpc-js-1.5.0" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.0.tgz"; - sha512 = "PDLazk94MFV5hFn/+aSrVj3d5UsOK9HU1xa0ywachvDh1jymBU/Cb+4nGa2NjpfcBoXlHioBC/qIB/XzELednw=="; - }; - }; "@grpc/grpc-js-1.5.1" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -3982,6 +3982,15 @@ let sha512 = "q0xgaZ3ymUM+ZOhe1hdocVSdKHCnJ6llLSXcP+MqMXMyYPUZ3mzQOCxZ3Zkg+QZ7sZ950sn7hvueQrIJZumPZg=="; }; }; + "@grpc/grpc-js-1.5.4" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.4.tgz"; + sha512 = "+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw=="; + }; + }; "@grpc/proto-loader-0.6.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -3991,15 +4000,6 @@ let sha512 = "cdMaPZ8AiFz6ua6PUbP+LKbhwJbFXnrQ/mlnKGUyzDUZ3wp7vPLksnmLCBX6SHgSmjX7CbNVNLFYD5GmmjO4GQ=="; }; }; - "@grpc/proto-loader-0.6.7" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.7.tgz"; - sha512 = "QzTPIyJxU0u+r2qGe8VMl3j/W2ryhEvBv7hc42OjYfthSj370fUrb7na65rG6w3YLZS/fb8p89iTBobfWGDgdw=="; - }; - }; "@grpc/proto-loader-0.6.9" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4108,13 +4108,13 @@ let sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw=="; }; }; - "@hpcc-js/wasm-1.4.1" = { + "@hpcc-js/wasm-1.12.8" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "1.4.1"; + version = "1.12.8"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.4.1.tgz"; - sha512 = "WYeIuG/B1B1cTcM9D9bC6qDFSZnEcJ9R3SpTW5jh10sTh0hD1h1t/dZudfLwarJD+ce8q4/BP43BplbP3CeNkQ=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.12.8.tgz"; + sha512 = "n4q9ARKco2hpCLsuVaW6Az3cDVaua7B3DSONHkc49WtEzgY/btvcDG5Zr1P6PZDv0sQ7oPnAi9Y+W2DI++MgcQ=="; }; }; "@humanwhocodes/config-array-0.5.0" = { @@ -4135,13 +4135,13 @@ let sha512 = "JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A=="; }; }; - "@humanwhocodes/config-array-0.9.2" = { + "@humanwhocodes/config-array-0.9.3" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz"; - sha512 = "UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz"; + sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; }; }; "@humanwhocodes/object-schema-1.2.1" = { @@ -4477,6 +4477,33 @@ let sha512 = "CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg=="; }; }; + "@jridgewell/resolve-uri-3.0.4" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz"; + sha512 = "cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.10" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz"; + sha512 = "Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg=="; + }; + }; + "@jridgewell/trace-mapping-0.3.2" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz"; + sha512 = "9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q=="; + }; + }; "@jsdevtools/ono-7.1.3" = { name = "_at_jsdevtools_slash_ono"; packageName = "@jsdevtools/ono"; @@ -5251,130 +5278,130 @@ let sha512 = "rmQPBLe3/DuJy0Bcr1KNuSiIcgV67R2AeLxagKMQTI0R8F9lLC894wJRYhA5ytV0CIi7dzxILqdFeuVbqrkoCA=="; }; }; - "@medable/mdctl-api-1.0.62" = { + "@medable/mdctl-api-1.0.63" = { name = "_at_medable_slash_mdctl-api"; packageName = "@medable/mdctl-api"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.62.tgz"; - sha512 = "kXyaE+UH34LIR0AiO4nve/byQGARc9N/Q9Opf9wsbHgChHBUvv67/2i04eQs5N2CauLBVfI6H8UoXqzLUm7qAA=="; + url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.63.tgz"; + sha512 = "B4AgY+HGy7nJpGCY1+88F74NeXEJbmKGud5sgWaBOXHnOweNHvqWb0c2Fkn5A2LxiYPXpDvmGmiypCHubqJlQg=="; }; }; - "@medable/mdctl-core-1.0.62" = { + "@medable/mdctl-core-1.0.63" = { name = "_at_medable_slash_mdctl-core"; packageName = "@medable/mdctl-core"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.62.tgz"; - sha512 = "1lRrAZw7gfaQF9iAlV5MgnOVzujetX7K5n/11wzCaIEZct9vBTSVNtI/zHNjWgyoud0LMC6w8qtRcjbgSgjcfQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.63.tgz"; + sha512 = "XDZS5TN6d7BuHmIFi83P8MPg1zioiOzPFkq/S27DZ0Oa7Z9tW+w29IG0ltYZ6/uFuo8Z0VPiu9MdwM2vmzIPKQ=="; }; }; - "@medable/mdctl-core-schemas-1.0.62" = { + "@medable/mdctl-core-schemas-1.0.63" = { name = "_at_medable_slash_mdctl-core-schemas"; packageName = "@medable/mdctl-core-schemas"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.62.tgz"; - sha512 = "nyq59XISru4gnueEk5mpU77TxuR9hsqtzpSo/I2IhA/ZbIjDoBatm+/HK3ttX9UA+rkueK1bngRLEanZFHjUeg=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.63.tgz"; + sha512 = "eoYyS0m4ZFE+q3QpkoHbl+HDxhDxx/xN0i6VeWhQsSMCeTeLffrXBWYIdZvi39QKLCL171m9uWr83yNKkvEp1w=="; }; }; - "@medable/mdctl-core-utils-1.0.60" = { + "@medable/mdctl-core-utils-1.0.63" = { name = "_at_medable_slash_mdctl-core-utils"; packageName = "@medable/mdctl-core-utils"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.60.tgz"; - sha512 = "1l53ieD4cukz/P4Y3COsWov4mVK/+StI0lcdMUJ50jKalpFZP6kOPBMD1HzqQ1zak59ebIACKWneAH19HGET2w=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.63.tgz"; + sha512 = "9Xx4Fku47H00F9K5cCbHE3ugz3PWyUxXBRp86ee1n3QVTvhoE2PdCHYH2RES24385uH+/BrYfclMtZ4pCfXVwg=="; }; }; - "@medable/mdctl-credentials-provider-keychain-1.0.62" = { + "@medable/mdctl-credentials-provider-keychain-1.0.63" = { name = "_at_medable_slash_mdctl-credentials-provider-keychain"; packageName = "@medable/mdctl-credentials-provider-keychain"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.62.tgz"; - sha512 = "pUG/9Ar7H2BGxoZl0SP2Z5y3WXFb600E7/YMY68SLYwR1Tp5a7whf4ttclAZyB73ukJ8cs7HcpAvg52Btd1vmg=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.63.tgz"; + sha512 = "Vr+VpZ9XrPdsg5+qW6YNikED+RUn/v8/RMvbZ78hsEFEjEHRYT0He7f/nbJVkrS7+zYX7cdmzlZnKPV5z5HiQQ=="; }; }; - "@medable/mdctl-credentials-provider-pouchdb-1.0.62" = { + "@medable/mdctl-credentials-provider-pouchdb-1.0.63" = { name = "_at_medable_slash_mdctl-credentials-provider-pouchdb"; packageName = "@medable/mdctl-credentials-provider-pouchdb"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.62.tgz"; - sha512 = "yed0zon0Smo80UmfkhVezcsehgM6w3XMmLtkyxRVUK0xQOVXfJQZloWZtG75Be2VA0RITbdHKstzE2raGdx1tw=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.63.tgz"; + sha512 = "FNIq2RxBd9NJPz4oBCs17sd3Zg2g0Y7zjAqu3G3I9LyEjbeJZLGwr7lu6NqmtG/F3e/TH2d6ecMK0zKPlpAJQg=="; }; }; - "@medable/mdctl-docs-1.0.60" = { + "@medable/mdctl-docs-1.0.63" = { name = "_at_medable_slash_mdctl-docs"; packageName = "@medable/mdctl-docs"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.60.tgz"; - sha512 = "9ytd1YTnsLd/hu9mGKYgsPGrTnR+5GzdbRNKFDnfBPwUsMwB1CCGE3nhb1hdjQAje9ggA4/1otnIrO/4mw8IWg=="; + url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.63.tgz"; + sha512 = "1DUsJFnpJNkwTZ65vx5rd+hzkuM3sfSJ3nxYfwcyOWw1bErloObXSEMw2iPIyt3ryYg3i9Jtt+d3AUuDpcT4PQ=="; }; }; - "@medable/mdctl-export-adapter-console-1.0.60" = { + "@medable/mdctl-export-adapter-console-1.0.63" = { name = "_at_medable_slash_mdctl-export-adapter-console"; packageName = "@medable/mdctl-export-adapter-console"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.60.tgz"; - sha512 = "k9KZqkV3d/2/8uYnt9/jMdF9jCNb1w/R6q2LPDZ0hNrt7UpvKKSF5RegRysW21p/xT6bvdjJhTphxXzO0qurVw=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.63.tgz"; + sha512 = "hPGbVYsWH/BVA9Q8cWuTMAeWtGvBg5TDE3pYWdVzaRMUqNt1af7weaieYX56h7jlOhkl4AtkKcW6S5AK0Q8w+w=="; }; }; - "@medable/mdctl-export-adapter-tree-1.0.62" = { + "@medable/mdctl-export-adapter-tree-1.0.63" = { name = "_at_medable_slash_mdctl-export-adapter-tree"; packageName = "@medable/mdctl-export-adapter-tree"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.62.tgz"; - sha512 = "2LlmAm3kaqL2DUy1ZUzEV7hwR1vDNKQc0ySlvmRY1WR3aFsEEfJJA6hJEfjhzsE03A1jZZpW6m7KUIbosqLYWQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.63.tgz"; + sha512 = "RfmHQUosT3qXnL0jFM2KPkc+JeHv7Ur9Qf16ffOAJCqopbJ+4ZAfUn/3IOUnlYZbeifWy3xU6gptSCqHITJokQ=="; }; }; - "@medable/mdctl-import-adapter-1.0.62" = { + "@medable/mdctl-import-adapter-1.0.63" = { name = "_at_medable_slash_mdctl-import-adapter"; packageName = "@medable/mdctl-import-adapter"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.62.tgz"; - sha512 = "mjf0sx9dzZVpKCotYBZyWZopeOdyu2VnwQmIVI8oxwdVRIEN5LR0ohThs9Ca/aQT4rwlL2uvAPde5dXB3kRzuQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.63.tgz"; + sha512 = "l3xxVPyMvruvbi5JL75TqcFnh1wa+enFnJT9lk6tESy858w57PQes3cqhWdMZHJlDDBvpKhus/UiIERSEfwRDA=="; }; }; - "@medable/mdctl-manifest-1.0.62" = { + "@medable/mdctl-manifest-1.0.63" = { name = "_at_medable_slash_mdctl-manifest"; packageName = "@medable/mdctl-manifest"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.62.tgz"; - sha512 = "PDmfThH3tb3XQo2ot5UJR2hHtFODcQb7PAFNWbx7kfu7Vjg6g8XHYOsWGwSzFzKn+78V6+ksC8kBBcBQJus+1g=="; + url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.63.tgz"; + sha512 = "lNepdPyMUTMNL87QrVoHklUOK8d0Nrv72y19gdO52yAM7IZPXG/UORlfip0JYFkFu/KSedrIVodjp6prm7+sgA=="; }; }; - "@medable/mdctl-node-utils-1.0.62" = { + "@medable/mdctl-node-utils-1.0.63" = { name = "_at_medable_slash_mdctl-node-utils"; packageName = "@medable/mdctl-node-utils"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.62.tgz"; - sha512 = "FtJId1P5hmZED6xv2SjMFb+wMswW2/7gjp4bRe21DmoCkcf4ryYUVUBzXRtfZmeMYh9zo71zRi485PHLpDylGw=="; + url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.63.tgz"; + sha512 = "wbC+fKBmdf0Zk1pB3x0T+4Z1fk3anSE3kcp8VznOZfpGD5UgYUzbhZzH8oPhT/3X1jx17XUS7XTURjqj6vTQew=="; }; }; - "@medable/mdctl-sandbox-1.0.62" = { + "@medable/mdctl-sandbox-1.0.63" = { name = "_at_medable_slash_mdctl-sandbox"; packageName = "@medable/mdctl-sandbox"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.62.tgz"; - sha512 = "xuRma0dvrtP0Su8BdWrZtdNVLeDAUIpwJ75mNAqNLK4vjxC6BJgFVHyD8pTgaDn/KYQoOZBLaY7LiMYXh8BSJw=="; + url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.63.tgz"; + sha512 = "GENimL772K2Udv4id+QqL6E66Oko4e2UOeN93tYiUrU92w3S3wvEu/UyXXKjS/rzgs2naBmo6T3K7gdu8HqF4Q=="; }; }; - "@medable/mdctl-secrets-1.0.60" = { + "@medable/mdctl-secrets-1.0.63" = { name = "_at_medable_slash_mdctl-secrets"; packageName = "@medable/mdctl-secrets"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.60.tgz"; - sha512 = "WgNIC0g3bGsy5u3a2tqdv+7RbsfmFr76vSlnkbsr/ZR4lzcXJes3qM37pvSqEZD+WN6HOPFRWTHQ0vO8biKqTw=="; + url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.63.tgz"; + sha512 = "ThRx3aSyKSEBYjsZcGnGPjrUhIesKnT41Os3Oa6OrgnEtym2wORyt1SSKCDhvJ2dte6tdqyfoFbmHOLOAbHylg=="; }; }; "@medv/blessed-2.0.1" = { @@ -5395,13 +5422,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.244" = { + "@microsoft/load-themed-styles-1.10.245" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.244"; + version = "1.10.245"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.244.tgz"; - sha512 = "GjLRFH6tz77FvvgN+cjsJEX3muD/PYXJDu2Vcp+XwTOXqyGmg9HzHyunECuXZnk5zlInjI1ABcuMsQgds/yS1w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.245.tgz"; + sha512 = "UkWgXCGHxMkkjuenoPP29uMxGXBnNxTetc/dH2fpAMum1mF90zESm86VwrCZ8i6zAzZJNUwSVAnNJQ1uqpnXZA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -5476,58 +5503,58 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@node-red/editor-api-2.1.6" = { + "@node-red/editor-api-2.2.0" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.1.6.tgz"; - sha512 = "rUxGWvanZg5c96i4uIJtSCIEH0nHBG5NK5Pl5rKKvo7pXp/O6TtX9k7y9JTNbFyVMihgToKvwI1vt60KEGkBTA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.2.0.tgz"; + sha512 = "H7ddb1V2U0J8G3OlL0XJscPV9YTWsde5tLq5Rw/VygijjlYBjIpYX0QEnE91XJsbYtMVNXFM6n4KgS0EW8hmcQ=="; }; }; - "@node-red/editor-client-2.1.6" = { + "@node-red/editor-client-2.2.0" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.1.6.tgz"; - sha512 = "3HuULOqnreIYiccKqfR9Mk9Hy8JhTBZReQ9X432sfc0b8Jr4m9Qz40iTdJNY/XVQcWxHBZ0ikEH7J6RM77MG3w=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.2.0.tgz"; + sha512 = "GRiPyXtjNAx9ARFDqovDvjCuMMxZ21xlJ6XDSrT27LIlIrmUVOKZePEb9/iPxste5wPtGzyqpYS/MKMNaXiG+Q=="; }; }; - "@node-red/nodes-2.1.6" = { + "@node-red/nodes-2.2.0" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.1.6.tgz"; - sha512 = "qMWnfZPDMu7S4zfo5t1zHDrzqWFTDV0aXT1iyXDyF6PQ7OgZ4kP2At3dVA7h9lJUBwtZ3bhwzYbqORW8Onq0bA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.2.0.tgz"; + sha512 = "lnuGQj/6Bi+aUx2RW4r+n3v9AqDaWk2YmsPQiS0qMJIvzwSQtVOaoRyAxyu1bMwDv3wel9KR174f2BZ2PDxW5g=="; }; }; - "@node-red/registry-2.1.6" = { + "@node-red/registry-2.2.0" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.1.6.tgz"; - sha512 = "QQqhioy0rw7clY2wSwk0mmEMvGG7HOTNa4blnxMrE4JD+ZkcviwbMU4uQLv4J+pLTnFAd1i5xM1JwTH8gTJsyg=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.2.0.tgz"; + sha512 = "aZO1Asqm/D1gvujCLxGUabXyLKCOyxHNd9PafAErHdTH3+LKRvdhbifGVxcWFLPr5qOoN8yTHJg/Y2YMNEKuAQ=="; }; }; - "@node-red/runtime-2.1.6" = { + "@node-red/runtime-2.2.0" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.1.6.tgz"; - sha512 = "U+Hv+GwxxiOPgUdI3GPfzo/4Frm+szhCjlY/5FKU8WlD4tXU68+jNkm+LV/XFTj5VfKZABuz6t82ntRdwtqPpw=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.2.0.tgz"; + sha512 = "ejGVWPe7L4rUXe8hiA0mX6K0hzxPBdDYalF084U+CX8RGktC2h/tLP4ERrLFx2Qg7TeGkBWZuS3eSyD0E5Lo/g=="; }; }; - "@node-red/util-2.1.6" = { + "@node-red/util-2.2.0" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.1.6.tgz"; - sha512 = "ahlKYqJU9S0APpbiH6aRI+IpDE69N0I3P+moY1tz4Qcx3ymvwuXLCE40UlTX71Nae6+pqato51m85QL1DihhjA=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.2.0.tgz"; + sha512 = "jKKi9+G7o5uLO3+QtK7V0caGl8kGlei6lHD2efTIUJUvZJ7Www6YJFtAzkswsVQ9kVGR6s/I/ToxBxNQyKH+BA=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -5566,13 +5593,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-4.2.1" = { + "@npmcli/arborist-4.3.0" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.2.1.tgz"; - sha512 = "vAIfPwW6alsyjfv7wzGPMJv6Dun8xs9VugdqfwkWEyRajzOLjeifxeDqlJYQ8G8FTU38grIWjkoUmd9cAnJnPg=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.3.0.tgz"; + sha512 = "d1aDSql/JrCRRc3g6R6bXk94Gx9ggf25qaMTEc6KCEdIghr2oL+zkr/hQMWcSuBPPynx4yNA9EcZ3uFosvMp+Q=="; }; }; "@npmcli/ci-detect-1.4.0" = { @@ -5728,6 +5755,15 @@ let sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; + "@oclif/config-1.18.3" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; + sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + }; + }; "@oclif/errors-1.3.4" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -5980,22 +6016,22 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-1.0.4" = { + "@opentelemetry/api-1.1.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.4.tgz"; - sha512 = "BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz"; + sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; }; }; - "@opentelemetry/semantic-conventions-0.24.0" = { + "@opentelemetry/semantic-conventions-1.0.1" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.24.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz"; - sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.0.1.tgz"; + sha512 = "7XU1sfQ8uCVcXLxtAHA8r3qaLJ2oq7sKtEwzZhzuEXqYmjW+n+J4yM3kNo0HQo3Xp1eUe47UM6Wy6yuAvIyllg=="; }; }; "@ot-builder/bin-composite-types-1.3.3" = { @@ -6403,31 +6439,31 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; - "@primer/octicons-14.1.0" = { + "@primer/octicons-16.3.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "14.1.0"; + version = "16.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-14.1.0.tgz"; - sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-16.3.0.tgz"; + sha512 = "kOVIGDkd7s2hx0E4FHyJblzGSTiOX+a//eu9CPSM0hYr26Sr+m0bIiTYHNPVLDh9apF9WdK8ub/eqgrE8U4iEA=="; }; }; - "@prisma/engines-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" = { + "@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f"; + version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f.tgz"; - sha512 = "bHYubuItSN/DGYo36aDu7xJiJmK52JOSHs4MK+KbceAtwS20BCWadRgtpQ3iZ2EXfN/B1T0iCXlNraaNwnpU2w=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; + sha512 = "qM+uJbkelB21bnK44gYE049YTHIjHysOuj0mj5U2gDGyNLfmiazlggzFPCgEjgme4U5YB2tYs6Z5Hq08Kl8pjA=="; }; }; - "@prisma/prisma-fmt-wasm-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" = { + "@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f"; + version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f.tgz"; - sha512 = "r3eqcIkyLMLGXMAO5anxDUlDjkJQLJ9WfVyBzaPDQICNw+506MWx3J3jllGSPEqifch17NLNEckfb9ox5gn7tA=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; + sha512 = "D+1BlYjBpj3mUGrB/druJ1St43jmldcTqSZ1RIOOnB15r+ZtteMJk0PrhVGEVPHCK2Qmbz2PG0/gNooTJHwSAQ=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -6520,13 +6556,31 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.23.2" = { + "@purest/config-1.0.1" = { + name = "_at_purest_slash_config"; + packageName = "@purest/config"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@purest/config/-/config-1.0.1.tgz"; + sha512 = "cEG7U0X26a25SVrHsja5TohAfnkd0jjkjNu0bPX6cQdrSe16j/WeOuX1+TXbkDuZcirIDv7gjHSMe5vfCnW2og=="; + }; + }; + "@purest/providers-1.0.1" = { + name = "_at_purest_slash_providers"; + packageName = "@purest/providers"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@purest/providers/-/providers-1.0.1.tgz"; + sha512 = "1ekKViRit0jo1IzDLSRSziU/OpX9ckoj8uWvSWzHLASyTqhKZL9Pdq628guq7yT3qFcJeeaeaA5T97a4w7fpqA=="; + }; + }; + "@putdotio/api-client-8.25.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.23.2"; + version = "8.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.23.2.tgz"; - sha512 = "G5arIdtmFmg0J05dcoHxfNP4dEF/SU7SZmQEvbhXt1WCNkV+D/zSGM4C9YkPU2b9UWZxgYyYbz644dmW4KDG9A=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.25.0.tgz"; + sha512 = "Y/IaNwE83oUYklZRMDWKKcOm1rzr8L2rqUie0eK3XTVldpfiRgT8DCkN8tEb/rKieVJFdlQ9dEo59F7u3d9IqQ=="; }; }; "@reach/router-1.3.4" = { @@ -6583,13 +6637,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.79" = { + "@redocly/openapi-core-1.0.0-beta.80" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.79"; + version = "1.0.0-beta.80"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.79.tgz"; - sha512 = "do79vGt3iiHsaVG9LKY8dH+d1E7TLHr+3T+CQ1lqagtWVjYOxqGaoxAT8tRD7R1W0z8BmS4e2poNON6c1sxP5g=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.80.tgz"; + sha512 = "IAQECLt/fDxjlfNdLGnJszt40BaiA6b78+zB6+7Rk8ums0HHLfwWFJPMTzh1bzJ5f+sZ4zDBi4gaIJ1n4XGCHg=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6601,6 +6655,24 @@ let sha512 = "feQEZlyBvQsbT/fvpJ4jJ5OLGaUPpnskHYDsY8DGpPymN+HUeDQrqkBEbbKRwMKidFTI2cxk2kJNNTnvdS9jyw=="; }; }; + "@request/api-0.6.0" = { + name = "_at_request_slash_api"; + packageName = "@request/api"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@request/api/-/api-0.6.0.tgz"; + sha1 = "e46e4c32e21db9ca72639701cba1ebfee06c1666"; + }; + }; + "@request/interface-0.1.0" = { + name = "_at_request_slash_interface"; + packageName = "@request/interface"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@request/interface/-/interface-0.1.0.tgz"; + sha1 = "c913504d3dc2810afad555b599aeaec2cc4c6768"; + }; + }; "@sailshq/lodash-3.10.4" = { name = "_at_sailshq_slash_lodash"; packageName = "@sailshq/lodash"; @@ -6628,13 +6700,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.1.4" = { + "@schematics/angular-13.2.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.1.4"; + version = "13.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.1.4.tgz"; - sha512 = "P1YsHn1LLAmdpB9X2TBuUgrvEW/KaoBbHr8ifYO8/uQEXyeiIF+So8h/dnegkYkdsr3OwQ2X/j3UF6/+HS0odg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.2.tgz"; + sha512 = "LfTtu82I7K+BoSzSXV8gA5+ARhtOtOi/qY0uj2782/xzpe+zCbbftgc6MHiSx/a3KO7IStDwf7G6mjqas0v+4g=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -6646,49 +6718,13 @@ let sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; }; }; - "@serverless/cli-1.6.0" = { - name = "_at_serverless_slash_cli"; - packageName = "@serverless/cli"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.6.0.tgz"; - sha512 = "1Muw/KhS4sZ6+ZrXBdmVY9zAwZh03lF7v1DKtaZ0cmxjqQBwPLoO40rOGXlxR97pyufe2NS6rD/p+ri8NGqeXg=="; - }; - }; - "@serverless/component-metrics-1.0.8" = { - name = "_at_serverless_slash_component-metrics"; - packageName = "@serverless/component-metrics"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/component-metrics/-/component-metrics-1.0.8.tgz"; - sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; - }; - }; - "@serverless/components-3.18.2" = { - name = "_at_serverless_slash_components"; - packageName = "@serverless/components"; - version = "3.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.18.2.tgz"; - sha512 = "jQSgd3unajU94R6vjzD0l+PS5lVcky0vrE1DOfb28VPgmaS48+I/niavWR7+SOt0mYjIkUlwBI73a2ZuqeYK6Q=="; - }; - }; - "@serverless/core-1.1.2" = { - name = "_at_serverless_slash_core"; - packageName = "@serverless/core"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/core/-/core-1.1.2.tgz"; - sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; - }; - }; - "@serverless/dashboard-plugin-5.5.4" = { + "@serverless/dashboard-plugin-6.0.0" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.5.4"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.5.4.tgz"; - sha512 = "qqZnT/RXhBcWXwYnpF+GMeNvSUi6mnyIqsAHj8+f7jJ7N9qa5Qrb14+dUh78sdgRBG5Peub3m3Mlx1n5V9yHDw=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.0.0.tgz"; + sha512 = "ltoFGVoR7qmT4cO3ol2zUsXSVMaFmuV2+N/2dvKWKdqNrjHZRKTOH4fK4Onzmjb6WzK61nZScCT/XCtMhJwQqQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -6700,67 +6736,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.3.0" = { + "@serverless/platform-client-4.3.1" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.0.tgz"; - sha512 = "q2CMqCkKeBaKA/UwfJAZLkdUsbghSbiYPvAX4rl9rsR5APm4KWtjKQP9CTOtVO5JRMWYoysK6jF0d5VJOABRzQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.1.tgz"; + sha512 = "VPXeTTgXmWZtZmbzm9eh5FJcOoFgHkcwgfNA59FV3TE2Vcm5JZiXKtXl5AANu9LYcyOtJK7iBJXs8OUSwNbJZw=="; }; }; - "@serverless/platform-client-china-2.3.4" = { - name = "_at_serverless_slash_platform-client-china"; - packageName = "@serverless/platform-client-china"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.3.4.tgz"; - sha512 = "JRrI3gnUZ0e6on8hHtVr4CwnhrU0jXd3iVfJknEE9tLS//syV77h7PhalZ79SemrboykRoSqhdu9qHf/wiFJ3A=="; - }; - }; - "@serverless/template-1.1.4" = { - name = "_at_serverless_slash_template"; - packageName = "@serverless/template"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.4.tgz"; - sha512 = "LYC+RmSD4ozStdCxSHInpVWP8h+0sSa0lmPGjAb1Fw4Ppk+LCJqJTrohbhHmF2ixgaIBu6ceNtVTB4qM+2NvIA=="; - }; - }; - "@serverless/utils-1.2.0" = { + "@serverless/utils-6.0.1" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "1.2.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-1.2.0.tgz"; - sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; - }; - }; - "@serverless/utils-4.1.0" = { - name = "_at_serverless_slash_utils"; - packageName = "@serverless/utils"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-4.1.0.tgz"; - sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; - }; - }; - "@serverless/utils-5.20.3" = { - name = "_at_serverless_slash_utils"; - packageName = "@serverless/utils"; - version = "5.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.20.3.tgz"; - sha512 = "MG3DQJdto+LaeVY9gh/z0xloAfT0h1Y3Pa4/yYcKe8Dy5HYtSujuav0MvTOH18+s2outjKKJDxTh6tZuyNqFDQ=="; - }; - }; - "@serverless/utils-china-1.1.5" = { - name = "_at_serverless_slash_utils-china"; - packageName = "@serverless/utils-china"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.5.tgz"; - sha512 = "pykhxsI+TlEbZzDUq5dkJPVWceNpaLU2ILEMsjUwyqGPsSE/g8Lrf7AhXseKtNK/7le3lduNnPacmY4Jb+GT+g=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.1.tgz"; + sha512 = "09FKKPeM4N+G2hr8wwVHsx5NrlD8Ieicr0rzUrZ+D23mkOSOj4lpimN5kCxF56GRWXUIknW7dj+ypRoxrZzoTQ=="; }; }; "@sideway/address-4.1.3" = { @@ -6844,13 +6835,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sindresorhus/is-4.3.0" = { + "@sindresorhus/is-4.4.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.3.0.tgz"; - sha512 = "wwOvh0eO3PiTEivGJWiZ+b946SlMSb4pe+y+Ur/4S87cwo09pYi+FWHHnbrM3W9W7cBYKDqQXcrFYjYUCOJUEQ=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.4.0.tgz"; + sha512 = "QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ=="; }; }; "@sindresorhus/jimp-0.3.0" = { @@ -7024,15 +7015,6 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@tencent-sdk/capi-1.1.8" = { - name = "_at_tencent-sdk_slash_capi"; - packageName = "@tencent-sdk/capi"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.8.tgz"; - sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; - }; - }; "@textlint/ast-node-types-12.1.0" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; @@ -7699,6 +7681,15 @@ let sha512 = "C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="; }; }; + "@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-jsx-0.0.1" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; @@ -8248,13 +8239,13 @@ let sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; - "@types/node-12.20.42" = { + "@types/node-12.20.43" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.42"; + version = "12.20.43"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.42.tgz"; - sha512 = "aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.43.tgz"; + sha512 = "HCfJdaYqJX3BCzeihgZrD7b85Cu05OC/GVJ4kEYIflwUs4jbnUlLLWoq7hw1LBcdvUyehO+gr6P5JQ895/2ZfA=="; }; }; "@types/node-13.13.52" = { @@ -8284,13 +8275,13 @@ let sha512 = "USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="; }; }; - "@types/node-14.18.9" = { + "@types/node-14.18.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.9"; + version = "14.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.9.tgz"; - sha512 = "j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.10.tgz"; + sha512 = "6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ=="; }; }; "@types/node-15.14.9" = { @@ -8302,22 +8293,13 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.12" = { + "@types/node-16.11.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.12"; + version = "16.11.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz"; - sha512 = "+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="; - }; - }; - "@types/node-16.11.21" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.11.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.21.tgz"; - sha512 = "Pf8M1XD9i1ksZEcCP8vuSNwooJ/bZapNmIzpmsMaL+jMI+8mEYU3PKvs+xDNuQcJWF/x24WzY4qxLtB0zNow9A=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz"; + sha512 = "DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA=="; }; }; "@types/node-16.11.7" = { @@ -8338,6 +8320,24 @@ let sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; }; }; + "@types/node-17.0.14" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "17.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz"; + sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng=="; + }; + }; + "@types/node-17.0.15" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "17.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz"; + sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; + }; + }; "@types/node-17.0.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8509,13 +8509,13 @@ let sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; - "@types/react-16.14.21" = { + "@types/react-16.14.23" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.21"; + version = "16.14.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz"; - sha512 = "rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.23.tgz"; + sha512 = "WngBZLuSkP4IAgPi0HOsGCHo6dn3CcuLQnCfC17VbA7YBgipZiZoTOhObwl/93DsFW0Y2a/ZXeonpW4DxirEJg=="; }; }; "@types/react-dom-16.9.14" = { @@ -8536,13 +8536,13 @@ let sha512 = "V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw=="; }; }; - "@types/react-window-infinite-loader-1.0.5" = { + "@types/react-window-infinite-loader-1.0.6" = { name = "_at_types_slash_react-window-infinite-loader"; packageName = "@types/react-window-infinite-loader"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-window-infinite-loader/-/react-window-infinite-loader-1.0.5.tgz"; - sha512 = "3v45+4oBNJpSroULtb2EgTJyyK4pCjOMCg+RT/HnA3or5zY4jYufv6uH9NWPyLv0nx8dqt1s4nJqHilfthwKSw=="; + url = "https://registry.npmjs.org/@types/react-window-infinite-loader/-/react-window-infinite-loader-1.0.6.tgz"; + sha512 = "V8g8sBDLVeJJAfEENJS7VXZK+DRJ+jzPNtk8jpj2G+obhf+iqGNUDGwNWCbBhLiD+KpHhf3kWQlKBRi0tAeU4Q=="; }; }; "@types/request-2.48.5" = { @@ -8572,15 +8572,6 @@ let sha512 = "whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ=="; }; }; - "@types/request-promise-native-1.0.18" = { - name = "_at_types_slash_request-promise-native"; - packageName = "@types/request-promise-native"; - version = "1.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.18.tgz"; - sha512 = "tPnODeISFc/c1LjWyLuZUY+Z0uLB3+IMfNoQyDEi395+j6kTFTTRAqjENjoPJUid4vHRGEozoTrcTrfZM+AcbA=="; - }; - }; "@types/resolve-0.0.8" = { name = "_at_types_slash_resolve"; packageName = "@types/resolve"; @@ -8797,13 +8788,13 @@ let sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; }; }; - "@types/url-parse-1.4.7" = { + "@types/url-parse-1.4.8" = { name = "_at_types_slash_url-parse"; packageName = "@types/url-parse"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.7.tgz"; - sha512 = "EGfNfKmF21obwe37d2YFNcLYG67EifYO2B7Zl+N1uVjutZPQ8gSGOOozOu7KQEP8mqSl3X/wG5THZ/OLMotb1Q=="; + url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.8.tgz"; + sha512 = "zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw=="; }; }; "@types/vfile-3.0.2" = { @@ -8833,13 +8824,13 @@ let sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g=="; }; }; - "@types/vscode-1.63.1" = { + "@types/vscode-1.64.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.63.1"; + version = "1.64.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.63.1.tgz"; - sha512 = "Z+ZqjRcnGfHP86dvx/BtSwWyZPKQ/LBdmAVImY82TphyjOw2KgTKcp7Nx92oNwCTsHzlshwexAG/WiY2JuUm3g=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.64.0.tgz"; + sha512 = "bSlAWz5WtcSL3cO9tAT/KpEH9rv5OBnm93OIIFwdCshaAiqr2bp1AUyEwW9MWeCvZBHEXc3V0fTYVdVyzDNwHA=="; }; }; "@types/webpack-4.41.32" = { @@ -8869,13 +8860,13 @@ let sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; - "@types/websocket-1.0.4" = { + "@types/websocket-1.0.5" = { name = "_at_types_slash_websocket"; packageName = "@types/websocket"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.4.tgz"; - sha512 = "qn1LkcFEKK8RPp459jkjzsfpbsx36BBt3oC3pITYtkoBw/aVX+EZFa5j3ThCRTNpLFvIMr5dSTD4RaMdilIOpA=="; + url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.5.tgz"; + sha512 = "NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ=="; }; }; "@types/ws-7.4.7" = { @@ -9220,31 +9211,31 @@ let sha512 = "B4Rc4wGgxTAOivy0tmBEuPAbSYeTzv3dusoQUOW1CVT3N5zYkEuxVj8OXmUQ1YECWaK+IjvQQMFkBuXt//lp7g=="; }; }; - "@vue/compiler-core-3.2.29" = { + "@vue/compiler-core-3.2.30" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.29"; + version = "3.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.29.tgz"; - sha512 = "RePZ/J4Ub3sb7atQw6V6Rez+/5LCRHGFlSetT3N4VMrejqJnNPXKUt5AVm/9F5MJriy2w/VudEIvgscCfCWqxw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.30.tgz"; + sha512 = "64fq1KfcR+k3Vlw+IsBM2VhV5B+2IP3YxvKU8LWCDLrkmlXtbf2eMK6+0IwX5KP41D0f1gzryIiXR7P8cB9O5Q=="; }; }; - "@vue/compiler-dom-3.2.29" = { + "@vue/compiler-dom-3.2.30" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.29"; + version = "3.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.29.tgz"; - sha512 = "y26vK5khdNS9L3ckvkqJk/78qXwWb75Ci8iYLb67AkJuIgyKhIOcR1E8RIt4mswlVCIeI9gQ+fmtdhaiTAtrBQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.30.tgz"; + sha512 = "t7arHz2SXLCXlF2fdGDFVbhENbGMez254Z5edUqb//6WXJU1lC7GvSkUE7i5x8WSjgfqt60i0V8zdmk16rvLdw=="; }; }; - "@vue/shared-3.2.29" = { + "@vue/shared-3.2.30" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.29"; + version = "3.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.29.tgz"; - sha512 = "BjNpU8OK6Z0LVzGUppEk0CMYm/hKDnZfYdjSmPOs0N+TR1cLKJAkDwW8ASZUvaaSLEi6d3hVM7jnWnX+6yWnHw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.30.tgz"; + sha512 = "B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -9742,31 +9733,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.1.0" = { + "@webpack-cli/configtest-1.1.1" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz"; - sha512 = "ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz"; + sha512 = "1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg=="; }; }; - "@webpack-cli/info-1.4.0" = { + "@webpack-cli/info-1.4.1" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz"; - sha512 = "F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz"; + sha512 = "PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA=="; }; }; - "@webpack-cli/serve-1.6.0" = { + "@webpack-cli/serve-1.6.1" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz"; - sha512 = "ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz"; + sha512 = "gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw=="; }; }; "@webtorrent/http-node-1.3.0" = { @@ -10048,13 +10039,13 @@ let sha512 = "3SIr/jmyHDMkCzOtcH03YG9qTAJeE7auPg/V7e9tJrhiW329hNMhg8+VAO72Tp1AOi5bMhma09ACRS2Y9bMOKA=="; }; }; - "@xstate/fsm-1.6.3" = { + "@xstate/fsm-1.6.4" = { name = "_at_xstate_slash_fsm"; packageName = "@xstate/fsm"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.3.tgz"; - sha512 = "Sf8o6JPbldmGx16J7WHgkkwo/R1ZvSK64nSA5i8Xh3W+UVH5MQJTWBxxaplNt8Qlw36SNJ+8Qry03GGrksWWKQ=="; + url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.4.tgz"; + sha512 = "JvoozDB1ndz+byxXsQYW150gAJQIAKZt8MfU2a4dqGhhxfvHBKNj5e1rqb+adVCLtB+F/McyUBe4jRauFhTCTQ=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -10192,15 +10183,6 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "absolute-0.0.1" = { - name = "absolute"; - packageName = "absolute"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; - sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; - }; - }; "abstract-extension-3.1.1" = { name = "abstract-extension"; packageName = "abstract-extension"; @@ -10264,13 +10246,13 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "ace.improved-0.2.1" = { @@ -10723,6 +10705,15 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; + "ajv-8.10.0" = { + name = "ajv"; + packageName = "ajv"; + version = "8.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; + sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; + }; + }; "ajv-8.6.3" = { name = "ajv"; packageName = "ajv"; @@ -12640,13 +12631,13 @@ let sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw=="; }; }; - "async-lock-1.3.0" = { + "async-lock-1.3.1" = { name = "async-lock"; packageName = "async-lock"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/async-lock/-/async-lock-1.3.0.tgz"; - sha512 = "8A7SkiisnEgME2zEedtDYPxUPzdv3x//E7n5IFktPAtMYSEAV7eNJF0rMwrVyUFj6d/8rgajLantbjcNRQYXIg=="; + url = "https://registry.npmjs.org/async-lock/-/async-lock-1.3.1.tgz"; + sha512 = "zK7xap9UnttfbE23JmcrNIyueAn6jWshihJqA33U/hEnKprF/lVGBDsBv/bqLm2YMMl1DnpHhUY044eA0t1TUw=="; }; }; "async-mutex-0.1.4" = { @@ -12910,13 +12901,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1062.0" = { + "aws-sdk-2.1069.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1062.0"; + version = "2.1069.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1062.0.tgz"; - sha512 = "QIU8jwi7Uqyvw2HjsXXXUZv3V/6TinUzLewrdl2EdvonqZCXhwMgnZx2F9I2x62IKH1RqnINwFWdoK+OTgcAjA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1069.0.tgz"; + sha512 = "AF7/5JotrVd8g/D3WWHgQto+IryB1V7iudIYm+H+qxmkGOU3xvL63ChhEoLTY/CxuK/diayg0oWILEsXUn3dfw=="; }; }; "aws-sdk-2.920.0" = { @@ -12982,15 +12973,6 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.22.0" = { - name = "axios"; - packageName = "axios"; - version = "0.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz"; - sha512 = "Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w=="; - }; - }; "axios-0.24.0" = { name = "axios"; packageName = "axios"; @@ -13000,6 +12982,15 @@ let sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; }; }; + "axios-0.25.0" = { + name = "axios"; + packageName = "axios"; + version = "0.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"; + sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; + }; + }; "axios-cookiejar-support-0.5.1" = { name = "axios-cookiejar-support"; packageName = "axios-cookiejar-support"; @@ -13315,13 +13306,13 @@ let sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; }; }; - "babel-plugin-polyfill-corejs3-0.5.1" = { + "babel-plugin-polyfill-corejs3-0.5.2" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz"; - sha512 = "TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; + sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; }; }; "babel-plugin-polyfill-regenerator-0.3.1" = { @@ -14296,13 +14287,13 @@ let sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; - "binet-0.3.6" = { + "binet-0.3.7" = { name = "binet"; packageName = "binet"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/binet/-/binet-0.3.6.tgz"; - sha512 = "6pm+Gc3uNiiJZEv0k8JDWqQlo9ki/o9UNAkLmr0EGm7hI5MboOJVIOlO1nw3YuDkLHWN78OPsaC4JhRkn2jMLw=="; + url = "https://registry.npmjs.org/binet/-/binet-0.3.7.tgz"; + sha512 = "GF+QD4ajs3GWabaVzso7Kn9aZEbwI0e54FKU2ID8bM/7rIk7BpSJytB1KS7SMpix+fWAi9MAGkOgSFljl0aaKg=="; }; }; "bintrees-1.0.1" = { @@ -14521,15 +14512,6 @@ let sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; }; }; - "bl-2.2.1" = { - name = "bl"; - packageName = "bl"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz"; - sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -14728,15 +14710,6 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.18.0" = { - name = "blueimp-md5"; - packageName = "blueimp-md5"; - version = "2.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz"; - sha512 = "vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="; - }; - }; "blueimp-md5-2.19.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; @@ -15845,15 +15818,6 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "buffermaker-1.2.1" = { - name = "buffermaker"; - packageName = "buffermaker"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffermaker/-/buffermaker-1.2.1.tgz"; - sha512 = "IdnyU2jDHU65U63JuVQNTHiWjPRH0CS3aYd/WPaEwyX84rFdukhOduAVb1jwUScmb5X0JWPw8NZOrhoLMiyAHQ=="; - }; - }; "buffers-0.1.1" = { name = "buffers"; packageName = "buffers"; @@ -16160,6 +16124,15 @@ let sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; }; }; + "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=="; + }; + }; "bytesish-0.4.4" = { name = "bytesish"; packageName = "bytesish"; @@ -16538,13 +16511,13 @@ let sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; - "camelcase-keys-7.0.1" = { + "camelcase-keys-7.0.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.1.tgz"; - sha512 = "P331lEls98pW8JLyodNWfzuz91BEDVA4VpW2/SwXnyv2K495tq1N777xzDbFgnEigfA7UIY0xa6PwR/H9jijjA=="; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz"; + sha512 = "Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg=="; }; }; "camelize-1.0.0" = { @@ -16565,13 +16538,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001301" = { + "caniuse-lite-1.0.30001309" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001301"; + version = "1.0.30001309"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz"; - sha512 = "csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz"; + sha512 = "Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA=="; }; }; "canvas-2.9.0" = { @@ -16718,31 +16691,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.4.10" = { + "cdk8s-1.5.9" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.4.10"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.4.10.tgz"; - sha512 = "k0dLzCGg0i7MJFG6wr9mvaq3aaGS2nbwkOtwojiHiGj3wMNLPgZwrZ37s6ZRhquWdZqkOnAfgU7QgxRNmE6wgw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.9.tgz"; + sha512 = "PAPK61y0tfT9oWnPadC2kUhsg+97/DlUDusmE7KeY5YJC8suW5Tso70zNGrIRBDiyx/X/LSbL2A8M9SqntGQ3A=="; }; }; - "cdk8s-plus-22-1.0.0-beta.96" = { + "cdk8s-plus-22-1.0.0-beta.110" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.96"; + version = "1.0.0-beta.110"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.96.tgz"; - sha512 = "BM1ZtZrbITxki/AXXGAVXHbrxRsREnU/VddrtjOEaS04LLvjpoNuEXX8dANyBwTMdMU1gCP0ghwHCxTHaTTfwQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.110.tgz"; + sha512 = "Cp66l+pacDr3QCI9yYTJw/axa0bu1EERWzXtzPPh2GJpHpvAFhxeW/Fjh0TsmSCxF2U5ArcnCpgFXgxnfjAyIQ=="; }; }; - "cdktf-0.8.6" = { + "cdktf-0.9.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.8.6"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.8.6.tgz"; - sha512 = "+zxInPEyPCb6zqPGMV0bOlVoiQ8rEtGEaRhB3BJF5guIa8X4gxAmFTAAYR//vW1Y4msxKOPYkF5RuN5LwSQLIg=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.0.tgz"; + sha512 = "6zHgGuCd2y3uRjgK303hmpitKEkKdVz/ylSMptzNd9UqU8MZtCY+ky29bUcM0Xpyu01c+JxHK0V+Rr+Q72AZxw=="; }; }; "center-align-0.1.3" = { @@ -16763,13 +16736,13 @@ let sha512 = "/IOxdWWNa7nRabfe7+oF+jVkGjlr2xUL4J8l/OvzZhj+c9RpMqoo3Dq+5nU1j/BflRV4BKnaQ4+4oH1yBpQG1Q=="; }; }; - "chai-4.3.4" = { + "chai-4.3.6" = { name = "chai"; packageName = "chai"; - version = "4.3.4"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz"; - sha512 = "yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz"; + sha512 = "bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q=="; }; }; "chai-as-promised-7.1.1" = { @@ -17294,13 +17267,13 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; - "chroma-js-2.1.2" = { + "chroma-js-2.4.2" = { name = "chroma-js"; packageName = "chroma-js"; - version = "2.1.2"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.2.tgz"; - sha512 = "ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ=="; + url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz"; + sha512 = "U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="; }; }; "chrome-dgram-3.0.6" = { @@ -17555,13 +17528,13 @@ let sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; }; }; - "clean-css-5.2.2" = { + "clean-css-5.2.4" = { name = "clean-css"; packageName = "clean-css"; - version = "5.2.2"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz"; - sha512 = "/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.2.4.tgz"; + sha512 = "nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg=="; }; }; "clean-git-ref-2.0.1" = { @@ -18518,15 +18491,6 @@ let sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; }; }; - "colornames-1.1.1" = { - name = "colornames"; - packageName = "colornames"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; - }; - }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -18554,15 +18518,6 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "colors-1.3.3" = { - name = "colors"; - packageName = "colors"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz"; - sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; - }; - }; "colors-1.4.0" = { name = "colors"; packageName = "colors"; @@ -18599,6 +18554,15 @@ let sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; }; }; + "columnify-1.6.0" = { + name = "columnify"; + packageName = "columnify"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz"; + sha512 = "lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q=="; + }; + }; "combine-errors-3.0.3" = { name = "combine-errors"; packageName = "combine-errors"; @@ -18860,15 +18824,6 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "commander-8.0.0" = { - name = "commander"; - packageName = "commander"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.0.0.tgz"; - sha512 = "Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ=="; - }; - }; "commander-8.3.0" = { name = "commander"; packageName = "commander"; @@ -18878,6 +18833,15 @@ let sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; }; + "commander-9.0.0" = { + name = "commander"; + packageName = "commander"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz"; + sha512 = "JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -18887,13 +18851,13 @@ let sha512 = "aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ=="; }; }; - "comment-json-4.1.1" = { + "comment-json-4.2.2" = { name = "comment-json"; packageName = "comment-json"; - version = "4.1.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/comment-json/-/comment-json-4.1.1.tgz"; - sha512 = "v8gmtPvxhBlhdRBLwdHSjGy9BgA23t9H1FctdQKyUrErPjSrJcdDMqBq9B4Irtm7w3TNYLQJNH6ARKnpyag1sA=="; + url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.2.tgz"; + sha512 = "H8T+kl3nZesZu41zO2oNXIJWojNeK3mHxCLrsBNu6feksBXsgb+PtYz5daP5P86A0F3sz3840KVYehr04enISQ=="; }; }; "commist-1.1.0" = { @@ -19337,6 +19301,15 @@ let sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; }; }; + "connect-redis-4.0.3" = { + name = "connect-redis"; + packageName = "connect-redis"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.3.tgz"; + sha512 = "Php0P0ShNfilW6f2d/2v7Q0VAiFeBYsg0bIgu8ST3x26CcQ1JtzV6vxPLUwK0uiq10hQSMR+HzSNhWbcvx6nLg=="; + }; + }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -19400,22 +19373,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.42" = { + "constructs-10.0.54" = { name = "constructs"; packageName = "constructs"; - version = "10.0.42"; + version = "10.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.42.tgz"; - sha512 = "NC/OGRj9a+TCBAuJP6jV99CFMtKEhyRmfMmyKX2WDdbedmmjKk0C2TXgaqGUqsj9PbS0guGP8B4cMIRzmf/7Xg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.54.tgz"; + sha512 = "/lYkNB8DV9N2Q0tIOtVlBjrpI21ESX+l3ABDhtdPLoxGuHSFl27d7FxnfSNRkVOM4X8NTutnCRonxLt/WwmZkQ=="; }; }; - "constructs-3.3.197" = { + "constructs-3.3.210" = { name = "constructs"; packageName = "constructs"; - version = "3.3.197"; + version = "3.3.210"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.197.tgz"; - sha512 = "s+sDpPt7JYyUixb6f89UIGfUp8cfSj9mJTvsbE1Kjc/ALZxpgg0yYwlV1UBoVVoKH0kzpX8S5EdbWkw1uLY7yw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.210.tgz"; + sha512 = "0PLct/e15iksjD/zHuDSFAfnFT/Ff82x+UbIR9XBXGnczd7KgxWTKMOD4DiEF5dbwBUVd1l3AXiZnNLPHYW06Q=="; }; }; "consume-http-header-1.0.0" = { @@ -19806,6 +19779,15 @@ let sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; + "cookie-0.4.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + }; + }; "cookie-parser-1.4.6" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -19869,13 +19851,13 @@ let sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow=="; }; }; - "copy-anything-2.0.3" = { + "copy-anything-2.0.6" = { name = "copy-anything"; packageName = "copy-anything"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz"; - sha512 = "GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ=="; + url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz"; + sha512 = "1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw=="; }; }; "copy-concurrently-1.0.5" = { @@ -19986,31 +19968,31 @@ let sha512 = "WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w=="; }; }; - "core-js-3.20.3" = { + "core-js-3.21.0" = { name = "core-js"; packageName = "core-js"; - version = "3.20.3"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; - sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz"; + sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; }; }; - "core-js-compat-3.20.3" = { + "core-js-compat-3.21.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.20.3"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.3.tgz"; - sha512 = "c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.0.tgz"; + sha512 = "OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A=="; }; }; - "core-js-pure-3.20.3" = { + "core-js-pure-3.21.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.20.3"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.3.tgz"; - sha512 = "Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.0.tgz"; + sha512 = "VaJUunCZLnxuDbo1rNOzwbet9E1K9joiXS5+DQMPtgxd24wfsZbJZMMfQLGYMlCUvSxLfsRUUhoOR2x28mFfeg=="; }; }; "core-util-is-1.0.2" = { @@ -20130,13 +20112,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-1.0.3" = { + "cosmiconfig-typescript-loader-1.0.4" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.3.tgz"; - sha512 = "ARo21VjxdacJUcHxgVMEYNIoVPYiuKOEwWBIYej4M22+pEbe3LzKgmht2UPM+0u7/T/KnZf2r/5IzHv2Nwz+/w=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.4.tgz"; + sha512 = "ulv2dvwurP/MZAIthXm69bO7EzzIUThZ6RJ1qXhdlXM6to3F+IKBL/17EnhYSG52A5N1KcAUu66vSG/3/77KrA=="; }; }; "couch-login-0.1.20" = { @@ -20220,13 +20202,13 @@ let sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; }; - "crc-32-1.2.0" = { + "crc-32-1.2.1" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; - sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; + sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; }; }; "crc32-stream-3.0.1" = { @@ -20265,13 +20247,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.5.1" = { + "create-gatsby-2.6.1" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.5.1.tgz"; - sha512 = "pI5zvUAtHPREzKQpYU4HcpnT/Q9F+pgY99xs8HT49ZphG7qy+g02Ec/7jCNHDxlre7u+7a6TXmDF9FYr4T7BYw=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.6.1.tgz"; + sha512 = "/m4M5JtmAnwEEhSylJc+3r/dcowcE5E7ErcP3rEb2w4apN/lI2ussa15K8NNbCMEMpaJVsoFoaZVdR7Lo8CGNg=="; }; }; "create-graphback-1.0.1" = { @@ -20337,6 +20319,15 @@ let sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; }; }; + "cron-parser-2.18.0" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "2.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz"; + sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; + }; + }; "cronosjs-1.7.1" = { name = "cronosjs"; packageName = "cronosjs"; @@ -20355,15 +20346,6 @@ let sha512 = "1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ=="; }; }; - "cross-env-6.0.3" = { - name = "cross-env"; - packageName = "cross-env"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz"; - sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag=="; - }; - }; "cross-env-7.0.0" = { name = "cross-env"; packageName = "cross-env"; @@ -20454,13 +20436,13 @@ let sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; }; }; - "cross-undici-fetch-0.1.16" = { + "cross-undici-fetch-0.1.23" = { name = "cross-undici-fetch"; packageName = "cross-undici-fetch"; - version = "0.1.16"; + version = "0.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.16.tgz"; - sha512 = "VoL+4GLbq2R7cfpM3wc3RClV6boUAjbpZ485YHsIeBnWYUi4osdDZhh1ohk9+BjrLvAvwmvQwZC5rTEIVQ2eVQ=="; + url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.23.tgz"; + sha512 = "PxSFKt7owZrL/WWowlOXVyD86HcUXePQ0853p/6DGktaONK10hVixV9RmqPaEsdrCTJkeBDlnXFT2tp6db0K0g=="; }; }; "crossroads-0.12.2" = { @@ -20535,49 +20517,49 @@ let sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; }; }; - "cspell-gitignore-5.16.0" = { + "cspell-gitignore-5.18.4" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.16.0.tgz"; - sha512 = "G7yN0R2EqFSNpn3bQ4SGOmydaaYq5BHSiPqsX3vJSJn0wErZz3m/kpKcXrtLPw5/tAM0SfZWhAp1K3MEjrb6xQ=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.18.4.tgz"; + sha512 = "e7BCzqHBQJOVmU6k2bWBj/zoQ3cW6mmOEQWexdAXV7P0y/nMOCXBp3HmPyu2cBn5PN0xIrcbi/UpnJQyw5K+UA=="; }; }; - "cspell-glob-5.16.0" = { + "cspell-glob-5.18.4" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.16.0.tgz"; - sha512 = "u1cNhmNi5VC6QZ6W+FQEAFIowLdU+/fuh6811Hb//MfTNpe2HDbVrjredQrtaETpyImjy4VG/aA7iSWGGuUAcw=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.18.4.tgz"; + sha512 = "TmP1bSMNS0TpqHgrE4vp4NhDM+MSL75JaqWWfGiCBlutOTYjn3D1+btDQFfDAph/C1PCdc8YFrqqv+72MjoONQ=="; }; }; - "cspell-io-5.16.0" = { + "cspell-io-5.18.4" = { name = "cspell-io"; packageName = "cspell-io"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.16.0.tgz"; - sha512 = "nrRbNewf8PMEq8W7D1D0jEwxwJ1dH588EPPu9Q+iT+DItvcBL+mQmGlz8kS7KBh579ioW2vecWUekQ3HSmAgGg=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.18.4.tgz"; + sha512 = "/if+6g/r9gD6KNaintEyQcMK/JHiv55KQCF2HUWV4+HxVvS7wkI6SZ+kcxPGpv6A8dHe5TIOXmuYcHjcSSoZHg=="; }; }; - "cspell-lib-5.16.0" = { + "cspell-lib-5.18.4" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.16.0.tgz"; - sha512 = "IpTPseI4SounQEqfWupOLgEXPcbucWJdbCYkxKXWfl15xfWRo2seYV0RECkJ8pSZKqsCXo6x08i7CrKjvV5N5Q=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.18.4.tgz"; + sha512 = "3a4rPJ4t5HJ/vO3CGaZP9mIA7FFCDfZ/W/uDpy9dTkL46ai+uroD1Z5AYhSMk41PSk88dyhk2Z+6SuJRi5daHw=="; }; }; - "cspell-trie-lib-5.16.0" = { + "cspell-trie-lib-5.18.4" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.16.0.tgz"; - sha512 = "Dpxr0SManHi4D3sAJI1SA14lwTGdmubv88yrRuFd7TU5ihG39BIMxfoAoSRWkqXUEub5QLhAKhftOBUJIm4cIw=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.18.4.tgz"; + sha512 = "3yd3cW/T/7++87M9AMapgH2k6hkSFD4SPOrFL8gqQD8pvUhVrQ12uxFNo5cEEK3LtYcK1uhc2/GLiasJCBl8hA=="; }; }; "csrf-3.1.0" = { @@ -21561,13 +21543,13 @@ let sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA=="; }; }; - "d3-graphviz-4.0.0" = { + "d3-graphviz-4.1.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.0.0.tgz"; - sha512 = "j+fRjPiLnMa3C2QLIWld13vJQzkd9uBhYXZJQSgKI7z2uTvCdMcrvvxJYg7vGdzqceMImKq5Is/oX8kDw+1xng=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.1.0.tgz"; + sha512 = "RtCGnEROcte5npTfjhiNR3kSbwhBl8LA6NNq0oFRXEIFB9N4xHQgGjZWfAHVsN9NQVctEEkRQ4H0GGdqfStlZQ=="; }; }; "d3-hierarchy-1.1.9" = { @@ -22686,6 +22668,15 @@ let sha1 = "bee5fb7c9e727d85dffa24590d10ec1ab1255305"; }; }; + "deep-copy-1.4.2" = { + name = "deep-copy"; + packageName = "deep-copy"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-copy/-/deep-copy-1.4.2.tgz"; + sha512 = "VxZwQ/1+WGQPl5nE67uLhh7OqdrmqI1OazrraO9Bbw/M8Bt6Mol/RxzDA6N6ZgRXpsG/W9PgUj8E1LHHBEq2GQ=="; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -23289,6 +23280,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "destroy-1.1.0" = { + name = "destroy"; + packageName = "destroy"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.1.0.tgz"; + sha512 = "R5QZrOXxSs0JDUIU/VANvRJlQVMts9C0L76HToQdPdlftfZCE7W6dyH0G4GZ5UW9fRqUOhAoCE2aGekuu+3HjQ=="; + }; + }; "detab-1.0.2" = { name = "detab"; packageName = "detab"; @@ -23334,6 +23334,15 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; + "detect-libc-2.0.0" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.0.tgz"; + sha512 = "S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw=="; + }; + }; "detect-newline-2.1.0" = { name = "detect-newline"; packageName = "detect-newline"; @@ -23460,15 +23469,6 @@ let sha512 = "l126t01d2ZS9EreskvEtZPrcgstuvH3rbKy82oUhUrVmBaGx4hO9wECdl3cvZbKDYjMF3QJDB5z5dL9yWAjvZQ=="; }; }; - "diagnostics-1.1.1" = { - name = "diagnostics"; - packageName = "diagnostics"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; - }; - }; "dicer-0.2.5" = { name = "dicer"; packageName = "dicer"; @@ -23550,13 +23550,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.14" = { + "diff2html-3.4.15" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.14"; + version = "3.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.14.tgz"; - sha512 = "cMS7WYOELzSMuAmRMR0+vNwF8PjcFXOyutYEdXkcAXeA7l2AVEi3XdNnC1lk4bh2xSFKkoQ6Lhy+iqtcRonkww=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.15.tgz"; + sha512 = "DNzGoknNE1lIPJWkIYCszIe8PxXHrHl939WQX+Rzr8Q5l3ex8VyJjZCGKwzfMN6jiSyli7hNHyoApnz6prfZ3Q=="; }; }; "diff3-0.0.3" = { @@ -24063,6 +24063,15 @@ let sha512 = "6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ=="; }; }; + "dompurify-2.3.5" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.5.tgz"; + sha512 = "kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ=="; + }; + }; "domutils-1.4.3" = { name = "domutils"; packageName = "domutils"; @@ -24144,15 +24153,6 @@ let sha512 = "tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="; }; }; - "dot-qs-0.2.0" = { - name = "dot-qs"; - packageName = "dot-qs"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-qs/-/dot-qs-0.2.0.tgz"; - sha1 = "d36517fe24b7cda61fce7a5026a0024afaf5a439"; - }; - }; "dotenv-10.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24207,6 +24207,15 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; + "double-ended-queue-2.1.0-0" = { + name = "double-ended-queue"; + packageName = "double-ended-queue"; + version = "2.1.0-0"; + src = fetchurl { + url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; + sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + }; + }; "downgrade-root-1.2.2" = { name = "downgrade-root"; packageName = "downgrade-root"; @@ -24585,13 +24594,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.6.7" = { + "electron-13.6.9" = { name = "electron"; packageName = "electron"; - version = "13.6.7"; + version = "13.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.6.7.tgz"; - sha512 = "gzCru/TpyCZ3yRjR/TVKph6Q/rmFZnLszxoeESaiijHjobB0xxr2oTHQLGVhpali2ddrM+4Pz6+MyZwS6Us+xA=="; + url = "https://registry.npmjs.org/electron/-/electron-13.6.9.tgz"; + sha512 = "Es/sBy85NIuqsO9MW41PUCpwIkeinlTQ7g0ainfnmRAM2rmog3GBxVCaoV5dzEjwTF7TKG1Yr/E7Z3qHmlfWAg=="; }; }; "electron-notarize-1.1.1" = { @@ -24630,13 +24639,13 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.51" = { + "electron-to-chromium-1.4.65" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.51"; + version = "1.4.65"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.51.tgz"; - sha512 = "JNEmcYl3mk1tGQmy0EvL5eik/CKSBuzAyGP0QFdG6LIgxQe3II0BL1m2zKc2MZMf3uGqHWE1TFddJML0RpjSHQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz"; + sha512 = "0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24839,15 +24848,6 @@ let sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; }; }; - "enabled-1.0.2" = { - name = "enabled"; - packageName = "enabled"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; - }; - }; "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; @@ -24992,15 +24992,6 @@ let sha512 = "t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ=="; }; }; - "engine.io-5.1.1" = { - name = "engine.io"; - packageName = "engine.io"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz"; - sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; - }; - }; "engine.io-6.1.2" = { name = "engine.io"; packageName = "engine.io"; @@ -25217,15 +25208,6 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; - "env-variable-0.0.6" = { - name = "env-variable"; - packageName = "env-variable"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz"; - sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; - }; - }; "envinfo-7.8.1" = { name = "envinfo"; packageName = "envinfo"; @@ -25451,15 +25433,6 @@ let sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; }; - "es6-promisify-6.1.1" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz"; - sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; - }; - }; "es6-promisify-7.0.0" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -26180,13 +26153,13 @@ let sha512 = "w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ=="; }; }; - "ethereumjs-util-7.1.3" = { + "ethereumjs-util-7.1.4" = { name = "ethereumjs-util"; packageName = "ethereumjs-util"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.3.tgz"; - sha512 = "y+82tEbyASO0K0X1/SRhbJJoAlfcvq8JbrG4a5cjrOks7HS/36efU/0j2flxCPOUM++HFahk33kr/ZxyC4vNuw=="; + url = "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.4.tgz"; + sha512 = "p6KmuPCX4mZIqsQzXfmSx9Y0l2hqf+VkAiwSisW3UKUFdk8ZkAt+AYaor83z2nSi6CU2zSsXMlD80hAbNEGM0A=="; }; }; "ethjs-unit-0.1.6" = { @@ -26801,6 +26774,15 @@ let sha1 = "3a2ad27f7bebc90fc533d110d7c6d83097bcd057"; }; }; + "express-interceptor-1.2.0" = { + name = "express-interceptor"; + packageName = "express-interceptor"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-interceptor/-/express-interceptor-1.2.0.tgz"; + sha1 = "33460a8e11dce7e5a022caf555d377e45ddb822a"; + }; + }; "express-normalize-query-params-middleware-0.5.1" = { name = "express-normalize-query-params-middleware"; packageName = "express-normalize-query-params-middleware"; @@ -26828,6 +26810,33 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; + "express-prom-bundle-6.3.0" = { + name = "express-prom-bundle"; + packageName = "express-prom-bundle"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.3.0.tgz"; + sha512 = "XeA9pzG+07X5JhR4SV0szQnb2pWBaeNMBb1jBox/d70204jPlcLPoNuCpaQs5kOEedoXJtJEbVJ2esivED1WyA=="; + }; + }; + "express-request-id-1.4.1" = { + name = "express-request-id"; + packageName = "express-request-id"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-request-id/-/express-request-id-1.4.1.tgz"; + sha512 = "qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw=="; + }; + }; + "express-session-1.17.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; + sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; + }; + }; "express-session-1.17.2" = { name = "express-session"; packageName = "express-session"; @@ -27224,6 +27233,15 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; + "fast-equals-2.0.4" = { + name = "fast-equals"; + packageName = "fast-equals"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-2.0.4.tgz"; + sha512 = "caj/ZmjHljPrZtbzJ3kfH5ia/k4mTJe/qSiXAGzxZWRZgsgDV0cvNaQULqUX8t0/JVlzzEdYOwCN5DmzTxoD4w=="; + }; + }; "fast-fifo-1.1.0" = { name = "fast-fifo"; packageName = "fast-fifo"; @@ -27458,13 +27476,13 @@ let sha512 = "WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ=="; }; }; - "faunadb-4.4.1" = { + "faunadb-4.5.2" = { name = "faunadb"; packageName = "faunadb"; - version = "4.4.1"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-4.4.1.tgz"; - sha512 = "1V2ve22T4Q45C3PBB+LD7Fpk4lVajbtxDXDpENsujC+LMe88LqBQ9brl5v5uB3sCTSVAX0fsGtuZ+N5x15vdoQ=="; + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.5.2.tgz"; + sha512 = "XQ2yDoPZc5/IqC4eS4tP5tjewFbAK8UdQYLDGlUiJy5E9F3rpvYCMdjlkRWcaxOMD2yPYr8NSoql10zy1CNoCA=="; }; }; "faye-websocket-0.10.0" = { @@ -28295,13 +28313,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.2.4" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "flatten-0.0.1" = { @@ -28331,13 +28349,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.169.0" = { + "flow-parser-0.171.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.169.0"; + version = "0.171.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.169.0.tgz"; - sha512 = "X1DFb6wxXpZLLqM9NX0Wm+4xoN6xAyJn8OwuiHsV0JJvLfD18Z+wbgJ1lM7ykTVINdu8v7Mu0gIzWMvnhKWBkA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.171.0.tgz"; + sha512 = "cqEsgic6HH81Pz0IQLeyuoh0O8Y7ECAIdZ0idPQ9P1jZ/kHB9KK0hwqnjVtqTGog15JURkIxvyXm+9pAb6uuSQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -29285,22 +29303,22 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.5.2" = { + "gatsby-core-utils-3.6.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.5.2.tgz"; - sha512 = "sY7BD6VlbWwrV892x9/yJPtXYaGC/GLyhabd9j2xP6zsIOW0XBHXZ4jJ+xEPaRn3CJxYgBd8KdCyoc4h1ZEFzg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.6.0.tgz"; + sha512 = "xmjtOWQfLinNbgBiDRT1KpEfDZm0Z0u6+hsf8EH8Ps5UCIhKinGrdtK+QH+RzPGCV1PUg/E/pnLVqQLCvD+tmA=="; }; }; - "gatsby-telemetry-3.5.2" = { + "gatsby-telemetry-3.6.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.5.2.tgz"; - sha512 = "nL33+AxawRqEjuvHAbyyxoDMZ5GXNMEMzCk5WQu7J/lA6od6cUmXpZMcr4AxwnNFJLfmYKlwalN7cuz5nBL6lw=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.6.0.tgz"; + sha512 = "mxofrnVUtcjh+CD9QcAQloR5WskKUfBCXzGLCH4/haE5SbWKpKstLBR06ZnNI01VHc5Do0+W+n16NvNe4G8zGQ=="; }; }; "gauge-1.2.7" = { @@ -29726,13 +29744,13 @@ let sha512 = "7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg=="; }; }; - "getmac-5.17.0" = { + "getmac-5.20.0" = { name = "getmac"; packageName = "getmac"; - version = "5.17.0"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.17.0.tgz"; - sha512 = "hupD+ZCHVFRaH1wBDPgIil6KWL5p5Z6kG71nAcafwq72QaMxw9bhR2LPBk3jlw3I2F3oELNkx6Fccwiuy5fv0w=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.20.0.tgz"; + sha512 = "O9T855fb+Hx9dsTJHNv72ZUuA6Y18+BO/0ypPXf6s/tunzXqhc3kbQkNAl+9HVKVlwkWmglHS4LMoJ9YbymKYQ=="; }; }; "getpass-0.1.6" = { @@ -30303,13 +30321,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.12.0" = { + "globals-13.12.1" = { name = "globals"; packageName = "globals"; - version = "13.12.0"; + version = "13.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; - sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; + url = "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz"; + sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw=="; }; }; "globals-9.18.0" = { @@ -30465,13 +30483,13 @@ let sha512 = "VZ0VPPIuiSO5/ZZr/UqFP3X3Yv04/TZxIe+SO+Ceqy43ulthPZcnrWsB8hYW2gqZzOPJeVJaYaX9FmL70kYITw=="; }; }; - "goldengate-11.0.0" = { + "goldengate-11.0.1" = { name = "goldengate"; packageName = "goldengate"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-11.0.0.tgz"; - sha512 = "2hGoEY0KosJOgllqjzx1M7jQGC9a9YmDy4qznidhn4pUHPFfIYDp+Wdy58TnHH8mcGuaHd+uJdsZVaWMkA7S/w=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-11.0.1.tgz"; + sha512 = "4mu4FxLNkcyMfzH1cnarJ+0I5nkzuRO5AKZ0fcJ92vnBWC1M+MuYNozWV5jpqwHnpRLYgxOGDJnY0TcmQlmFHg=="; }; }; "gonzales-pe-4.3.0" = { @@ -30501,13 +30519,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.28.1" = { + "google-gax-2.29.4" = { name = "google-gax"; packageName = "google-gax"; - version = "2.28.1"; + version = "2.29.4"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.28.1.tgz"; - sha512 = "2Xjd3FrjlVd6Cmw2B2Aicpc/q92SwTpIOvxPUlnRg9w+Do8nu7UR+eQrgoKlo2FIUcUuDTvppvcx8toND0pK9g=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.29.4.tgz"; + sha512 = "3o6cByD2fE1yIc6i1gpKMQlJStqlvu8Sa/Ly/HCQ6GPHpltpVfkTT4KVj2YLVa7WTSDoGbsLBDmJ1KfN1uNiRw=="; }; }; "google-p12-pem-3.1.3" = { @@ -30681,13 +30699,22 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; - "grammy-1.6.2" = { + "grammy-1.7.0" = { name = "grammy"; packageName = "grammy"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.6.2.tgz"; - sha512 = "STsZMwpde6dAoJnj6ejaKC7PvfTJz2onv6NbPEFsz+wG3l6ZVOrar2rT59/Qrr+xqrWqvjFhTU5mSCyMMvBowg=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.7.0.tgz"; + sha512 = "Xs4vRzCkSO+8CrFP8BXXOo4BGfBGWTPoDcbj8V3kz/c01XLNXI738HWv6/qjQ+IuPLnd/Qegjy7MBogbymogUg=="; + }; + }; + "grant-4.7.0" = { + name = "grant"; + packageName = "grant"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grant/-/grant-4.7.0.tgz"; + sha512 = "QGPjCYDrBnb/OIiTRxbK3TnNOE6Ycgfc/GcgPzI4vyNIr+b7yisEexYp7VM74zj6bxr+mDTzfGONRLzzsVPJIA=="; }; }; "grapheme-breaker-0.3.2" = { @@ -30717,22 +30744,22 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; - "graphology-0.20.0" = { + "graphology-0.23.2" = { name = "graphology"; packageName = "graphology"; - version = "0.20.0"; + version = "0.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphology/-/graphology-0.20.0.tgz"; - sha512 = "h5mJWgZXpuZQzBAMWhVIOluGNIYUP043eh7BHcecRWhSkD4eiZAh+uM4XX2rGL1vig9XQ3JVYl9gmK+ajy+JPA=="; + url = "https://registry.npmjs.org/graphology/-/graphology-0.23.2.tgz"; + sha512 = "RHcLpAP4M+KPShLQEvgkT1Y4vxl+FFbmmy3D0mupO+VXIuYC8zdmMcHs40D9m3mmN067zGS+lUaHjDq06Td7PQ=="; }; }; - "graphology-types-0.19.5" = { + "graphology-types-0.21.2" = { name = "graphology-types"; packageName = "graphology-types"; - version = "0.19.5"; + version = "0.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.5.tgz"; - sha512 = "zXJEDILlJ2JI+oUVjHkXZIRRZfWuwBEhOJagOARnt4eWuErBJZUJmiEOJjLDA0s0DQNFxIHD4+NRwsU4B0VxWw=="; + url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.21.2.tgz"; + sha512 = "KNdgwG0dbVjhJqRUw0OivJ5pkUHunbk4vDatwdfITfNvPugX0xR327ZKsaOcr3snbiBJfyGu7lCrXeYp4KF8YA=="; }; }; "graphql-0.11.7" = { @@ -30924,13 +30951,13 @@ let sha512 = "hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw=="; }; }; - "gray-matter-2.1.1" = { + "gray-matter-4.0.3" = { name = "gray-matter"; packageName = "gray-matter"; - version = "2.1.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; - sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz"; + sha512 = "5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q=="; }; }; "grid-index-1.1.0" = { @@ -31356,15 +31383,6 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-generators-1.0.1" = { - name = "has-generators"; - packageName = "has-generators"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; - sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; - }; - }; "has-glob-1.0.0" = { name = "has-glob"; packageName = "has-glob"; @@ -31842,6 +31860,15 @@ let sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA=="; }; }; + "helmet-4.6.0" = { + name = "helmet"; + packageName = "helmet"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz"; + sha512 = "HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="; + }; + }; "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; @@ -32976,13 +33003,13 @@ let sha512 = "FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q=="; }; }; - "i18next-21.6.6" = { + "i18next-21.6.10" = { name = "i18next"; packageName = "i18next"; - version = "21.6.6"; + version = "21.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-21.6.6.tgz"; - sha512 = "K1Pw8K+nHVco56PO6UrqNq4K/ZVbb2eqBQwPqmzYDm4tGQYXBjdz8jrnvuNvV5STaE8oGpWKQMxHOvh2zhVE7Q=="; + url = "https://registry.npmjs.org/i18next/-/i18next-21.6.10.tgz"; + sha512 = "Xw+tEGQ61BF6SXtBlFffhM/YhJKHZf2cyDrcNK/l2dE6yVbkPkSasC3VhkAsHXX30vUJ0yG04WIUtf7UvwjOxg=="; }; }; "iconv-lite-0.4.19" = { @@ -33111,15 +33138,6 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.1.9" = { - name = "ignore"; - packageName = "ignore"; - version = "5.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"; - sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="; - }; - }; "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; @@ -33516,13 +33534,13 @@ let sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; }; }; - "inflection-1.13.1" = { + "inflection-1.13.2" = { name = "inflection"; packageName = "inflection"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/inflection/-/inflection-1.13.1.tgz"; - sha512 = "dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA=="; + url = "https://registry.npmjs.org/inflection/-/inflection-1.13.2.tgz"; + sha512 = "cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw=="; }; }; "inflight-1.0.6" = { @@ -33642,13 +33660,13 @@ let sha512 = "uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ=="; }; }; - "ink-text-input-4.0.2" = { + "ink-text-input-4.0.3" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.2.tgz"; - sha512 = "euuugcNExOx5E+qNM1c+pDF7V8yw/xzCRWEfFk1KjQT9CYtaVAYre13YbMFsYPkGD26dvX6XAffUgkwXme/p5Q=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.3.tgz"; + sha512 = "eQD01ik9ltmNoHmkeQ2t8LszYkv2XwuPSUz3ie/85qer6Ll/j0QSlSaLNl6ENHZakBHdCBVZY04iOXcLLXA0PQ=="; }; }; "inline-process-browser-1.0.0" = { @@ -34119,6 +34137,15 @@ let sha512 = "yCAFA3CtbRIiLOdybrZhV1UQ4Rjy20dXBL/5PzlqaZjDbz+RFWtuk3BWsUF12WJo1ikSeVhFXjp6hGAGIG690g=="; }; }; + "invoices-2.0.4" = { + name = "invoices"; + packageName = "invoices"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-2.0.4.tgz"; + sha512 = "+Np4KWjNSlYm7Qp12zkRN5eu9tkA7FAFIP60bmpbMbwQbgz5gV9go3bkY8CpGj+Z1zifw5N8U+pH+wko/XSjpw=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -35046,6 +35073,15 @@ let sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw=="; }; }; + "is-nan-1.3.2" = { + name = "is-nan"; + packageName = "is-nan"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; + sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; + }; + }; "is-natural-number-4.0.1" = { name = "is-natural-number"; packageName = "is-natural-number"; @@ -35973,13 +36009,13 @@ let sha512 = "qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA=="; }; }; - "isomorphic-git-1.10.4" = { + "isomorphic-git-1.10.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; - version = "1.10.4"; + version = "1.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.10.4.tgz"; - sha512 = "0nvws2N2pWX04AZPpYUyvgPmupKbklP/qSerP/A8yuoe8t4flhpOwYl8INdV6u8j24ALm5X3QBciOTz96ugT2Q=="; + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.10.5.tgz"; + sha512 = "hcD5SkH36iv2ooM9VCY3kPOYtCgxjw52LmqB6sj5oWlDu/IbI3mYtPdok2lmR5dzmCoaUT7pCXz847AWW7Mv3w=="; }; }; "isomorphic-textencoder-1.0.1" = { @@ -36216,13 +36252,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.4.6" = { + "jest-worker-27.5.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.4.6"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz"; - sha512 = "gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.0.tgz"; + sha512 = "8OEHiPNOPTfaWnJ2SUHM8fmgeGq37uuGsQBvGKQJl1f+6WIy6g7G3fE2ruI5294bUKUI9FaCWt5hDvO8HSwsSg=="; }; }; "jimp-compact-0.16.1" = { @@ -36288,13 +36324,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-17.5.0" = { + "joi-17.6.0" = { name = "joi"; packageName = "joi"; - version = "17.5.0"; + version = "17.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.5.0.tgz"; - sha512 = "R7hR50COp7StzLnDi4ywOXHrBrgNXuUUfJWIR5lPY5Bm/pOD3jZaTwpluUXVLRWcoWZxkrHBBJ5hLxgnlehbdw=="; + url = "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz"; + sha512 = "OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw=="; }; }; "join-component-1.1.0" = { @@ -36379,13 +36415,13 @@ let sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; }; }; - "jquery-ui-1.12.1" = { + "jquery-ui-1.13.1" = { name = "jquery-ui"; packageName = "jquery-ui"; - version = "1.12.1"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz"; - sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.1.tgz"; + sha512 = "2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA=="; }; }; "jquery.terminal-2.31.1" = { @@ -36397,6 +36433,15 @@ let sha512 = "JVCL3mOmE+NQ1SvwHyRtJ18ICEylHoLqh0mmi0HResjeE7v/85rREfoLDtYfJxDxCNpTrznGl3HEoUCfjHnycA=="; }; }; + "js-base64-2.6.3" = { + name = "js-base64"; + packageName = "js-base64"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz"; + sha512 = "fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg=="; + }; + }; "js-base64-2.6.4" = { name = "js-base64"; packageName = "js-base64"; @@ -36613,13 +36658,13 @@ let sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; - "jsdoc-3.6.9" = { + "jsdoc-3.6.10" = { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.9"; + version = "3.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.9.tgz"; - sha512 = "bVrM2DT2iLmv6jd2IdTRk67tC4iaSDUicD+47y+cNCYlE8dccd4xZnlANG4M+OmGyV389bABSTKKfoPCOofbKw=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.10.tgz"; + sha512 = "IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg=="; }; }; "jsdom-11.12.0" = { @@ -36739,13 +36784,13 @@ let sha512 = "iFpupZWQusVYGHaUPooaO6xVAtRp+o1EOMBS2FcJBZcWGbB8fRG3zzpeMSkoqu/Pjqtu7boh45V90CXtSmVfMQ=="; }; }; - "jsii-srcmak-0.1.454" = { + "jsii-srcmak-0.1.468" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.454"; + version = "0.1.468"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.454.tgz"; - sha512 = "TN0J2q2QQ92bzJuxKheb0NNSChy2AqDK9TBznBsbzYqPv5QwNZIMsnPrD1HVJRPVvS5Vz8+VttNjVniLw4QArg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.468.tgz"; + sha512 = "r1oCMQBt+rhlURuszbSCyW1VqrQi+lle1N2A3GjdPPn9AvEVLV2FQSHpV2sMW2Q28S5WsjEibFa8+FPFmeCZBA=="; }; }; "json-bigint-1.0.0" = { @@ -36847,13 +36892,13 @@ let sha512 = "tFH40YQ+lG7mgYYM1kGZOhQngO4SbOEHZJlA4W+NtetWZ20EUU3BPU+30uWRKumuAJoSo5eqrsXD2h72ioS8ew=="; }; }; - "json-ptr-3.0.1" = { + "json-ptr-3.1.0" = { name = "json-ptr"; packageName = "json-ptr"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-ptr/-/json-ptr-3.0.1.tgz"; - sha512 = "hrZ4tElT8huJUH3OwOK+d7F8PRqw09QnGM3Mm3GmqKWDyCCPCG8lGHxXOwQAj0VOxzLirOds07Kz10B5F8M8EA=="; + url = "https://registry.npmjs.org/json-ptr/-/json-ptr-3.1.0.tgz"; + sha512 = "KMsG905wFbHHTnvd66MHCNo0E43UPalKt2zQUbBtWrDYKk/3vE/4u8lfWDdIyPEoMXxOFJO1lsBs6xPBXKxeVw=="; }; }; "json-refs-2.1.7" = { @@ -37036,13 +37081,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.114" = { + "json2jsii-0.2.128" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.114"; + version = "0.2.128"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.114.tgz"; - sha512 = "g1xBiPKcsTydLpeNXqe+HXD8gM/Wod5zrTwJqPpjFP+QNaDOjjMLPjmGa5R4gHwyapOT7GbqLH9bZhY+jnl1lw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.128.tgz"; + sha512 = "pwRbPj5sb2SCGnf0D37evNuuTfGsxtrqMR4OGYgtiDVpf/UfRWSuoq/SY4m0reRhyyk3hqO5c8iyX7zNlOAKvw=="; }; }; "json3-3.2.6" = { @@ -37576,15 +37621,6 @@ let sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; }; }; - "kafka-node-5.0.0" = { - name = "kafka-node"; - packageName = "kafka-node"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kafka-node/-/kafka-node-5.0.0.tgz"; - sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug=="; - }; - }; "katex-0.13.24" = { name = "katex"; packageName = "katex"; @@ -37675,13 +37711,13 @@ let sha512 = "qdyZ3XDuv11ANDXJ+shsmc+j/h5BHPDSn33MwkUMDg2EA++xEBleNkghr3Jg95cqVx5WgDYD8V/m3Q0y7kwQ2w=="; }; }; - "keytar-7.7.0" = { + "keytar-7.8.0" = { name = "keytar"; packageName = "keytar"; - version = "7.7.0"; + version = "7.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz"; - sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; + url = "https://registry.npmjs.org/keytar/-/keytar-7.8.0.tgz"; + sha512 = "mR+BqtAOIW8j+T5FtLVyckCbvROWQD+4FzPeFMuk5njEZkXLpVPCGF26Y3mTyxMAAL1XCfswR7S6kIf+THSRFA=="; }; }; "keyv-3.0.0" = { @@ -37702,13 +37738,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.5" = { + "keyv-4.1.1" = { name = "keyv"; packageName = "keyv"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.5.tgz"; - sha512 = "531pkGLqV3BMg0eDqqJFI0R1mkK1Nm5xIP2mM6keP5P8WfFtCkg2IOwplTUmlGoTgIg9yQYZ/kdihhz89XH3vA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz"; + sha512 = "tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ=="; }; }; "khroma-1.4.1" = { @@ -37945,15 +37981,6 @@ let sha512 = "JGmxTuPWy4bH7bt6gD/OMWkhprawvRmzJSr8TWKmTL4N7+IMv3s0SedeQi5S4ilxM9Bo6ptkCyXj/7wf+VS5tg=="; }; }; - "kuler-1.0.1" = { - name = "kuler"; - packageName = "kuler"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; - sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; - }; - }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -38062,6 +38089,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=="; + }; + }; "launch-editor-2.3.0" = { name = "launch-editor"; packageName = "launch-editor"; @@ -38548,24 +38584,6 @@ let sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA=="; }; }; - "lightning-5.2.1" = { - name = "lightning"; - packageName = "lightning"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.2.1.tgz"; - sha512 = "Mt9J8OvPC0A1xeNhT6mqWiBefer6hEVosLPiqBXJ1BsNPhGYAIEEuWCWT3Yy0biPm6FUotAdfb1IO6B4NILBhg=="; - }; - }; - "lightning-5.3.1" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.1.tgz"; - sha512 = "PbJJQJS9HOBfH8D99ejugmOur8K9MOdYXxep3eeq0GGof4dhO8gnQLcyvsBaxb25cVfFAiERJOMHheo9iCDkjg=="; - }; - }; "lightning-5.3.3" = { name = "lightning"; packageName = "lightning"; @@ -38584,6 +38602,24 @@ let sha512 = "zUHlFFSS+KJhndoZkjkXPWpvlXAgYGWS2SxzXpiiwnXZKCNmT+IkQFQmp2oIpbF7K93oqlpxgafZMZDeReX5pQ=="; }; }; + "lightning-5.6.1" = { + name = "lightning"; + packageName = "lightning"; + version = "5.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-5.6.1.tgz"; + sha512 = "wUS82S4bhwlR8lwuQNiMX4T+LQ/mL2zNyXOiL7dzZBRpCr/65dyXBTsl3SZPwcm4miyvO4jJJ4jhgLgKRk35aQ=="; + }; + }; + "lightning-5.6.2" = { + name = "lightning"; + packageName = "lightning"; + version = "5.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-5.6.2.tgz"; + sha512 = "1Bfrq+FK4/yuBStMzmiFnAG//YewN9Fznm2qn86z87/u6UcWqdpWvBCRS5njtq5bG6eWgxM4DOfaw9LptyXSog=="; + }; + }; "lilconfig-2.0.4" = { name = "lilconfig"; packageName = "lilconfig"; @@ -38755,13 +38791,13 @@ let sha512 = "q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw=="; }; }; - "livereload-js-3.3.2" = { + "livereload-js-3.3.3" = { name = "livereload-js"; packageName = "livereload-js"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz"; - sha512 = "w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA=="; + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.3.tgz"; + sha512 = "a7Jipme3XIBIryJluWP5LQrEAvhobDPyScBe+q+MYwxBiMT2Ck7msy4tAdF8TAa33FMdJqX4guP81Yhiu6BkmQ=="; }; }; "ln-accounting-5.0.5" = { @@ -38782,24 +38818,6 @@ let sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ=="; }; }; - "ln-service-53.2.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.2.0.tgz"; - sha512 = "4qaKYQV6vRlIja7j5lo5G8srABzFmt/fY+8/EVYhU6hdLhAxNPDUZ8zSQky6bWOwtb2zZYejUZYT2GqI2tfq5w=="; - }; - }; - "ln-service-53.4.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.4.0.tgz"; - sha512 = "+KPin7a4zCVtYMoVmTEVQPNg7BZUm/5dRd/bI1hY1z+wiL7GE5CxvKNbEIyPgyxRYuLXf8nx/4vvFiSjfJKfug=="; - }; - }; "ln-service-53.5.0" = { name = "ln-service"; packageName = "ln-service"; @@ -38818,6 +38836,33 @@ let sha512 = "EXLhYeu1qvhk+yzuH6qBZyGvqBPWT71FnmsbOxKjWofW6SGQBbJuNru6Ub2NIMhJnXqD7qvMvswZ54ho/oPvGQ=="; }; }; + "ln-service-53.7.2" = { + name = "ln-service"; + packageName = "ln-service"; + version = "53.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.7.2.tgz"; + sha512 = "JrCr7yYX0m3Dus2ucsDmJJ7aVvyUtl+wUEIn1HdC8HpuwjZFARaeTG7Nm3qJk1jTaV14JrqyRPzvZ5/InwtPvg=="; + }; + }; + "ln-service-53.7.3" = { + name = "ln-service"; + packageName = "ln-service"; + version = "53.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.7.3.tgz"; + sha512 = "iA+G0yn3j74BcGdKxhHRCDphMSgGg4NWzFNy9r484WPBjq6KQgCRcxE0I8A0Rgi73kqMckKZmYEKrJMUuJyNYw=="; + }; + }; + "ln-sync-3.10.0" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.10.0.tgz"; + sha512 = "iRYFVwHF6gyBKO8/WJfR+6jlsjPSsevFz/cbOQbOwBzMVaCmXIyWw95SGHEJLcZR2jNadEfP3k10oYa+hWou3A=="; + }; + }; "ln-sync-3.7.0" = { name = "ln-sync"; packageName = "ln-sync"; @@ -38827,13 +38872,13 @@ let sha512 = "1aTlSSLiIULG4AOhOLdMd/VQYhUBEvTdA+8Bp2xe1YolOralVW/x/50fzIxzkKolCwXQ6elecUuH4nw1z0tqkg=="; }; }; - "ln-telegram-3.9.0" = { + "ln-telegram-3.15.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.9.0"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.9.0.tgz"; - sha512 = "Desl/QCdnXwMh98n0p7KVY17X9W6hDDh+HrU+UaaNbAkjw8GN+VZRYSMTqLIPXCf5QhWDlpSA7EruTHzKOAwMw=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.15.1.tgz"; + sha512 = "ZmtMIfCE9xMMIChvg+N/4I3HAD9PUqqAGJRQg38586Uhv8WKAdqDXHmYCrioGDb0Rh3tyKtMsRfOACAjrXIehA=="; }; }; "load-bmfont-1.4.1" = { @@ -39061,22 +39106,13 @@ let sha1 = "53157499d1653b136ca66451071fca615703fa55"; }; }; - "locks-0.2.2" = { - name = "locks"; - packageName = "locks"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/locks/-/locks-0.2.2.tgz"; - sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; - }; - }; - "locutus-2.0.15" = { + "locutus-2.0.16" = { name = "locutus"; packageName = "locutus"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/locutus/-/locutus-2.0.15.tgz"; - sha512 = "2xWC4RkoAoCVXEb/stzEgG1TNgd+mrkLBj6TuEDNyUoKeQ2XzDTyJUC23sMiqbL6zJmJSP3w59OZo+zc4IBOmA=="; + url = "https://registry.npmjs.org/locutus/-/locutus-2.0.16.tgz"; + sha512 = "pGfl6Hb/1mXLzrX5kl5lH7gz25ey0vwQssZp8Qo2CEF59di6KrAgdFm+0pW8ghLnvNzzJGj5tlWhhv2QbK3jeQ=="; }; }; "lodash-2.4.2" = { @@ -39628,15 +39664,6 @@ let sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; }; }; - "lodash.differencewith-4.5.0" = { - name = "lodash.differencewith"; - packageName = "lodash.differencewith"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz"; - sha1 = "bafafbc918b55154e179176a00bb0aefaac854b7"; - }; - }; "lodash.escape-3.2.0" = { name = "lodash.escape"; packageName = "lodash.escape"; @@ -40438,15 +40465,6 @@ let sha512 = "G2UKFT23/uueUnpUWYwB+uOlqcLvF6r1vNsMgTR6roJPpvpFQkgG75bkpAy/XYvaLpGs8XSgS24CUKC92Ap+jg=="; }; }; - "long-1.1.2" = { - name = "long"; - packageName = "long"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-1.1.2.tgz"; - sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53"; - }; - }; "long-2.4.0" = { name = "long"; packageName = "long"; @@ -40465,6 +40483,15 @@ let sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; }; + "long-timeout-0.1.1" = { + name = "long-timeout"; + packageName = "long-timeout"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz"; + sha1 = "9721d788b47e0bcb5a24c2e2bee1a0da55dab514"; + }; + }; "longest-1.0.1" = { name = "longest"; packageName = "longest"; @@ -40573,6 +40600,15 @@ let sha512 = "S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ=="; }; }; + "loupe-2.3.3" = { + name = "loupe"; + packageName = "loupe"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loupe/-/loupe-2.3.3.tgz"; + sha512 = "krIV4Cf1BIGIx2t1e6tucThhrBemUnIUjMtD2vN4mrMxnxpBvrcosBSpooqunBqP/hOEEV1w/Cr1YskGtqw5Jg=="; + }; + }; "lowdb-0.13.1" = { name = "lowdb"; packageName = "lowdb"; @@ -40970,6 +41006,15 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; + "make-fetch-happen-10.0.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.0.tgz"; + sha512 = "CREcDkbKZZ64g5MN1FT+u58mDHX9FQFFtFyio5HonX44BdQdytqPZBXUz+6ibi2w/6ncji59f2phyXGSMGpgzA=="; + }; + }; "make-fetch-happen-8.0.14" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -41150,15 +41195,6 @@ let sha512 = "YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg=="; }; }; - "markdown-it-12.2.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "12.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.2.0.tgz"; - sha512 = "Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg=="; - }; - }; "markdown-it-12.3.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -41267,13 +41303,13 @@ let sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A=="; }; }; - "markdown-it-multimd-table-4.1.2" = { + "markdown-it-multimd-table-4.1.3" = { name = "markdown-it-multimd-table"; packageName = "markdown-it-multimd-table"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.2.tgz"; - sha512 = "xeEYS8l6E1/EinMCvgvWuEcw3ujQX9jRK+RBc6iqqFzVSI9BiVSpfM31D/L0woDfCxrOiJaoEYTLeyTlB/FBgQ=="; + url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.3.tgz"; + sha512 = "cXvJ+l8dMRmUZLrn34W/8tfLYjC40R7S0wRwcb95emuvQ3uiWNf9vB/IyeRh6XqEq95eXh70+UDNZ29qcOI+Dg=="; }; }; "markdown-it-sub-1.0.0" = { @@ -41366,15 +41402,6 @@ let sha512 = "y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA=="; }; }; - "markdownlint-0.24.0" = { - name = "markdownlint"; - packageName = "markdownlint"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.24.0.tgz"; - sha512 = "OJIGsGFV/rC9irI5E1FMy6v9hdACSwaa+EN3224Y5KG8zj2EYzdHOw0pOJovIYmjNfEZ9BtxUY4P7uYHTSNnbQ=="; - }; - }; "markdownlint-0.25.1" = { name = "markdownlint"; packageName = "markdownlint"; @@ -41393,15 +41420,6 @@ let sha512 = "QEAJitT5eqX1SNboOD+SO/LNBpu4P4je8JlR02ug2cLQAqmIhh8IJnSK7AcaHBHhNADqdGydnPpQOpsNcEEqCw=="; }; }; - "markdownlint-rule-helpers-0.15.0" = { - name = "markdownlint-rule-helpers"; - packageName = "markdownlint-rule-helpers"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.15.0.tgz"; - sha512 = "A+9mswc3m/kkqpJCqntmte/1VKhDJ+tjZsERLz5L4h/Qr7ht2/BkGkgY5E7/wsxIhcpl+ctIfz+oS3PQrMOB2w=="; - }; - }; "markdownlint-rule-helpers-0.16.0" = { name = "markdownlint-rule-helpers"; packageName = "markdownlint-rule-helpers"; @@ -41420,15 +41438,6 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; - "marked-0.7.0" = { - name = "marked"; - packageName = "marked"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz"; - sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; - }; - }; "marked-2.1.3" = { name = "marked"; packageName = "marked"; @@ -41438,13 +41447,13 @@ let sha512 = "/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA=="; }; }; - "marked-4.0.10" = { + "marked-4.0.12" = { name = "marked"; packageName = "marked"; - version = "4.0.10"; + version = "4.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz"; - sha512 = "+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw=="; + url = "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz"; + sha512 = "hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ=="; }; }; "marked-terminal-3.3.0" = { @@ -41762,13 +41771,13 @@ let sha512 = "FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg=="; }; }; - "mdast-util-gfm-footnote-1.0.0" = { + "mdast-util-gfm-footnote-1.0.1" = { name = "mdast-util-gfm-footnote"; packageName = "mdast-util-gfm-footnote"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.0.tgz"; - sha512 = "qeg9YoS2YYP6OBmMyUFxKXb6BLwAsbGidIxgwDAXHIMYZQhIwe52L9BSJs+zP29Jp5nSERPkmG3tSwAN23/ZbQ=="; + url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz"; + sha512 = "p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw=="; }; }; "mdast-util-gfm-strikethrough-0.2.3" = { @@ -41780,13 +41789,13 @@ let sha512 = "5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA=="; }; }; - "mdast-util-gfm-strikethrough-1.0.0" = { + "mdast-util-gfm-strikethrough-1.0.1" = { name = "mdast-util-gfm-strikethrough"; packageName = "mdast-util-gfm-strikethrough"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.0.tgz"; - sha512 = "gM9ipBUdRxYa6Yq1Hd8Otg6jEn/dRxFZ1F9ZX4QHosHOexLGqNZO2dh0A+YFbUEd10RcKjnjb4jOfJJzoXXUew=="; + url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz"; + sha512 = "zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg=="; }; }; "mdast-util-gfm-table-0.1.6" = { @@ -41798,13 +41807,13 @@ let sha512 = "j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ=="; }; }; - "mdast-util-gfm-table-1.0.2" = { + "mdast-util-gfm-table-1.0.3" = { name = "mdast-util-gfm-table"; packageName = "mdast-util-gfm-table"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.2.tgz"; - sha512 = "pPekvCTChFBF8uCq8bVyQwar8NBU/TaXIy44jj/UzmjMgPBHIa1B1ge8a0JVgzhqgXQAMvGT+PgiKlicdLGfDQ=="; + url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.3.tgz"; + sha512 = "B/tgpJjND1qIZM2WZst+NYnb0notPE6m0J+YOe3NOHXyEmvK38ytxaOsgz4BvrRPQQcNbRrTzSHMPnBkj1fCjg=="; }; }; "mdast-util-gfm-task-list-item-0.1.6" = { @@ -41816,13 +41825,13 @@ let sha512 = "/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A=="; }; }; - "mdast-util-gfm-task-list-item-1.0.0" = { + "mdast-util-gfm-task-list-item-1.0.1" = { name = "mdast-util-gfm-task-list-item"; packageName = "mdast-util-gfm-task-list-item"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.0.tgz"; - sha512 = "dwkzOTjQe8JCCHVE3Cb0pLHTYLudf7t9WCAnb20jI8/dW+VHjgWhjtIUVA3oigNkssgjEwX+i+3XesUdCnXGyA=="; + url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz"; + sha512 = "KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA=="; }; }; "mdast-util-heading-style-1.0.6" = { @@ -41843,13 +41852,13 @@ let sha512 = "leKb9uG7laXdyFlTleYV4ZEaCpsxeU1LlkkR/xp35pgKrfV1Y0fNCuOw9vaRc2a9YDpH22wd145Wt7UY5yzeZw=="; }; }; - "mdast-util-mdx-expression-1.1.1" = { + "mdast-util-mdx-expression-1.2.0" = { name = "mdast-util-mdx-expression"; packageName = "mdast-util-mdx-expression"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.1.1.tgz"; - sha512 = "RDLRkBFmBKCJl6/fQdxxKL2BqNtoPFoNBmQAlj5ZNKOijIWRKjdhPkeufsUOaexLj+78mhJc+L7d1MYka8/LdQ=="; + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.2.0.tgz"; + sha512 = "wb36oi09XxqO9RVqgfD+xo8a7xaNgS+01+k3v0GKW0X0bYbeBmUZz22Z/IJ8SuphVlG+DNgNo9VoEaUJ3PKfJQ=="; }; }; "mdast-util-mdx-jsx-1.2.0" = { @@ -41861,13 +41870,13 @@ let sha512 = "5+ot/kfxYd3ChgEMwsMUO71oAfYjyRI3pADEK4I7xTmWLGQ8Y7ghm1CG36zUoUvDPxMlIYwQV/9DYHAUWdG4dA=="; }; }; - "mdast-util-mdxjs-esm-1.1.1" = { + "mdast-util-mdxjs-esm-1.2.0" = { name = "mdast-util-mdxjs-esm"; packageName = "mdast-util-mdxjs-esm"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.1.1.tgz"; - sha512 = "IpHNNMubCt6ue2FIQasx1ByvETglnqc7A3XvIc0Yyql1hNI73SEGa044dZG6jeJQE8boBdTn8nxs3DjQLvVN1w=="; + url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.2.0.tgz"; + sha512 = "IPpX9GBzAIbIRCjbyeLDpMhACFb0wxTIujuR3YElB8LWbducUdMgRJuqs/Vg8xQ1bIAMm7lw8L+YNtua0xKXRw=="; }; }; "mdast-util-to-markdown-0.6.5" = { @@ -41879,13 +41888,13 @@ let sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ=="; }; }; - "mdast-util-to-markdown-1.2.6" = { + "mdast-util-to-markdown-1.3.0" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.6.tgz"; - sha512 = "doJZmTEGagHypWvJ8ltinmwUsT9ZaNgNIQW6Gl7jNdsI1QZkTHTimYW561Niy2s8AEPAqEgV0dIh2UOVlSXUJA=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz"; + sha512 = "6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA=="; }; }; "mdast-util-to-nlcst-4.0.1" = { @@ -42392,13 +42401,13 @@ let sha512 = "AY9lGmUznFNsLr7Vm3hLCT7Ar0bN6Wninp3qA0E0/JBU4uRTRI4fIgM1I3+nbjLf23mwh+vrHut0ML63QB2acA=="; }; }; - "metalsmith-2.3.0" = { + "metalsmith-2.4.1" = { name = "metalsmith"; packageName = "metalsmith"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; - sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.4.1.tgz"; + sha512 = "k8Q6mEJL21GmcmAb7PuawSff68/GcV2ctyFyZgoQgSc+2MrdCZxkZPqQY0EfZ6o4KqsBvdHvgNYUMzZQGTmxBQ=="; }; }; "method-missing-1.2.4" = { @@ -42653,13 +42662,13 @@ let sha512 = "TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA=="; }; }; - "micromark-extension-mdx-jsx-1.0.2" = { + "micromark-extension-mdx-jsx-1.0.3" = { name = "micromark-extension-mdx-jsx"; packageName = "micromark-extension-mdx-jsx"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.2.tgz"; - sha512 = "MBppeDuXEBIL1uo4B/bL5eJ1q3m5pXzdzIWpOnJuzzBZF+S+9zbb5WnS2K/LEVQeoyiLzOuoteU4SFPuGJhhWw=="; + url = "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.3.tgz"; + sha512 = "VfA369RdqUISF0qGgv2FfV7gGjHDfn9+Qfiv5hEwpyr1xscRj/CiVRkU7rywGFCO7JwJ5L0e7CJz60lY52+qOA=="; }; }; "micromark-extension-mdx-md-1.0.0" = { @@ -42707,13 +42716,13 @@ let sha512 = "CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg=="; }; }; - "micromark-factory-mdx-expression-1.0.5" = { + "micromark-factory-mdx-expression-1.0.6" = { name = "micromark-factory-mdx-expression"; packageName = "micromark-factory-mdx-expression"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.5.tgz"; - sha512 = "1DSMCBeCUj4m01P8uYbNWvOsv+FtpDTcBUcDCdE06sENTBX54lndRs9neWOgsNWfLDm2EzCyNKiUaoJ+mWa/WA=="; + url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.6.tgz"; + sha512 = "WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA=="; }; }; "micromark-factory-space-1.0.0" = { @@ -42986,15 +42995,6 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.5.2" = { - name = "mime"; - packageName = "mime"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"; - sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; - }; - }; "mime-2.6.0" = { name = "mime"; packageName = "mime"; @@ -43031,6 +43031,15 @@ let sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; + "mime-db-1.42.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.42.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; + }; + }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -43076,6 +43085,15 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mime-types-2.1.25" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; + }; + }; "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; @@ -43247,6 +43265,15 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "minimatch-3.0.5" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw=="; + }; + }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -43607,13 +43634,13 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.1.4" = { + "mocha-9.2.0" = { name = "mocha"; packageName = "mocha"; - version = "9.1.4"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.4.tgz"; - sha512 = "+q2aV5VlJZuLgCWoBvGI5zEwPF9eEI0kr/sAA9Jm4xMND7RfIEyF8JE7C0JIg8WXRG+P1sdIAb5ccoHPlXLzcw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz"; + sha512 = "kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q=="; }; }; "mock-require-3.0.3" = { @@ -43958,15 +43985,6 @@ let sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; }; }; - "multer-1.4.3" = { - name = "multer"; - packageName = "multer"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.3.tgz"; - sha512 = "np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg=="; - }; - }; "multer-1.4.4" = { name = "multer"; packageName = "multer"; @@ -44102,13 +44120,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.7.2" = { + "multiserver-3.8.2" = { name = "multiserver"; packageName = "multiserver"; - version = "3.7.2"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.7.2.tgz"; - sha512 = "RaRSN/g1QOujNkFtmLU52PCjjqUdhad7FO/aZRRTzWkpJuclk0jfWtvew9jKp0mNqC6RhriEm0U1L1qYiymF8Q=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.8.2.tgz"; + sha512 = "gmR/5dY+N81EN0yDaziSJXAJhJjG+3Rv3lJc74OSA1ySRKOMqZwEuGJjqG6ZcZiaqcHvhQZkZavDJsAwtmnvoA=="; }; }; "multiserver-address-1.0.1" = { @@ -44120,13 +44138,13 @@ let sha512 = "IfZMAGs9onCLkYNSnNBri3JxuvhQYllMyh3W9ry86iEDcfW9uPVsHTHDsjDxQtL+dPq3byshmA+Y4LN2wLHwNw=="; }; }; - "multiserver-scopes-1.0.0" = { + "multiserver-scopes-2.0.0" = { name = "multiserver-scopes"; packageName = "multiserver-scopes"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver-scopes/-/multiserver-scopes-1.0.0.tgz"; - sha512 = "D3q4IujGRUIKETfR5s0kRtvXTjAMhyl7rtLEMXtvkg0lJPJyS5KYsAULFFy+dYv/+RC642aR1zo/RKNp6sdtQg=="; + url = "https://registry.npmjs.org/multiserver-scopes/-/multiserver-scopes-2.0.0.tgz"; + sha512 = "XWv9J617i3mWtZIZQNTpYI9iq4goUpsKy3GdUEDls23z1VaMzuRp2rL3S3IKrheVdgmrf0zHbErcXokGxqQfzw=="; }; }; "multistream-4.1.0" = { @@ -44255,13 +44273,13 @@ let sha512 = "pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg=="; }; }; - "muxrpc-6.5.4" = { + "muxrpc-6.7.0" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.5.4"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.4.tgz"; - sha512 = "puQFQi0qxZIUvvaikpwOuGnxM7smTwjnSu9lf0WVmfsXMFE8F355jBhsZQ29KuSaogZq3HA4IRbk15Uvuypc/g=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.0.tgz"; + sha512 = "1jdziESUd2ajBUJ/tvLRdm9TJQiN+JuN0NHtvubposhVUi8T5PF6ODfit6lg30l4iDxK4/z52wvbnHbsfvzT/w=="; }; }; "muxrpc-usage-2.1.0" = { @@ -44453,15 +44471,6 @@ let sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; - "nanoid-3.1.25" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.1.25"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; - sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; - }; - }; "nanoid-3.2.0" = { name = "nanoid"; packageName = "nanoid"; @@ -44606,13 +44615,13 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "ncjsm-4.2.0" = { + "ncjsm-4.3.0" = { name = "ncjsm"; packageName = "ncjsm"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.2.0.tgz"; - sha512 = "L2Qij4PTy7Bs4TB24zs7FLIAYJTaR5JPvSig5hIcO059LnMCNgy6MfHHNyg8s/aekPKrTqKX90gBGt3NNGvhdw=="; + url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.0.tgz"; + sha512 = "oah6YGwb4Ern2alojiMFcjPhE4wvQBw1Ur/kUr2P0ovKdzaF5pCIsGjs0f2y+iZeej0/5Y6OOhQ8j30cTDMEGw=="; }; }; "nconf-0.10.0" = { @@ -44795,15 +44804,6 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "negotiator-0.6.2" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; - }; - }; "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; @@ -45129,13 +45129,13 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; - "node-abi-3.5.0" = { + "node-abi-3.8.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.5.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.5.0.tgz"; - sha512 = "LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz"; + sha512 = "tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw=="; }; }; "node-abort-controller-3.0.1" = { @@ -45336,15 +45336,6 @@ let sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; }; - "node-fetch-2.6.5" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz"; - sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; - }; - }; "node-fetch-2.6.7" = { name = "node-fetch"; packageName = "node-fetch"; @@ -45588,13 +45579,22 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; - "node-red-admin-2.2.1" = { + "node-red-admin-2.2.2" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.1.tgz"; - sha512 = "xYp6mZaRbAWLR8nO4HRVvthYZoPGBotPvetAGho4AXpRJW7fXw38XwK0KPSffvLSis6cxaskJq9nZBLp3PJtng=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.2.tgz"; + sha512 = "BYW12wu73B2/wRY9g4Hx8/bxUDZLHqu0DcbCNW5vdTJ6cFOSK8QoSX6u4tl9kIAowRsX4LunVlXR3VUKIj3Vng=="; + }; + }; + "node-redis-pubsub-4.0.0" = { + name = "node-redis-pubsub"; + packageName = "node-redis-pubsub"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-redis-pubsub/-/node-redis-pubsub-4.0.0.tgz"; + sha512 = "sAUOzisio/8UYCRbjPo6+u7aTpBmxSBjTJYwu49x9KruIQgi//wbEnvbqGSH5JWViP7HyQSMtkHUcZXH7qGsOQ=="; }; }; "node-releases-1.1.77" = { @@ -45624,6 +45624,15 @@ let sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; + "node-schedule-1.3.2" = { + name = "node-schedule"; + packageName = "node-schedule"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-schedule/-/node-schedule-1.3.2.tgz"; + sha512 = "GIND2pHMHiReSZSvS6dpZcDH7pGPGFfWBIEud6S00Q8zEIzAs9ommdyRK1ZbQt8y1LyZsJYZgPnyi7gpU2lcdw=="; + }; + }; "node-ssdp-2.9.1" = { name = "node-ssdp"; packageName = "node-ssdp"; @@ -45696,6 +45705,15 @@ let sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="; }; }; + "node-watch-0.7.3" = { + name = "node-watch"; + packageName = "node-watch"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-watch/-/node-watch-0.7.3.tgz"; + sha512 = "3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ=="; + }; + }; "node-wsfederation-0.1.1" = { name = "node-wsfederation"; packageName = "node-wsfederation"; @@ -45786,6 +45804,15 @@ let sha512 = "K9nTVFOGUOYutaG8ywiKpCdVu458RFxSgSJ0rribUxtf5iLM9B2+raFJgkID3p5op0+twmoQqFaPnu9KYz6qzg=="; }; }; + "non-private-ip-2.2.0" = { + name = "non-private-ip"; + packageName = "non-private-ip"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/non-private-ip/-/non-private-ip-2.2.0.tgz"; + sha512 = "NZ3Upr3K2whD6vdZ9k8gHsijsrQl5O6IARLIUDyvQwSuO/owM1kOMu8wDMMsIR8ujlLvhPNjlTZC2SXzWwWByQ=="; + }; + }; "noop-fn-1.0.0" = { name = "noop-fn"; packageName = "noop-fn"; @@ -46191,6 +46218,15 @@ let sha512 = "jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="; }; }; + "npm-registry-fetch-12.0.1" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "12.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-12.0.1.tgz"; + sha512 = "ricy4ezH3Uv0d4am6RSwHjCYTWJI74NJjurIigWMAG7Vs3PFyd0TUlkrez5L0AgaPzDLRsEzqb5cOZ/Ue01bmA=="; + }; + }; "npm-registry-fetch-9.0.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -46606,15 +46642,6 @@ let sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; }; }; - "object-inspect-1.11.1" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz"; - sha512 = "If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="; - }; - }; "object-inspect-1.12.0" = { name = "object-inspect"; packageName = "object-inspect"; @@ -46804,13 +46831,13 @@ let sha512 = "eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="; }; }; - "obliterator-1.6.1" = { + "obliterator-2.0.1" = { name = "obliterator"; packageName = "obliterator"; - version = "1.6.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz"; - sha512 = "9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig=="; + url = "https://registry.npmjs.org/obliterator/-/obliterator-2.0.1.tgz"; + sha512 = "XnkiCrrBcIZQitJPAI36mrrpEUvatbte8hLcTcQwKA1v9NkCKasSi+UAguLsLDs/out7MoRzAlmz7VXvY6ph6w=="; }; }; "observ-0.2.0" = { @@ -46858,13 +46885,13 @@ let sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; - "office-ui-fabric-react-7.181.0" = { + "office-ui-fabric-react-7.181.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.181.0"; + version = "7.181.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.181.0.tgz"; - sha512 = "d2M2H3p07VuQl8MtmVXIwulmDbHT1yuM2VR9xWNxqBy+p2gp1qhMLgYKCqTJ2PMpHyCZgGTQ8lc68Zgjg5+RfA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.181.1.tgz"; + sha512 = "sZc0bOFqcv3JnTaWTU4OvaFJMKAmr+5jLKHLHCSFVVzShVSE3wlK4OauK7M46yc8edTEBUUDG14tdpA7+KNBUg=="; }; }; "omggif-1.0.10" = { @@ -46984,15 +47011,6 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "one-time-0.0.4" = { - name = "one-time"; - packageName = "one-time"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; - }; - }; "one-time-1.0.0" = { name = "one-time"; packageName = "one-time"; @@ -47110,15 +47128,6 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.1.0" = { - name = "open"; - packageName = "open"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.1.0.tgz"; - sha512 = "jB5hAtsDOhCy/FNQJwQJOrGlxLUat482Yr14rbA5l2Zb1eOeoS+ccQPO036C1+z9VDBTmOZqzh1tBbI4myzIYw=="; - }; - }; "open-8.4.0" = { name = "open"; packageName = "open"; @@ -47488,15 +47497,6 @@ let sha512 = "mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q=="; }; }; - "optional-0.1.4" = { - name = "optional"; - packageName = "optional"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz"; - sha512 = "gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw=="; - }; - }; "optionator-0.3.0" = { name = "optionator"; packageName = "optionator"; @@ -47965,6 +47965,15 @@ let sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; + "p-limit-4.0.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz"; + sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ=="; + }; + }; "p-locate-2.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -48307,6 +48316,15 @@ let sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; + "package-json-7.0.0" = { + name = "package-json"; + packageName = "package-json"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-7.0.0.tgz"; + sha512 = "CHJqc94AA8YfSLHGQT3DbvSIuE12NLFekpM4n7LRrAd3dOJtA911+4xe9q6nC3/jcKraq7nNS9VxgtT0KC+diA=="; + }; + }; "package-json-versionify-1.0.4" = { name = "package-json-versionify"; packageName = "package-json-versionify"; @@ -48334,13 +48352,13 @@ let sha512 = "kSxHpoTqlgNEetMp77snCTVILwLw4dJX6pB/z1g1PRG5xylH8cf9upIPygt+epBC3l14XrcZH4/kQYSrzp2Ijg=="; }; }; - "packet-stream-codec-1.1.3" = { + "packet-stream-codec-1.2.0" = { name = "packet-stream-codec"; packageName = "packet-stream-codec"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.3.tgz"; - sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; + url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.2.0.tgz"; + sha512 = "3xoTsSVqCPd+0mPsQGlfYm2ecvJK9tS1HOxrjnKEiB1Ynq0fOJHEXcZV/hxW6BkOSGBsGX7dTN8bjdNTU3nKBA=="; }; }; "pacote-11.3.5" = { @@ -48352,13 +48370,13 @@ let sha512 = "fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg=="; }; }; - "pacote-12.0.2" = { + "pacote-12.0.3" = { name = "pacote"; packageName = "pacote"; - version = "12.0.2"; + version = "12.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-12.0.2.tgz"; - sha512 = "Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-12.0.3.tgz"; + sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; }; }; "pad-0.0.5" = { @@ -49000,15 +49018,6 @@ let sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; }; }; - "passport-0.4.1" = { - name = "passport"; - packageName = "passport"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz"; - sha512 = "IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg=="; - }; - }; "passport-0.5.2" = { name = "passport"; packageName = "passport"; @@ -49414,13 +49423,13 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "peek-readable-4.0.2" = { + "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.2.tgz"; - sha512 = "9fMaz6zoxw9ypO1KZy5RDJgSupEtu0Q+g/OqqsVHX3rKGR8qehRLYzsFARZ4bVvdvfknKiXvuDbkMnO1g6cRpQ=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"; + sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; }; }; "peek-stream-1.1.3" = { @@ -49531,13 +49540,13 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-pool-3.4.1" = { + "pg-pool-3.5.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz"; - sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; + sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; }; }; "pg-protocol-1.5.0" = { @@ -49738,13 +49747,13 @@ let sha512 = "qEHLtKcmYcid6s2qjlGTxaLe9Lq1IiGmd74IZb9Obi/FRTaA+ymb8FD/cmOIL4vt6ug/EtmhGwxZbiGhI+7cuQ=="; }; }; - "pino-7.6.4" = { + "pino-7.6.5" = { name = "pino"; packageName = "pino"; - version = "7.6.4"; + version = "7.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-7.6.4.tgz"; - sha512 = "ktibPg3ttWONxYQ2Efk1zYbIvofD5zdd/ReoujK84ggEp0REflb9TsXavSjt8u1CdT2mMJe9QQ3ZpyOQxUKipA=="; + url = "https://registry.npmjs.org/pino/-/pino-7.6.5.tgz"; + sha512 = "38tAwlJ7HevMENHD5FZE+yxSlAH5Wg3FoOjbB3MX2j3/kgpOEkmDHhTVKkecR57qxD5doHo2yi9nac94gqqbiQ=="; }; }; "pino-abstract-transport-0.5.0" = { @@ -49792,13 +49801,13 @@ let sha1 = "f8436f8565ed1d97bf3a80632a5397bfd353385f"; }; }; - "pirates-4.0.4" = { + "pirates-4.0.5" = { name = "pirates"; packageName = "pirates"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz"; - sha512 = "ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw=="; + url = "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"; + sha512 = "8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="; }; }; "pixelmatch-4.0.2" = { @@ -50279,13 +50288,13 @@ let sha512 = "hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="; }; }; - "postcss-8.4.5" = { + "postcss-8.4.6" = { name = "postcss"; packageName = "postcss"; - version = "8.4.5"; + version = "8.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz"; - sha512 = "jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"; + sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; }; }; "postcss-calc-7.0.5" = { @@ -51224,6 +51233,15 @@ let sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; }; + "prebuild-install-7.0.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -51476,15 +51494,6 @@ let sha512 = "rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw=="; }; }; - "prettyoutput-1.2.0" = { - name = "prettyoutput"; - packageName = "prettyoutput"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prettyoutput/-/prettyoutput-1.2.0.tgz"; - sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw=="; - }; - }; "prfun-2.1.5" = { name = "prfun"; packageName = "prfun"; @@ -51503,13 +51512,13 @@ let sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; - "printj-1.1.2" = { + "printj-1.3.1" = { name = "printj"; packageName = "printj"; - version = "1.1.2"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"; - sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; + sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; }; }; "prism-media-0.0.4" = { @@ -51557,13 +51566,13 @@ let sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA=="; }; }; - "probing-2.0.2" = { + "probing-2.0.3" = { name = "probing"; packageName = "probing"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/probing/-/probing-2.0.2.tgz"; - sha512 = "M/gKs+NVTX4K7piUEs9geemQtyycv0UgOa4wiE4GkuudfZc/D+wd9W92juh1fK5noGzFhAYhxL0gNq9EFXL2wA=="; + url = "https://registry.npmjs.org/probing/-/probing-2.0.3.tgz"; + sha512 = "6PuKCNitH3pjTjHndVtSkb300EQCiYPKJCxfDHlu9uwEcjDc7Fipee8U9fTm5W8frVCB7Vo4V4dlwGL9WVL2OQ=="; }; }; "proc-log-1.0.0" = { @@ -51719,13 +51728,22 @@ let sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; - "prom-client-13.1.0" = { + "prom-client-12.0.0" = { name = "prom-client"; packageName = "prom-client"; - version = "13.1.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz"; - sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng=="; + url = "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz"; + sha512 = "JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ=="; + }; + }; + "prom-client-14.0.1" = { + name = "prom-client"; + packageName = "prom-client"; + version = "14.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prom-client/-/prom-client-14.0.1.tgz"; + sha512 = "HxTArb6fkOntQHoRGvv4qd/BkorjliiuO2uSWC2KC17MUTKYttWdDoXX/vxOhQdkoECEM9BBH0pj2l8G8kev6w=="; }; }; "promiscuous-0.6.0" = { @@ -52169,6 +52187,24 @@ let sha512 = "LLyJcNVKRK8AUXKcpCrZA21+mlrjzlzTLQZp/Yu279hqqQrakAu9IusT7zEddhhkQrzm6UQ9cER3nhrIZqh0hw=="; }; }; + "psbt-1.1.11" = { + name = "psbt"; + packageName = "psbt"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/psbt/-/psbt-1.1.11.tgz"; + sha512 = "giKihT0fBfEFrCg9zr186s5v4urZ4tsnzLseJKcXJLl80Mw0ckeGa+Ama5pw5gSyXpoQGpakg+CS0aCJr99dSw=="; + }; + }; + "psbt-2.0.0" = { + name = "psbt"; + packageName = "psbt"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psbt/-/psbt-2.0.0.tgz"; + sha512 = "V3RueLeXhP/WZETCtUxFn9aaEjHKdJIp2jir1rgK3iU0fV4hC0f45wDRDrrtcFHIUyvudgzhg6Bcgr8cGaWXlA=="; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -53087,13 +53123,22 @@ let sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; }; }; - "puppeteer-13.1.1" = { + "puppeteer-13.1.3" = { name = "puppeteer"; packageName = "puppeteer"; - version = "13.1.1"; + version = "13.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.1.tgz"; - sha512 = "GwdFy1JQ43Hhxj6MraXme+XfCX2CKe18MuwToXTMEAk0txg6vUEgwqBnzErTTqDVZ7sWYrDtDaRCfD2y7ZwgGw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.3.tgz"; + sha512 = "nqcJNThLUG0Dgo++2mMtGR2FCyg7olJJhj/rm0A65muyN3nrH6lGvnNRzEaNmSnHWvjaDIG9ox5kxQB+nXTg5A=="; + }; + }; + "purest-3.1.0" = { + name = "purest"; + packageName = "purest"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/purest/-/purest-3.1.0.tgz"; + sha512 = "9slCC5je2UNERS/YNcrs1/7K5Bh7Uvl6OY1S+XZ6iDNMCwk8Fio6VBdrklo7eMzt5M/Wt2fQlwXRjn4puBccRQ=="; }; }; "purgecss-2.3.0" = { @@ -53141,13 +53186,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.214" = { + "pyright-1.1.219" = { name = "pyright"; packageName = "pyright"; - version = "1.1.214"; + version = "1.1.219"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.214.tgz"; - sha512 = "miNDlJV7pfaZuzRD6NKbUebcC2Ko9P1IjbqNd0wcnFepaVxdhHgxl544GkM59tjYlS/YgwuiiCAzW/icIFI/9g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.219.tgz"; + sha512 = "Efxav0PuY8Svs3V1RRxoUconLfCGng4eBtPzeyVHNTqASPtGSd1+GwMrWNOfnfZfz+8kxuB9R5SzWRb4z6L+2w=="; }; }; "q-0.9.7" = { @@ -53402,13 +53447,13 @@ let sha512 = "XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw=="; }; }; - "query-string-7.1.0" = { + "query-string-7.1.1" = { name = "query-string"; packageName = "query-string"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz"; - sha512 = "wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g=="; + url = "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz"; + sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; }; }; "querystring-0.2.0" = { @@ -53609,15 +53654,6 @@ let sha512 = "GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ=="; }; }; - "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=="; - }; - }; "ramda-0.27.2" = { name = "ramda"; packageName = "ramda"; @@ -54005,13 +54041,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.22.1" = { + "react-devtools-core-4.23.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.22.1"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.22.1.tgz"; - sha512 = "pvpNDHE7p0FtcCmIWGazoY8LLVfBI9sw0Kf10kdHhPI9Tzt3OG/qEt16GrAbE0keuna5WzX3r1qPKVjqOqsuUg=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.23.0.tgz"; + sha512 = "KkzneT1LczFtebbTJlvRphIRvzuHLhI9ghfrseVv9ktBs+l2cXy8Svw5U16lzQnwU9okVEcURmGPgH79WWrlaw=="; }; }; "react-dom-16.14.0" = { @@ -54779,6 +54815,24 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; + "redis-2.8.0" = { + name = "redis"; + packageName = "redis"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; + }; + }; + "redis-3.1.1" = { + name = "redis"; + packageName = "redis"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-3.1.1.tgz"; + sha512 = "QhkKhOuzhogR1NDJfBD34TQJz2ZJwDhhIC6ZmvpftlmfYShHHQXjjNspAJ+Z2HH5NwSBVYBVganbiZ8bgFMHjg=="; + }; + }; "redis-3.1.2" = { name = "redis"; packageName = "redis"; @@ -54806,6 +54860,15 @@ let sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; }; }; + "redis-parser-2.6.0" = { + name = "redis-parser"; + packageName = "redis-parser"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; + sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; + }; + }; "redis-parser-3.0.0" = { name = "redis-parser"; packageName = "redis-parser"; @@ -54815,13 +54878,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.59" = { + "redoc-2.0.0-rc.63" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.59"; + version = "2.0.0-rc.63"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.59.tgz"; - sha512 = "1Wkj/HSCv5CdtwF7FSZc5L0EeBgI0N7YpAIsatMtfiMHEon0WhuArAkc5rMQ6mQXUPRrqq5Fs6QPc4GpNp6DuA=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.63.tgz"; + sha512 = "PsoPqRyNqHi7+jKUyFBwJhHrzjMl4N5vieTeBloRGbhWuY3PPH2DJ3ihgrLfdEV0glzq/LMTaqfarm8WLqCc4Q=="; }; }; "reduce-component-1.0.1" = { @@ -54896,13 +54959,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-9.0.0" = { + "regenerate-unicode-properties-10.0.1" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "9.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"; - sha512 = "3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"; + sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; }; }; "regenerator-runtime-0.10.5" = { @@ -55004,13 +55067,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-4.8.0" = { + "regexpu-core-5.0.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.8.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"; - sha512 = "1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"; + sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; }; }; "register-protocol-win32-1.1.0" = { @@ -55067,22 +55130,22 @@ let sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; - "regjsgen-0.5.2" = { + "regjsgen-0.6.0" = { name = "regjsgen"; packageName = "regjsgen"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; - sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"; + sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="; }; }; - "regjsparser-0.7.0" = { + "regjsparser-0.8.4" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.7.0"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"; - sha512 = "A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"; + sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="; }; }; "rehype-parse-6.0.2" = { @@ -55103,13 +55166,13 @@ let sha512 = "fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw=="; }; }; - "rehype-parse-8.0.3" = { + "rehype-parse-8.0.4" = { name = "rehype-parse"; packageName = "rehype-parse"; - version = "8.0.3"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-8.0.3.tgz"; - sha512 = "RGw0CVt+0S6KdvpE8bbP2Db9WXclQcIX7A0ufM3QFqAhTo/ddJMQrrI2j3cijlRPZlGK8R3pRgC8U5HyV76IDw=="; + url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-8.0.4.tgz"; + sha512 = "MJJKONunHjoTh4kc3dsM1v3C9kGrrxvA3U8PxZlP2SjH8RNUSrb+lF7Y0KVaUDnGH2QZ5vAn7ulkiajM9ifuqg=="; }; }; "rehype-retext-2.0.4" = { @@ -55994,15 +56057,6 @@ let sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c"; }; }; - "replaceall-0.1.6" = { - name = "replaceall"; - packageName = "replaceall"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/replaceall/-/replaceall-0.1.6.tgz"; - sha1 = "81d81ac7aeb72d7f5c4942adf2697a3220688d8e"; - }; - }; "request-2.76.0" = { name = "request"; packageName = "request"; @@ -56057,6 +56111,15 @@ let sha1 = "f017ac5b2060e1c4fc9677575c381a08249d5bf7"; }; }; + "request-compose-1.2.3" = { + name = "request-compose"; + packageName = "request-compose"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/request-compose/-/request-compose-1.2.3.tgz"; + sha512 = "i2m8y3kEveoaAVTsTqig2LmWI10bUdakqzIVHkTEAK8kcsr4a/+iL93tsujsLaMiCZmnB1Osdk3WEMsB//H66A=="; + }; + }; "request-light-0.2.5" = { name = "request-light"; packageName = "request-light"; @@ -56084,6 +56147,15 @@ let sha512 = "i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw=="; }; }; + "request-oauth-0.0.3" = { + name = "request-oauth"; + packageName = "request-oauth"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/request-oauth/-/request-oauth-0.0.3.tgz"; + sha512 = "q7WdJlpIcPaIDac0FZSy/yH37FO3UkUuPDIsiLALiLjuC6vzvuKIU14YIC3Lm0wtQRXS9GqvSo/fCYj8n75xSw=="; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -56255,15 +56327,6 @@ let sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; }; }; - "resolve-1.20.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; - }; - }; "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; @@ -57308,6 +57371,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -57434,13 +57506,13 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.49.0" = { + "sass-1.49.7" = { name = "sass"; packageName = "sass"; - version = "1.49.0"; + version = "1.49.7"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz"; - sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz"; + sha512 = "13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ=="; }; }; "sax-0.5.8" = { @@ -57650,6 +57722,15 @@ let sha512 = "5w3SlraZgFADOa5ScmJIXB/D/Qm2rFksmRNHSs913P9Z6s9ODsknAi85zni1v0KmTd4DovNKxHr3HCObYHes7Q=="; }; }; + "section-matter-1.0.0" = { + name = "section-matter"; + packageName = "section-matter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz"; + sha512 = "vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA=="; + }; + }; "secure-compare-3.0.1" = { name = "secure-compare"; packageName = "secure-compare"; @@ -58019,6 +58100,15 @@ let sha1 = "ae02af3a424793d8ccbf212d69174e0c54dffe38"; }; }; + "serialize-error-2.1.0" = { + name = "serialize-error"; + packageName = "serialize-error"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz"; + sha1 = "50b679d5635cdf84667bdc8e59af4e5b81d5f60a"; + }; + }; "serialize-error-6.0.0" = { name = "serialize-error"; packageName = "serialize-error"; @@ -58415,15 +58505,6 @@ let sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; }; - "shelljs-0.3.0" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; - sha1 = "3596e6307a781544f591f37da618360f31db57b1"; - }; - }; "shelljs-0.7.8" = { name = "shelljs"; packageName = "shelljs"; @@ -58613,13 +58694,13 @@ let sha512 = "a8IzM3jNPSHcf2wSkhLgME4QrIe+rKTb8y/qYwGGzby5ktODAH+WBsKIgGZ9p5d2mpppPwbNEsA+YzcL117bbA=="; }; }; - "signal-exit-3.0.6" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "signals-1.0.0" = { @@ -58649,31 +58730,31 @@ let sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; - "simple-get-2.8.1" = { + "simple-get-2.8.2" = { name = "simple-get"; packageName = "simple-get"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz"; - sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.2.tgz"; + sha512 = "Ijd/rV5o+mSBBs4F/x9oDPtTx9Zb6X9brmnXvMW4J7IR15ngi9q5xxqWBKU744jTZiaXtxaPL7uHG6vtN8kUkw=="; }; }; - "simple-get-3.1.0" = { + "simple-get-3.1.1" = { name = "simple-get"; packageName = "simple-get"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz"; - sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz"; + sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA=="; }; }; - "simple-get-4.0.0" = { + "simple-get-4.0.1" = { name = "simple-get"; packageName = "simple-get"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz"; - sha512 = "ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; "simple-git-1.132.0" = { @@ -59126,15 +59207,6 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; - "snappy-6.3.5" = { - name = "snappy"; - packageName = "snappy"; - version = "6.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/snappy/-/snappy-6.3.5.tgz"; - sha512 = "lonrUtdp1b1uDn1dbwgQbBsb5BbaiLeKq+AGwOk2No+en+VvJThwmtztwulEQsLinRF681pBqib0NUZaizKLIA=="; - }; - }; "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; @@ -59216,15 +59288,6 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; - "socket.io-4.1.3" = { - name = "socket.io"; - packageName = "socket.io"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; - sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; - }; - }; "socket.io-4.4.1" = { name = "socket.io"; packageName = "socket.io"; @@ -59396,13 +59459,13 @@ let sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; }; }; - "socks-2.6.1" = { + "socks-2.6.2" = { name = "socks"; packageName = "socks"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz"; - sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz"; + sha512 = "zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA=="; }; }; "socks-proxy-agent-5.0.1" = { @@ -59495,13 +59558,13 @@ let sha512 = "Uk+JpqHEbzsEmiMxwL7TB/ndhMEpc52KdReYXXSIX2oRFPaI7ZDlDImF8KbkFWbYl9BJRtc82AZ/kNf4/0n9KA=="; }; }; - "sodium-javascript-0.7.4" = { + "sodium-javascript-0.8.0" = { name = "sodium-javascript"; packageName = "sodium-javascript"; - version = "0.7.4"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.7.4.tgz"; - sha512 = "YUkucU81C0SUYzxcFFLOupOj89BlKA8MU8iTc7vTtd9hwgM/Awxwzz3tuoLGLHhnMxotUBB7Xl0rBeSoIn2yGQ=="; + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.8.0.tgz"; + sha512 = "rEBzR5mPxPES+UjyMDvKPIXy9ImF17KOJ32nJNi9uIquWpS/nfj+h6m05J5yLJaGXjgM72LmQoUbWZVxh/rmGg=="; }; }; "sodium-native-2.4.9" = { @@ -59531,13 +59594,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sodium-universal-3.0.4" = { + "sodium-universal-3.1.0" = { name = "sodium-universal"; packageName = "sodium-universal"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-3.0.4.tgz"; - sha512 = "WnBQ0GDo/82shKQHZBZT9h4q4miCtxkbzcwVLsCBPWNq4qbq8BXhKICt9nPwQAsJ43ct/rF61FKu4t0druUBug=="; + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-3.1.0.tgz"; + sha512 = "N2gxk68Kg2qZLSJ4h0NffEhp4BjgWHCHXVlDi1aG1hA3y+ZeWEmHqnpml8Hy47QzfL1xLy5nwr9LcsWAg2Ep0A=="; }; }; "sonic-boom-2.4.2" = { @@ -60377,13 +60440,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.8.6" = { + "ssb-db2-2.8.9" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.8.6"; + version = "2.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.6.tgz"; - sha512 = "cL0FSxGvAxBhX3MMhsJG0wkhRaqF+OwiRPu/a/5QTmk3fYmlhSx51Qgmd9F13Iu90jZVhdOjmrw4RZQN00/stQ=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.9.tgz"; + sha512 = "0v6EIq+MrQbe5wO+0JGeNUY9fs8dA2/vcgGOQSqYKl2dkxKB4uu8g6z6GRtlcSP7iGxW+Zv7jk/09b3p1ahE4g=="; }; }; "ssb-ebt-5.6.7" = { @@ -60620,13 +60683,13 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; - "ssb-typescript-2.5.0" = { + "ssb-typescript-2.6.0" = { name = "ssb-typescript"; packageName = "ssb-typescript"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz"; - sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA=="; + url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.6.0.tgz"; + sha512 = "igmpdzV0rpZq5L07maQlvKOidQWBbFC08ZqsqAnTEEyPOPH6ElQ4/n3dNnPj2UlSRRrqs9DdeCYTmKUckvTkVA=="; }; }; "ssb-unix-socket-1.0.0" = { @@ -60638,13 +60701,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-uri2-1.6.0" = { + "ssb-uri2-1.6.1" = { name = "ssb-uri2"; packageName = "ssb-uri2"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.6.0.tgz"; - sha512 = "Iihj9z5g67NV5vwewvo1XdYS05Wu3I6MVIhruN+/zqlXUfLmpeKZzyKOgszfDgbpVJvADm4/0Dj/mj7uAEf9OQ=="; + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.6.1.tgz"; + sha512 = "smCmD1KVDyRh7yMEcIrDFU1AN89xaPdLxYApg0tqxBW2/GVoepKTA24UqsvMzvYxLdPmiNQhxY7A7vhma2mI2A=="; }; }; "ssb-validate-4.1.4" = { @@ -60683,13 +60746,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.180" = { + "sscaff-1.2.194" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.180"; + version = "1.2.194"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.180.tgz"; - sha512 = "Cvyq1YACYkREBswBXckOPX31ega2XnRsDUqhKCWZwC+bI8UXBR2ijGnI+jW3x2tlFw7N+HyO3ZR2WfXqWjjS+Q=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.194.tgz"; + sha512 = "tibufYPgbt8QUTht4Vnh/e6cpzR0MNRbT+oQCLOgZsW9Fe9o3C4ym2MPe02HBRQ9SM5u5o1wvjsNs/O6wdGicA=="; }; }; "ssh-config-1.1.6" = { @@ -60872,13 +60935,13 @@ let sha1 = "23e5168fa1c0820189e5812701a79058510d0d34"; }; }; - "stat-mode-0.2.2" = { + "stat-mode-1.0.0" = { name = "stat-mode"; packageName = "stat-mode"; - version = "0.2.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; - sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; }; "state-toggle-1.0.3" = { @@ -61349,13 +61412,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.12.0" = { + "streamx-2.12.1" = { name = "streamx"; packageName = "streamx"; - version = "2.12.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.12.0.tgz"; - sha512 = "PR93KgPkga2p27UhCI9lf096qPyRMDn/zemRQeAgr1azVLDMr8tZZGpgfEw2/cYY/8mTU4dshLMGNYBsNeQGQw=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.12.1.tgz"; + sha512 = "zZVaQ5ows8ACQ+5H/0NTTZmYN5+kbNry5yxB6//wnKd5AEB8tKjMdMQXeZkIxerNiXpf2Fg0BhRe78SvgoSpCQ=="; }; }; "strftime-0.10.1" = { @@ -62006,13 +62069,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.2.4" = { + "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.4"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz"; - sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz"; + sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; "structured-source-3.0.2" = { @@ -62042,6 +62105,15 @@ let sha512 = "ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg=="; }; }; + "style-loader-3.3.1" = { + name = "style-loader"; + packageName = "style-loader"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz"; + sha512 = "GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="; + }; + }; "style-search-0.1.0" = { name = "style-search"; packageName = "style-search"; @@ -62456,13 +62528,13 @@ let sha1 = "5a7f8a20a71188cf9e75a2cfe8eb182de90daf3b"; }; }; - "svelte-3.46.2" = { + "svelte-3.46.4" = { name = "svelte"; packageName = "svelte"; - version = "3.46.2"; + version = "3.46.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.46.2.tgz"; - sha512 = "RXSAtYNefe01Sb1lXtZ2I+gzn3t/h/59hoaRNeRrm8IkMIu6BSiAkbpi41xb+C44x54YKnbk9+dtfs3pM4hECA=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.46.4.tgz"; + sha512 = "qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg=="; }; }; "svelte-preprocess-4.10.2" = { @@ -62474,13 +62546,13 @@ let sha512 = "aPpkCreSo8EL/y8kJSa1trhiX0oyAtTjlNNM7BNjRAsMJ8Yy2LtqHt0zyd4pQPXt+D4PzbO3qTjjio3kwOxDlA=="; }; }; - "svelte2tsx-0.4.14" = { + "svelte2tsx-0.5.2" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.14"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.14.tgz"; - sha512 = "udF0Z/DA98OfjPFBU1GBJRpYHEvsxA8ozwYVN08AOWMnQyxoSyWWlYspiq2m9xAjLo/pWnhec9z1d6jc9umqjA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.2.tgz"; + sha512 = "d9TzGleVLoVDdTdTWblKKg+xTMmgDznraYyj9eFTHiGAr6u2mgsyklIIa0e/hVVElzWUanRw0msl1zpmQFZAZg=="; }; }; "sver-compat-1.5.0" = { @@ -62762,13 +62834,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.10.7" = { + "systeminformation-5.11.2" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.10.7"; + version = "5.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.10.7.tgz"; - sha512 = "elAv0h67BDuafy+zuS/yF9QCgQcROXaK9AXMnLz+NHq/LRv7p2/k5qWIwaVxwsSZE8r+dVyIw0BtFO/FoHtZaw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.2.tgz"; + sha512 = "/6+p1ze2curwSMZQgQ9Gv4eLgtAaX9ROBEVELddkYy7llpP0SQjpSx4qDFEBscxqm/6yu+Khwi0Pneoy/wTwVg=="; }; }; "sywac-1.3.0" = { @@ -62852,15 +62924,6 @@ let sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14"; }; }; - "tabtab-3.0.2" = { - name = "tabtab"; - packageName = "tabtab"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tabtab/-/tabtab-3.0.2.tgz"; - sha512 = "jANKmUe0sIQc/zTALTBy186PoM/k6aPrh3A7p6AaAfF6WPSbTx1JYeGIGH162btpH+mmVEXln+UxwViZHO2Jhg=="; - }; - }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { name = "tabtab"; packageName = "tabtab"; @@ -62943,13 +63006,13 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; - "tape-4.14.0" = { + "tape-4.15.0" = { name = "tape"; packageName = "tape"; - version = "4.14.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.14.0.tgz"; - sha512 = "z0+WrUUJuG6wIdWrl4W3rTte2CR26G6qcPOj3w1hfRdcmhF3kHBhOBW9VHsPVAkz08ZmGzp7phVpDupbLzrYKQ=="; + url = "https://registry.npmjs.org/tape/-/tape-4.15.0.tgz"; + sha512 = "SfRmG2I8QGGgJE/MCiLH8c11L5XxyUXxwK9xLRD0uiK5fehRkkSZGmR6Y1pxOt8vJ19m3sY+POTQpiaVv45/LQ=="; }; }; "tar-0.1.17" = { @@ -63258,15 +63321,6 @@ let sha512 = "biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="; }; }; - "tencent-serverless-http-1.3.2" = { - name = "tencent-serverless-http"; - packageName = "tencent-serverless-http"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tencent-serverless-http/-/tencent-serverless-http-1.3.2.tgz"; - sha512 = "HgIu9HuBdY0lx3jLKuicOSOrjmieklPh55x8ZmtuTnrZ5v1buAPUfLKBhTeBSz6e90ggyW+dPr5PWdz179kUkw=="; - }; - }; "term-canvas-0.0.5" = { name = "term-canvas"; packageName = "term-canvas"; @@ -63384,13 +63438,13 @@ let sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; }; }; - "terser-webpack-plugin-5.3.0" = { + "terser-webpack-plugin-5.3.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz"; - sha512 = "LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz"; + sha512 = "GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g=="; }; }; "test-exclude-6.0.0" = { @@ -63915,13 +63969,13 @@ let sha512 = "FmqJZGduTyvsr2cF3375fqGHUovSwDi/QytexX1Se4BPuPZpTE5Ftp5fg+EFSuEf3lhZqgCRjEG3ydUQ/aNiwA=="; }; }; - "tiny-secp256k1-2.1.2" = { + "tiny-secp256k1-2.2.0" = { name = "tiny-secp256k1"; packageName = "tiny-secp256k1"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.1.2.tgz"; - sha512 = "8qPw7zDK6Hco2tVGYGQeOmOPp/hZnREwy2iIkcq0ygAuqc9WHo29vKN94lNymh1QbB3nthtAMF6KTIrdbsIotA=="; + url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.2.0.tgz"; + sha512 = "2hPuUGCroLrxh6xxwoe+1RgPpOOK1w2uTnhgiHBpvoutBR+krNuT4hOXQyOaaYnZgoXBB6hBYkuAJHxyeBOPzQ=="; }; }; "tinycolor-0.0.1" = { @@ -64302,15 +64356,6 @@ let sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w=="; }; }; - "toml-2.3.6" = { - name = "toml"; - packageName = "toml"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz"; - sha512 = "gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="; - }; - }; "too-hot-1.0.0" = { name = "too-hot"; packageName = "too-hot"; @@ -65076,6 +65121,15 @@ let sha512 = "G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q=="; }; }; + "tus-js-client-2.1.1" = { + name = "tus-js-client"; + packageName = "tus-js-client"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-2.1.1.tgz"; + sha512 = "ILpgHlR0nfKxmlkXfrZ2z61upkHEXhADOGbGyvXSPjp7bn1NhU50p/Mu59q577Xirayr9vlW4tmoFqUrHKcWeQ=="; + }; + }; "tv4-1.3.0" = { name = "tv4"; packageName = "tv4"; @@ -65175,13 +65229,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.5.0" = { + "type-2.6.0" = { name = "type"; packageName = "type"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.5.0.tgz"; - sha512 = "180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="; + url = "https://registry.npmjs.org/type/-/type-2.6.0.tgz"; + sha512 = "eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ=="; }; }; "type-check-0.3.2" = { @@ -65337,13 +65391,13 @@ let sha512 = "u2yreDMllFI3VCpWt0rKrGs/E2LO0YHBwiiOIj+ilQh9+ALMaa4lNBSdoDvuHN3cbKcYk9L1BXP49x9RT+o/SA=="; }; }; - "type-fest-2.8.0" = { + "type-fest-2.11.1" = { name = "type-fest"; packageName = "type-fest"; - version = "2.8.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.8.0.tgz"; - sha512 = "O+V9pAshf9C6loGaH0idwsmugI2LxVNR7DtS40gVo2EXZVYFgz9OuNtOhgHLdHdapOEWNdvz9Ob/eeuaWwwlxA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.11.1.tgz"; + sha512 = "fPcV5KLAqFfmhHobtAUwEpbpfYhVF7wSLVgbG/7mIGe/Pete7ky/bPAPRkzbWdrj0/EkswFAAR2feJCgigkUKg=="; }; }; "type-fest-2.9.0" = { @@ -65427,13 +65481,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.7.0" = { + "typegram-3.8.0" = { name = "typegram"; packageName = "typegram"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.7.0.tgz"; - sha512 = "IafMO+GRi5H8CtWSNihuD56Bjpmj/ISbg6G8jdTkNxldrym+FOPlo/fxtaPs/LyWnS0l1Bm18MUDwOikZSKmJw=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.8.0.tgz"; + sha512 = "MdlbWu0HfmgFJf4+xj6eqGYuanV2LJxBYTzLrD0kTV+woQ5dxDD2k8UVVjYnbBGkAagAyxzQevPiFZRWLFHSBw=="; }; }; "typescript-2.9.2" = { @@ -65634,13 +65688,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.14.5" = { + "uglify-js-3.15.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.5"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz"; - sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz"; + sha512 = "x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg=="; + }; + }; + "uglify-js-3.15.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz"; + sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; }; "uglify-js-3.4.10" = { @@ -65967,13 +66030,13 @@ let sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50"; }; }; - "undici-4.12.2" = { + "undici-4.13.0" = { name = "undici"; packageName = "undici"; - version = "4.12.2"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-4.12.2.tgz"; - sha512 = "RZj6SbkQFs5O/pJCboGEo6l5DTCe3Zg4r/8Z/0/2qnIv08+s6zL4akohOPMYWKc3mzwv15WTvsfMWaafZcvYoQ=="; + url = "https://registry.npmjs.org/undici/-/undici-4.13.0.tgz"; + sha512 = "8lk8S/f2V0VUNGf2scU2b+KI2JSzEQLdCyRNRF3XmHu+5jectlSDaPSBCXAHFaUlt1rzngzOBVDgJS9/Gue/KA=="; }; }; "unherit-1.1.3" = { @@ -66606,13 +66669,13 @@ let sha512 = "y+QVLcY5eR/YVpqDsLf/xh9R3Q2Y4HxkZTp7ViLDU6WtJCEcPmRzW1gpdWDCDIqIlhuPDXOgttqPlykrHYDekg=="; }; }; - "universal-analytics-0.4.23" = { + "universal-analytics-0.5.3" = { name = "universal-analytics"; packageName = "universal-analytics"; - version = "0.4.23"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz"; - sha512 = "lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A=="; + url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.5.3.tgz"; + sha512 = "HXSMyIcf2XTvwZ6ZZQLfxfViRm/yTGoRgDeTbojtq6rezeyKB0sTBcKH2fhddnteAHRcHiKgr/ACpbgjGOC6RQ=="; }; }; "universal-url-2.0.0" = { @@ -67137,22 +67200,22 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.3" = { + "url-toolkit-2.2.5" = { name = "url-toolkit"; packageName = "url-toolkit"; - version = "2.2.3"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz"; - sha512 = "Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="; + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz"; + sha512 = "mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg=="; }; }; - "urlencode-1.1.0" = { - name = "urlencode"; - packageName = "urlencode"; - version = "1.1.0"; + "url-value-parser-2.1.0" = { + name = "url-value-parser"; + packageName = "url-value-parser"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/urlencode/-/urlencode-1.1.0.tgz"; - sha1 = "1f2ba26f013c85f0133f7a3ad6ff2730adf7cbb7"; + url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.1.0.tgz"; + sha512 = "gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw=="; }; }; "urlsafe-base64-1.0.0" = { @@ -67660,6 +67723,15 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; + "validator-12.2.0" = { + name = "validator"; + packageName = "validator"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz"; + sha512 = "jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ=="; + }; + }; "validator-13.7.0" = { name = "validator"; packageName = "validator"; @@ -68569,13 +68641,13 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-5.1.9" = { + "vscode-css-languageservice-5.1.12" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "5.1.9"; + version = "5.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.9.tgz"; - sha512 = "/tFOWeZBL3Oc9Zc+2MAi3rEwiXJTSZsvjB+M7nSjWLbGPUIjukUA7YzLgsBoUfR35sPJYnXWUkL56PdfIYM8GA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.12.tgz"; + sha512 = "293C5C2732Rbhh3opTs+nQBpC5Dd+oYrEA8lc0OWdyt40oYmJ331FV7NMF1SLFSIcOFB5XveLiWUZak2oyc49Q=="; }; }; "vscode-debugadapter-testsupport-1.51.0" = { @@ -68668,15 +68740,6 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-4.1.10" = { - name = "vscode-json-languageservice"; - packageName = "vscode-json-languageservice"; - version = "4.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.10.tgz"; - sha512 = "IHliMEEYSY0tJjJt0ECb8ESx/nRXpoy9kN42WVQXgaqGyizFAf3jibSiezDQTrrY7f3kywXggCU+kkJEM+OLZQ=="; - }; - }; "vscode-json-languageservice-4.1.7" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; @@ -68695,13 +68758,13 @@ let sha512 = "0vSpg6Xd9hfV+eZAaYN63xVVMOTmJ4GgHxXnkLCh+9RsQBkWKIghzLhW2B9ebfG+LQQg8uLtsQ2aUKjTgE+QOg=="; }; }; - "vscode-json-languageservice-4.2.0-next.2" = { + "vscode-json-languageservice-4.2.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.2.0-next.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.0-next.2.tgz"; - sha512 = "P0sdiZS7bM8+bxrkpL7XPwwhmZj94pcJIAZUh/QeessvYtXFnRmOEybe20rC+CS7b7DfwFcVt0p4p93hGZQ5gg=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.0.tgz"; + sha512 = "XNawv0Vdy/sUK0S+hGf7cq/qsVAbIniGJr89TvZOqMCNJmpgKTy1e8PL1aWW0uy6BfWMG7vxa5lZb3ypuFtuGQ=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -68776,13 +68839,13 @@ let sha512 = "gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA=="; }; }; - "vscode-jsonrpc-8.0.0-next.5" = { + "vscode-jsonrpc-8.0.0-next.6" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.0.0-next.5"; + version = "8.0.0-next.6"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.5.tgz"; - sha512 = "owRllqcFTnz5rXxcbmHPFGmpFmLqj9Z1V3Dzrv+s8ejOHLIT62Pyb5Uqzyl2/in2VP22DmzErPgZwrxjLCIKiQ=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.6.tgz"; + sha512 = "6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw=="; }; }; "vscode-languageclient-4.0.1" = { @@ -68884,13 +68947,13 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; - "vscode-languageserver-8.0.0-next.6" = { + "vscode-languageserver-8.0.0-next.8" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.0.0-next.6"; + version = "8.0.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.6.tgz"; - sha512 = "RgGRAsXUksdtCrhtxFUeMXzqE4C/7AHSR6loIQY3GFDNIqrlEIkkQZg2Kkouf/i+eE/Iummn2ZB85VKNTBQgsQ=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.8.tgz"; + sha512 = "Gq0uqKbOgw7YNwPxMoNCeh7mHKMhG5j6EuoSh+w5pnKd7Eu9a74cagqf9aZDVFWW6GRpqR/Z+1o6EXqDK+g2Tg=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -68929,13 +68992,13 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.12" = { + "vscode-languageserver-protocol-3.17.0-next.14" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.12"; + version = "3.17.0-next.14"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.12.tgz"; - sha512 = "VLRcWKOpCXcx9UrqrS+NSF6pNxV498VGYGW+eyp9a79/F9ElUq3wdG6acXYlEfpWHuIxpm6MXps8FU88wqIgTg=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.14.tgz"; + sha512 = "iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA=="; }; }; "vscode-languageserver-protocol-3.17.0-next.5" = { @@ -68983,13 +69046,13 @@ let sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; }; }; - "vscode-languageserver-textdocument-1.0.3" = { + "vscode-languageserver-textdocument-1.0.4" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.3.tgz"; - sha512 = "ynEGytvgTb6HVSUwPJIAZgiHQmPCx8bZ8w5um5Lz+q5DjP0Zj8wTFhQpyg8xaMvefDytw2+HH5yzqS+FhsR28A=="; + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz"; + sha512 = "/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ=="; }; }; "vscode-languageserver-types-3.14.0" = { @@ -69055,13 +69118,13 @@ let sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; }; }; - "vscode-languageserver-types-3.17.0-next.6" = { + "vscode-languageserver-types-3.17.0-next.7" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.17.0-next.6"; + version = "3.17.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.6.tgz"; - sha512 = "rHYeCotiabJHgvIYzWjV8g0dHCxyOQtcryTv1Xa1horaQ4jx2V+rjLBstc6zMpCyrnZcjorwEcAvGBDCd6wudw=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.7.tgz"; + sha512 = "KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg=="; }; }; "vscode-languageserver-types-3.5.0" = { @@ -69649,13 +69712,13 @@ let sha512 = "NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg=="; }; }; - "webpack-5.67.0" = { + "webpack-5.68.0" = { name = "webpack"; packageName = "webpack"; - version = "5.67.0"; + version = "5.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz"; - sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz"; + sha512 = "zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -69676,13 +69739,13 @@ let sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; - "webpack-cli-4.9.1" = { + "webpack-cli-4.9.2" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz"; - sha512 = "JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz"; + sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; }; }; "webpack-core-0.6.9" = { @@ -69703,13 +69766,13 @@ let sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; }; }; - "webpack-dev-middleware-5.3.0" = { + "webpack-dev-middleware-5.3.1" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz"; - sha512 = "MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg=="; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz"; + sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg=="; }; }; "webpack-dev-server-3.11.0" = { @@ -69856,13 +69919,13 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.7.1" = { + "webtorrent-1.8.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.7.1"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.7.1.tgz"; - sha512 = "x7u7jtDDdPzSkwurZ1/mUZCcIBYrAQiPrnGSLi9jn9rlsnad4G5RXgsgBvVQR650Pqx9Id/4db/2ZTB4iRGh2w=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.1.tgz"; + sha512 = "FutW3PA5x7K8ZfBxNgZunSXlwDARyoWFjlGkWLXpni5IARJsyYmucxoPPNL4QRtMB+BKsSwe3g4HOpHseKPxWQ=="; }; }; "whatwg-encoding-1.0.5" = { @@ -70189,15 +70252,6 @@ let sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; }; }; - "win-fork-1.1.1" = { - name = "win-fork"; - packageName = "win-fork"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; - sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; - }; - }; "window-size-0.1.0" = { name = "window-size"; packageName = "window-size"; @@ -70333,15 +70387,6 @@ let sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; }; }; - "winston-3.2.1" = { - name = "winston"; - packageName = "winston"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz"; - sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; - }; - }; "winston-3.3.3" = { name = "winston"; packageName = "winston"; @@ -70351,31 +70396,22 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-3.3.4" = { + "winston-3.5.1" = { name = "winston"; packageName = "winston"; - version = "3.3.4"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.4.tgz"; - sha512 = "zWJrfmqE+2IXtVJ125vxpA2m303TjwchLhfRbcnma7c76Qd4pv80JIp37l8uGnWbCoG4X6PMz3vAQeh+vH1CtA=="; + url = "https://registry.npmjs.org/winston/-/winston-3.5.1.tgz"; + sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA=="; }; }; - "winston-3.4.0" = { - name = "winston"; - packageName = "winston"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz"; - sha512 = "FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw=="; - }; - }; - "winston-transport-4.4.2" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; - sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "with-5.1.1" = { @@ -70477,15 +70513,6 @@ let sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; - "workerpool-6.1.5" = { - name = "workerpool"; - packageName = "workerpool"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"; - sha512 = "XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="; - }; - }; "workerpool-6.2.0" = { name = "workerpool"; packageName = "workerpool"; @@ -70765,15 +70792,6 @@ let sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; }; }; - "ws-7.5.1" = { - name = "ws"; - packageName = "ws"; - version = "7.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; - sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; - }; - }; "ws-7.5.6" = { name = "ws"; packageName = "ws"; @@ -70792,24 +70810,6 @@ let sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; }; - "ws-8.3.0" = { - name = "ws"; - packageName = "ws"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz"; - sha512 = "Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw=="; - }; - }; - "ws-8.4.0" = { - name = "ws"; - packageName = "ws"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz"; - sha512 = "IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ=="; - }; - }; "ws-8.4.2" = { name = "ws"; packageName = "ws"; @@ -71558,15 +71558,6 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-17.0.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz"; - sha512 = "xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ=="; - }; - }; "yargs-17.1.1" = { name = "yargs"; packageName = "yargs"; @@ -71918,6 +71909,15 @@ let sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; }; + "yocto-queue-1.0.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz"; + sha512 = "9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g=="; + }; + }; "yoga-layout-prebuilt-1.10.0" = { name = "yoga-layout-prebuilt"; packageName = "yoga-layout-prebuilt"; @@ -72068,15 +72068,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.1.4"; + version = "13.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.1.4.tgz"; - sha512 = "PP9xpvDDCHhLTIZjewQQzzf+JbpF2s5mXTW2AgIL/E53ukaVvXwwjFMt9dQvECwut/LDpThoc3OfqcGrmwtqnA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.2.tgz"; + sha512 = "i9pBm5bVWnabwrsw1Ut84BqGu75+Nol6sReh8NTs7zUdCKNC00kqFBZg/1nGGw0IwL3Q+W7rJMgZ9q0qAtFTXg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1301.4" - sources."@angular-devkit/core-13.1.4" - sources."@angular-devkit/schematics-13.1.4" + sources."@angular-devkit/architect-0.1302.2" + sources."@angular-devkit/core-13.2.2" + sources."@angular-devkit/schematics-13.2.2" sources."@gar/promisify-1.1.2" sources."@npmcli/fs-1.1.0" sources."@npmcli/git-2.1.0" @@ -72085,14 +72085,14 @@ in sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.1.4" + sources."@schematics/angular-13.2.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.0" sources."aggregate-error-3.1.0" - sources."ajv-8.8.2" + sources."ajv-8.9.0" sources."ajv-formats-2.1.1" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" @@ -72186,7 +72186,7 @@ in sources."magic-string-0.25.7" sources."make-fetch-happen-9.1.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -72207,7 +72207,13 @@ in sources."npm-package-arg-8.1.5" sources."npm-packlist-3.0.0" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-11.0.0" + (sources."npm-registry-fetch-12.0.1" // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + sources."make-fetch-happen-10.0.0" + ]; + }) sources."npmlog-6.0.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -72215,7 +72221,7 @@ in sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-12.0.2" + sources."pacote-12.0.3" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."promise-inflight-1.0.1" @@ -72224,7 +72230,7 @@ in sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."rimraf-3.0.2" @@ -72234,9 +72240,9 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" @@ -72245,6 +72251,7 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tar-6.1.11" sources."through-2.3.8" @@ -72310,7 +72317,7 @@ in sources."args-5.0.1" sources."atomic-sleep-1.0.0" sources."camelcase-5.0.0" - (sources."camelcase-keys-7.0.1" // { + (sources."camelcase-keys-7.0.2" // { dependencies = [ sources."camelcase-6.3.0" ]; @@ -72339,7 +72346,7 @@ in sources."mri-1.1.4" sources."on-exit-leak-free-0.2.0" sources."once-1.4.0" - sources."pino-7.6.4" + sources."pino-7.6.5" sources."pino-abstract-transport-0.5.0" sources."pino-pretty-7.3.0" sources."pino-std-serializers-4.0.0" @@ -72411,7 +72418,7 @@ in ]; }) sources."asciidoctor-opal-runtime-0.3.3" - sources."async-lock-1.3.0" + sources."async-lock-1.3.1" sources."atomic-sleep-1.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -72421,7 +72428,7 @@ in sources."cache-directory-2.0.0" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."chalk-2.4.2" sources."clean-git-ref-2.0.1" sources."clone-2.1.2" @@ -72439,7 +72446,7 @@ in sources."convert-source-map-1.8.0" sources."convict-6.2.1" sources."core-util-is-1.0.3" - sources."crc-32-1.2.0" + sources."crc-32-1.2.1" sources."dateformat-4.6.3" sources."decompress-response-4.2.1" sources."define-properties-1.1.3" @@ -72491,9 +72498,9 @@ in sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" - (sources."isomorphic-git-1.10.4" // { + (sources."isomorphic-git-1.10.5" // { dependencies = [ - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" ]; }) sources."joycon-3.1.1" @@ -72512,7 +72519,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimisted-2.0.1" sources."mri-1.1.4" @@ -72535,11 +72542,11 @@ in sources."pend-1.2.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pino-7.6.4" + sources."pino-7.6.5" sources."pino-abstract-transport-0.5.0" sources."pino-pretty-7.3.0" sources."pino-std-serializers-4.0.0" - sources."printj-1.1.2" + sources."printj-1.3.1" sources."process-nextick-args-2.0.1" sources."process-warning-1.0.0" sources."progress-2.0.3" @@ -72563,7 +72570,7 @@ in sources."sha.js-2.4.11" sources."should-proxy-1.0.4" sources."simple-concat-1.0.1" - (sources."simple-get-4.0.0" // { + (sources."simple-get-4.0.1" // { dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" @@ -72588,7 +72595,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -72658,7 +72665,7 @@ in sources."lodash-4.17.21" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mkdirp-1.0.4" sources."path-browserify-1.0.1" sources."picomatch-2.3.1" @@ -72669,7 +72676,7 @@ in sources."to-regex-range-5.0.1" sources."ts-morph-12.2.0" sources."typescript-4.5.5" - sources."vscode-css-languageservice-5.1.9" + sources."vscode-css-languageservice-5.1.12" (sources."vscode-emmet-helper-2.1.2" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -72684,7 +72691,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" @@ -72808,7 +72815,7 @@ in sources."rxjs-6.6.7" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."steno-0.4.4" sources."string-width-4.2.3" @@ -72922,7 +72929,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" sources."cosmiconfig-7.0.1" - sources."cosmiconfig-typescript-loader-1.0.3" + sources."cosmiconfig-typescript-loader-1.0.4" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -73025,7 +73032,7 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -73109,7 +73116,7 @@ in sha512 = "YWis7dhbGR5LkGYj7rV3BA/gUusfuugze3LIQUeoggPdF2rdeOZXewSPUydM3UBfsptt0qyw0bPQS+fKT0KDVw=="; }; dependencies = [ - sources."@corestore/networker-1.2.0" + sources."@corestore/networker-1.2.1" sources."@hyperspace/client-1.18.0" sources."@hyperspace/migration-tool-1.2.1" sources."@hyperspace/rpc-1.15.1" @@ -73118,7 +73125,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" (sources."ansi-diff-stream-1.2.1" // { @@ -73161,7 +73168,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-me-maybe-1.0.1" sources."chacha20-universal-1.0.4" sources."chalk-1.1.3" @@ -73378,15 +73385,15 @@ in sources."simple-message-channels-1.2.1" sources."siphash24-1.3.0" sources."siphash24-universal-1.0.0" - sources."sodium-javascript-0.7.4" + sources."sodium-javascript-0.8.0" sources."sodium-native-3.3.0" - sources."sodium-universal-3.0.4" + sources."sodium-universal-3.1.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.12.0" + sources."streamx-2.12.1" (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -73476,30 +73483,30 @@ in sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ=="; }; dependencies = [ - sources."@babel/parser-7.16.12" - sources."@medable/mdctl-api-1.0.62" - sources."@medable/mdctl-core-1.0.62" - sources."@medable/mdctl-core-schemas-1.0.62" - sources."@medable/mdctl-core-utils-1.0.60" - sources."@medable/mdctl-credentials-provider-keychain-1.0.62" - sources."@medable/mdctl-credentials-provider-pouchdb-1.0.62" - sources."@medable/mdctl-docs-1.0.60" - sources."@medable/mdctl-export-adapter-console-1.0.60" - (sources."@medable/mdctl-export-adapter-tree-1.0.62" // { + sources."@babel/parser-7.17.0" + sources."@medable/mdctl-api-1.0.63" + sources."@medable/mdctl-core-1.0.63" + sources."@medable/mdctl-core-schemas-1.0.63" + sources."@medable/mdctl-core-utils-1.0.63" + sources."@medable/mdctl-credentials-provider-keychain-1.0.63" + sources."@medable/mdctl-credentials-provider-pouchdb-1.0.63" + sources."@medable/mdctl-docs-1.0.63" + sources."@medable/mdctl-export-adapter-console-1.0.63" + (sources."@medable/mdctl-export-adapter-tree-1.0.63" // { dependencies = [ sources."glob-7.2.0" sources."globby-10.0.2" ]; }) - sources."@medable/mdctl-import-adapter-1.0.62" - (sources."@medable/mdctl-manifest-1.0.62" // { + sources."@medable/mdctl-import-adapter-1.0.63" + (sources."@medable/mdctl-manifest-1.0.63" // { dependencies = [ sources."pluralize-8.0.0" ]; }) - sources."@medable/mdctl-node-utils-1.0.62" - sources."@medable/mdctl-sandbox-1.0.62" - sources."@medable/mdctl-secrets-1.0.60" + sources."@medable/mdctl-node-utils-1.0.63" + sources."@medable/mdctl-sandbox-1.0.63" + sources."@medable/mdctl-secrets-1.0.63" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -73509,7 +73516,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -73815,7 +73822,7 @@ in sources."ignore-5.2.0" sources."ignore-walk-3.0.4" sources."immediate-3.0.6" - sources."inflection-1.13.1" + sources."inflection-1.13.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -73866,7 +73873,7 @@ in }) sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" - (sources."jsdoc-3.6.9" // { + (sources."jsdoc-3.6.10" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-json-comments-3.1.1" @@ -73912,7 +73919,7 @@ in sources."map-visit-1.0.0" sources."markdown-it-12.3.2" sources."markdown-it-anchor-8.4.1" - sources."marked-4.0.10" + sources."marked-4.0.12" sources."md5.js-1.3.5" sources."mdurl-1.0.1" (sources."mem-4.3.0" // { @@ -73927,7 +73934,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -74188,9 +74195,9 @@ in sources."glob-7.2.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" sources."slash-3.0.0" sources."slugify-1.6.5" (sources."snapdragon-0.8.2" // { @@ -74310,7 +74317,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."underscore-1.13.2" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -74446,7 +74453,7 @@ in sources."is-plain-object-5.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."joi-17.5.0" + sources."joi-17.6.0" sources."js-yaml-3.14.1" sources."jsonfile-6.1.0" sources."lodash-4.17.21" @@ -74466,7 +74473,7 @@ in sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-git-2.48.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" @@ -74537,7 +74544,7 @@ in sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -74577,7 +74584,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -74596,7 +74603,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -74663,7 +74670,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.4.6" // { + (sources."jest-worker-27.5.0" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -74691,7 +74698,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" @@ -74743,7 +74750,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.7.3" (sources."source-map-support-0.5.21" // { dependencies = [ @@ -74765,7 +74772,7 @@ in sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.3.0" // { + (sources."terser-webpack-plugin-5.3.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -74855,7 +74862,7 @@ in sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" @@ -74891,6 +74898,308 @@ in bypassCache = true; reconstructLock = true; }; + "@uppy/companion" = nodeEnv.buildNodePackage { + name = "_at_uppy_slash_companion"; + packageName = "@uppy/companion"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.1.5.tgz"; + sha512 = "SJ1o47FSRMwzA6YMTogGl6ED+8gxKwRaGCDYrNjrmbvpx2nr9kaMjeX3dNXwh0PWpESnRuwSB/wwk6XtrQvu1g=="; + }; + dependencies = [ + sources."@purest/config-1.0.1" + sources."@purest/providers-1.0.1" + sources."@request/api-0.6.0" + sources."@request/interface-0.1.0" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.34" + ]; + }) + sources."ajv-6.12.6" + sources."ansi-styles-3.2.1" + sources."array-flatten-1.1.1" + sources."asn1-0.2.6" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + (sources."aws-sdk-2.1069.0" // { + dependencies = [ + sources."uuid-3.3.2" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."base64-js-1.5.1" + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bintrees-1.0.1" + sources."body-parser-1.19.0" + sources."buffer-4.9.2" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-0.1.2" + sources."bytes-3.1.0" + sources."call-bind-1.0.2" + sources."caseless-0.12.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combine-errors-3.0.3" + sources."combined-stream-1.0.8" + sources."common-tags-1.8.0" + sources."connect-redis-4.0.3" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.1" + sources."cookie-parser-1.4.6" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."cron-parser-2.18.0" + sources."custom-error-instance-2.1.1" + sources."dashdash-1.14.1" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."deep-copy-1.4.2" + sources."define-properties-1.1.3" + sources."delayed-stream-1.0.0" + sources."denque-1.5.1" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."double-ended-queue-2.1.0-0" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-2.0.0" + sources."etag-1.8.1" + sources."events-1.1.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + ]; + }) + sources."express-interceptor-1.2.0" + sources."express-prom-bundle-6.3.0" + (sources."express-request-id-1.4.1" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + (sources."express-session-1.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + sources."depd-2.0.0" + sources."safe-buffer-5.2.0" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."finalhandler-1.1.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" + sources."getpass-0.1.7" + sources."graceful-fs-4.2.9" + (sources."grant-4.7.0" // { + dependencies = [ + sources."qs-6.10.3" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."helmet-4.6.0" + sources."http-errors-1.7.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."inherits-2.0.3" + sources."ipaddr.js-2.0.1" + sources."is-nan-1.3.2" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."jmespath-0.16.0" + sources."js-base64-2.6.4" + sources."jsbn-0.1.1" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + (sources."jsonwebtoken-8.5.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."jsprim-1.4.2" + sources."jwa-1.4.1" + sources."jws-3.2.2" + sources."lodash._baseiteratee-4.7.0" + sources."lodash._basetostring-4.12.0" + sources."lodash._baseuniq-4.6.0" + sources."lodash._createset-4.0.3" + sources."lodash._root-3.0.1" + sources."lodash._stringtopath-4.8.0" + sources."lodash.includes-4.3.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.merge-4.6.2" + sources."lodash.once-4.1.1" + sources."lodash.throttle-4.1.1" + sources."lodash.uniqby-4.5.0" + sources."long-timeout-0.1.1" + 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.51.0" + (sources."mime-types-2.1.25" // { + dependencies = [ + sources."mime-db-1.42.0" + ]; + }) + sources."moment-2.29.1" + sources."moment-timezone-0.5.34" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."ms-2.1.2" + sources."negotiator-0.6.3" + (sources."node-redis-pubsub-4.0.0" // { + dependencies = [ + sources."redis-2.8.0" + ]; + }) + sources."node-schedule-1.3.2" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."object-inspect-1.12.0" + sources."object-keys-1.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."prom-client-12.0.0" + sources."proper-lockfile-2.0.1" + (sources."proxy-addr-2.0.7" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) + sources."psl-1.8.0" + sources."punycode-1.3.2" + sources."purest-3.1.0" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."querystringify-2.2.0" + sources."random-bytes-1.0.0" + sources."randombytes-2.1.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + (sources."redis-3.1.1" // { + dependencies = [ + sources."redis-parser-3.0.0" + ]; + }) + sources."redis-commands-1.7.0" + sources."redis-errors-1.2.0" + sources."redis-parser-2.6.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."oauth-sign-0.9.0" + sources."qs-6.5.3" + sources."uuid-3.4.0" + ]; + }) + sources."request-compose-1.2.3" + (sources."request-oauth-0.0.3" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + sources."requires-port-1.0.0" + sources."retry-0.10.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + sources."semver-6.3.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serialize-error-2.1.0" + sources."serialize-javascript-6.0.0" + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."side-channel-1.0.4" + sources."sorted-array-functions-1.3.0" + sources."sshpk-1.17.0" + sources."statuses-1.5.0" + sources."supports-color-5.5.0" + sources."tdigest-0.1.1" + sources."toidentifier-1.0.0" + (sources."tough-cookie-2.5.0" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tus-js-client-2.1.1" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."uid-safe-2.1.5" + sources."unpipe-1.0.0" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."url-0.10.3" + sources."url-parse-1.5.4" + sources."url-value-parser-2.1.0" + sources."utils-merge-1.0.1" + sources."uuid-8.1.0" + sources."validator-12.2.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."ws-6.2.2" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:"; + homepage = "https://github.com/transloadit/uppy#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; @@ -74901,6 +75210,7 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" + sources."@ampproject/remapping-2.1.0" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -74910,14 +75220,14 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.12" - sources."@babel/generator-7.16.8" + sources."@babel/compat-data-7.17.0" + sources."@babel/core-7.17.0" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" @@ -74937,9 +75247,9 @@ in sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -75011,23 +75321,26 @@ in sources."@babel/preset-flow-7.16.7" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.7" - (sources."@babel/register-7.16.9" // { + (sources."@babel/register-7.17.0" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" sources."@josephg/resolvable-1.0.1" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@mrmlnc/readdir-enhanced-2.2.1" (sources."@nodelib/fs.scandir-2.1.5" // { dependencies = [ @@ -75074,7 +75387,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -75089,15 +75402,15 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.15" sources."@vue/cli-ui-addon-widgets-4.5.15" - (sources."@vue/compiler-core-3.2.29" // { + (sources."@vue/compiler-core-3.2.30" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.29" - sources."@vue/shared-3.2.29" + sources."@vue/compiler-dom-3.2.30" + sources."@vue/shared-3.2.30" sources."@wry/equality-0.1.11" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-align-3.0.1" @@ -75158,7 +75471,7 @@ in sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-polyfill-corejs2-0.3.1" - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -75209,7 +75522,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -75261,12 +75574,12 @@ in sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.0" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.20.3" + sources."core-js-pure-3.21.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -75332,7 +75645,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -75413,7 +75726,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.169.0" + sources."flow-parser-0.171.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -75630,7 +75943,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -75653,7 +75966,7 @@ in sources."get-stream-2.3.1" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-dir-0.1.17" @@ -75749,7 +76062,7 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-3.0.0" (sources."portfinder-1.0.28" // { dependencies = [ @@ -75787,7 +76100,7 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { @@ -75796,9 +76109,9 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -75847,7 +76160,7 @@ in sources."shellwords-0.1.1" sources."shortid-2.2.16" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -76220,12 +76533,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.16.7" - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/types-7.16.8" + sources."@babel/types-7.17.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -76307,7 +76620,7 @@ in sources."@types/acorn-4.0.6" sources."@types/concat-stream-1.6.1" sources."@types/debug-4.1.7" - sources."@types/estree-0.0.50" + sources."@types/estree-0.0.51" sources."@types/estree-jsx-0.0.1" sources."@types/hast-2.3.4" sources."@types/is-empty-1.2.1" @@ -76316,7 +76629,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" @@ -76354,7 +76667,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."ccount-2.0.1" sources."chalk-2.4.2" sources."character-entities-2.0.1" @@ -76517,15 +76830,15 @@ in sources."mdast-util-frontmatter-1.0.0" sources."mdast-util-gfm-2.0.0" sources."mdast-util-gfm-autolink-literal-1.0.2" - sources."mdast-util-gfm-footnote-1.0.0" - sources."mdast-util-gfm-strikethrough-1.0.0" - sources."mdast-util-gfm-table-1.0.2" - sources."mdast-util-gfm-task-list-item-1.0.0" + sources."mdast-util-gfm-footnote-1.0.1" + sources."mdast-util-gfm-strikethrough-1.0.1" + sources."mdast-util-gfm-table-1.0.3" + sources."mdast-util-gfm-task-list-item-1.0.1" sources."mdast-util-mdx-1.1.0" - sources."mdast-util-mdx-expression-1.1.1" + sources."mdast-util-mdx-expression-1.2.0" sources."mdast-util-mdx-jsx-1.2.0" - sources."mdast-util-mdxjs-esm-1.1.1" - sources."mdast-util-to-markdown-1.2.6" + sources."mdast-util-mdxjs-esm-1.2.0" + sources."mdast-util-to-markdown-1.3.0" sources."mdast-util-to-nlcst-5.2.1" sources."mdast-util-to-string-3.1.0" sources."meow-10.1.2" @@ -76540,13 +76853,13 @@ in sources."micromark-extension-gfm-tagfilter-1.0.1" sources."micromark-extension-gfm-task-list-item-1.0.3" sources."micromark-extension-mdx-expression-1.0.3" - sources."micromark-extension-mdx-jsx-1.0.2" + sources."micromark-extension-mdx-jsx-1.0.3" sources."micromark-extension-mdx-md-1.0.0" sources."micromark-extension-mdxjs-1.0.0" sources."micromark-extension-mdxjs-esm-1.0.2" sources."micromark-factory-destination-1.0.0" sources."micromark-factory-label-1.0.2" - sources."micromark-factory-mdx-expression-1.0.5" + sources."micromark-factory-mdx-expression-1.0.6" sources."micromark-factory-space-1.0.0" sources."micromark-factory-title-1.0.2" sources."micromark-factory-whitespace-1.0.0" @@ -76557,7 +76870,11 @@ in sources."micromark-util-decode-numeric-character-reference-1.0.0" sources."micromark-util-decode-string-1.0.2" sources."micromark-util-encode-1.0.1" - sources."micromark-util-events-to-acorn-1.0.4" + (sources."micromark-util-events-to-acorn-1.0.4" // { + dependencies = [ + sources."@types/estree-0.0.50" + ]; + }) sources."micromark-util-html-tag-name-1.0.0" sources."micromark-util-normalize-identifier-1.0.0" sources."micromark-util-resolve-all-1.0.0" @@ -76567,7 +76884,7 @@ in sources."micromark-util-types-1.0.2" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."mri-1.2.0" @@ -76621,7 +76938,7 @@ in sources."redent-4.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."rehype-parse-8.0.3" + sources."rehype-parse-8.0.4" sources."rehype-retext-3.0.2" sources."remark-frontmatter-4.0.1" sources."remark-gfm-3.0.1" @@ -76641,7 +76958,7 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sliced-1.0.1" sources."space-separated-tokens-2.0.1" (sources."spawn-to-readstream-0.1.3" // { @@ -76783,14 +77100,11 @@ in sha512 = "6Avt9pRA194Z/yN4hb7/6ZRhMtWLydsje2uP82b1VVFSBWwDlkswLTDFD0ngSEHlBSNR+bFnyOAGh+mpHQNYOQ=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.16.8" // { + sources."@babel/compat-data-7.17.0" + sources."@babel/core-7.17.0" + (sources."@babel/generator-7.17.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -76806,12 +77120,15 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@xmldom/xmldom-0.8.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" @@ -76820,7 +77137,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.19.1" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -76830,7 +77147,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.3" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -76872,7 +77189,7 @@ in sources."jsonlint-1.6.3" sources."lodash-4.17.21" sources."matcher-collection-1.1.2" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" @@ -76923,7 +77240,7 @@ in sha512 = "lqPoPSftBQyiIPFL2GNxvbHZrHTIL+iw9xhqwemUxB3ftcQRfpuWPE95MC1NSSFJ+dEAqtAkwh8tdNidK95yyQ=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -76937,7 +77254,7 @@ in sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."cache-content-type-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -76956,7 +77273,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" - sources."destroy-1.0.4" + sources."destroy-1.1.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" @@ -77030,7 +77347,7 @@ in sources."mime-types-2.1.34" sources."ms-2.1.2" sources."mz-2.7.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" (sources."node-ssdp-3.3.0" // { dependencies = [ sources."debug-3.2.7" @@ -77116,7 +77433,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -77126,7 +77443,7 @@ in sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" @@ -77161,7 +77478,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isstream-0.1.2" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."once-1.4.0" @@ -77201,8 +77518,8 @@ in }; dependencies = [ sources."browserslist-4.19.1" - sources."caniuse-lite-1.0.30001301" - sources."electron-to-chromium-1.4.51" + sources."caniuse-lite-1.0.30001309" + sources."electron-to-chromium-1.4.65" sources."escalade-3.1.1" sources."fraction.js-4.1.2" sources."node-releases-2.0.1" @@ -77230,14 +77547,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1069.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -77336,7 +77653,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-5.1.1" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -77382,9 +77699,9 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."statuses-1.5.0" @@ -77461,7 +77778,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-7.29.0" - sources."@types/estree-0.0.50" + sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.9" sources."@types/mdast-3.0.10" sources."@types/minimist-1.2.2" @@ -77620,7 +77937,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" @@ -77747,7 +78064,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sliced-1.0.1" sources."spdx-correct-3.1.1" @@ -77855,10 +78172,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.33.0"; + version = "11.49.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.33.0.tgz"; - sha512 = "B0jG/bSjDBihGEpB4slDg/oxjOBbtmP91fOHTItfUuUTfNvGuWXMP707TlmqKlcCOq0rdzJWQD+3j+e2xD72HQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.49.1.tgz"; + sha512 = "8qnA0y21T6b0K7/fSf4DP4NFhgmBDq/CYLU5hFSOxbR58F5u/jh5he+b5LAv66rFM6DKbnNxkb/7JUfrOJPoBA=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.0" // { @@ -77882,9 +78199,9 @@ in sources."string_decoder-1.3.0" ]; }) - sources."@grammyjs/types-2.5.1" - sources."@grpc/grpc-js-1.4.5" - sources."@grpc/proto-loader-0.6.7" + sources."@grammyjs/types-2.6.0" + sources."@grpc/grpc-js-1.5.4" + sources."@grpc/proto-loader-0.6.9" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" @@ -77907,16 +78224,22 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/request-2.48.7" + sources."@types/request-2.48.8" sources."@types/serve-static-1.13.10" sources."@types/tough-cookie-4.0.1" sources."@types/ws-8.2.2" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" - sources."ajv-8.9.0" + sources."accepts-1.3.8" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."ajv-8.10.0" sources."ansi-0.3.1" sources."ansi-align-3.0.1" sources."ansi-escapes-1.4.0" @@ -77959,7 +78282,7 @@ in sources."bolt01-1.2.3" sources."bolt03-1.2.13" sources."bolt07-1.8.0" - sources."bolt09-0.2.0" + sources."bolt09-0.2.1" (sources."boxen-5.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78007,9 +78330,13 @@ in sources."commander-6.2.1" sources."concat-stream-1.6.2" sources."configstore-5.0.1" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" @@ -78048,16 +78375,9 @@ in sources."etag-1.8.1" sources."event-target-shim-5.0.1" sources."exit-hook-1.1.1" - (sources."express-4.17.1" // { + (sources."express-4.17.2" // { dependencies = [ - sources."body-parser-1.19.0" - sources."bytes-3.1.0" - sources."http-errors-1.7.2" - sources."inherits-2.0.3" - sources."qs-6.7.0" - sources."raw-body-2.4.0" - sources."setprototypeof-1.1.1" - sources."toidentifier-1.0.0" + sources."safe-buffer-5.2.1" ]; }) sources."extend-3.0.2" @@ -78075,22 +78395,15 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."global-dirs-3.0.0" - (sources."goldengate-11.0.0" // { + (sources."goldengate-11.0.1" // { dependencies = [ - sources."async-3.2.2" - sources."asyncjs-util-1.2.7" - sources."bolt07-1.7.4" - (sources."invoices-2.0.2" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.0" - ]; - }) - sources."ln-service-53.2.0" + sources."invoices-2.0.3" + sources."ln-service-53.7.2" ]; }) sources."got-9.6.0" sources."graceful-fs-4.2.9" - (sources."grammy-1.6.2" // { + (sources."grammy-1.7.0" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -78138,12 +78451,8 @@ in sources."type-fest-0.21.3" ]; }) - (sources."invoices-2.0.3" // { - dependencies = [ - sources."bolt09-0.2.1" - sources."secp256k1-4.0.3" - ]; - }) + sources."invoices-2.0.4" + sources."ip-1.1.5" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" @@ -78174,26 +78483,21 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lightning-5.2.1" // { + (sources."lightning-5.6.1" // { dependencies = [ - sources."@grpc/grpc-js-1.4.4" - sources."@types/node-16.11.12" - sources."async-3.2.2" - sources."asyncjs-util-1.2.7" - sources."body-parser-1.19.0" - sources."bolt07-1.7.4" - sources."bytes-3.1.0" - sources."http-errors-1.7.2" - sources."inherits-2.0.3" - (sources."invoices-2.0.2" // { + sources."@types/node-17.0.14" + sources."bech32-1.1.4" + sources."invoices-2.0.3" + (sources."psbt-1.1.11" // { dependencies = [ - sources."bitcoinjs-lib-6.0.0" + sources."bitcoinjs-lib-5.2.0" + ]; + }) + (sources."tiny-secp256k1-1.1.6" // { + dependencies = [ + sources."bn.js-4.12.0" ]; }) - sources."qs-6.7.0" - sources."raw-body-2.4.0" - sources."setprototypeof-1.1.1" - sources."toidentifier-1.0.0" ]; }) (sources."ln-accounting-5.0.5" // { @@ -78201,9 +78505,11 @@ in sources."@grpc/grpc-js-1.4.4" sources."@grpc/proto-loader-0.6.6" sources."@types/node-16.11.7" + sources."@types/request-2.48.7" sources."@types/ws-8.2.0" sources."async-3.2.2" sources."asyncjs-util-1.2.7" + sources."bech32-1.1.4" sources."bitcoinjs-lib-6.0.0" sources."bn.js-4.12.0" sources."body-parser-1.19.0" @@ -78212,18 +78518,24 @@ in sources."bn.js-5.2.0" ]; }) + sources."bolt09-0.2.0" sources."bytes-3.1.0" + sources."content-disposition-0.5.3" + sources."cookie-0.4.0" sources."ecpair-1.0.1" + sources."express-4.17.1" sources."goldengate-10.4.2" sources."http-errors-1.7.2" sources."inherits-2.0.3" (sources."invoices-2.0.2" // { dependencies = [ + sources."bech32-2.0.0" sources."bn.js-5.2.0" ]; }) (sources."lightning-4.14.3" // { dependencies = [ + sources."bech32-2.0.0" sources."bn.js-5.2.0" (sources."invoices-2.0.1" // { dependencies = [ @@ -78237,53 +78549,32 @@ in ]; }) sources."ln-service-52.16.0" + sources."ms-2.1.1" + (sources."psbt-1.1.10" // { + dependencies = [ + sources."bitcoinjs-lib-5.2.0" + sources."bn.js-5.2.0" + ]; + }) sources."qs-6.7.0" sources."raw-body-2.4.0" + sources."secp256k1-4.0.2" + sources."send-0.17.1" + sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."tiny-secp256k1-1.1.6" sources."toidentifier-1.0.0" sources."ws-8.2.3" ]; }) - (sources."ln-service-53.5.1" // { + (sources."ln-service-53.7.3" // { dependencies = [ - sources."@grpc/grpc-js-1.5.3" - sources."@grpc/proto-loader-0.6.9" - sources."@types/request-2.48.8" - sources."bolt09-0.2.1" - sources."content-disposition-0.5.4" - sources."cookie-0.4.1" - sources."express-4.17.2" - sources."lightning-5.3.4" - sources."ms-2.1.3" - sources."safe-buffer-5.2.1" - sources."send-0.17.2" - sources."serve-static-1.14.2" - sources."type-fest-2.10.0" - sources."ws-8.4.2" + sources."invoices-2.0.3" + sources."lightning-5.6.2" ]; }) - (sources."ln-sync-3.7.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.5.1" - sources."@grpc/proto-loader-0.6.9" - sources."@types/node-17.0.8" - sources."@types/request-2.48.8" - sources."bolt09-0.2.1" - sources."content-disposition-0.5.4" - sources."cookie-0.4.1" - sources."express-4.17.2" - sources."lightning-5.3.3" - sources."ln-service-53.5.0" - sources."ms-2.1.3" - sources."safe-buffer-5.2.1" - sources."send-0.17.2" - sources."serve-static-1.14.2" - sources."type-fest-2.9.0" - sources."ws-8.4.2" - ]; - }) - sources."ln-telegram-3.9.0" + sources."ln-sync-3.10.0" + sources."ln-telegram-3.15.1" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -78334,7 +78625,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.6" sources."nan-2.15.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-2.0.2" sources."node-fetch-2.6.7" sources."node-gyp-build-4.3.0" @@ -78365,60 +78656,43 @@ in sources."semver-6.3.0" ]; }) - sources."paid-services-3.11.0" + (sources."paid-services-3.11.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.5.3" + sources."@types/node-17.0.10" + sources."bech32-1.1.4" + sources."bitcoinjs-lib-5.2.0" + sources."bn.js-4.12.0" + sources."invoices-2.0.3" + sources."lightning-5.3.4" + sources."ln-service-53.5.1" + (sources."ln-sync-3.7.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.5.1" + sources."@types/node-17.0.8" + sources."bech32-2.0.0" + sources."bitcoinjs-lib-6.0.1" + sources."bn.js-5.2.0" + sources."lightning-5.3.3" + sources."ln-service-53.5.0" + sources."type-fest-2.9.0" + ]; + }) + sources."psbt-1.1.10" + sources."tiny-secp256k1-1.1.6" + sources."type-fest-2.10.0" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" - (sources."probing-2.0.2" // { - dependencies = [ - sources."@grpc/grpc-js-1.5.0" - sources."@grpc/proto-loader-0.6.9" - sources."@types/node-17.0.8" - sources."@types/request-2.48.8" - sources."bitcoinjs-lib-6.0.0" - sources."content-disposition-0.5.4" - sources."cookie-0.4.1" - sources."express-4.17.2" - (sources."invoices-2.0.2" // { - dependencies = [ - sources."bolt07-1.7.4" - ]; - }) - (sources."lightning-5.3.1" // { - dependencies = [ - (sources."asyncjs-util-1.2.7" // { - dependencies = [ - sources."async-3.2.2" - ]; - }) - sources."bitcoinjs-lib-6.0.1" - ]; - }) - sources."ln-service-53.4.0" - sources."ms-2.1.3" - sources."safe-buffer-5.2.1" - sources."send-0.17.2" - sources."serve-static-1.14.2" - sources."type-fest-2.9.0" - sources."ws-8.4.0" - ]; - }) + sources."probing-2.0.3" sources."process-nextick-args-2.0.1" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" - (sources."psbt-1.1.10" // { - dependencies = [ - sources."bech32-1.1.4" - sources."bitcoinjs-lib-5.2.0" - (sources."tiny-secp256k1-1.1.6" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - ]; - }) + sources."psbt-2.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" @@ -78447,31 +78721,36 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" - sources."secp256k1-4.0.2" + sources."secp256k1-4.0.3" sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ - sources."http-errors-1.7.3" - sources."ms-2.1.1" - sources."setprototypeof-1.1.1" - sources."toidentifier-1.0.0" + sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.1" + sources."serve-static-1.14.2" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sjcl-1.0.8" (sources."slice-ansi-4.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; }) + sources."smart-buffer-4.2.0" + sources."socks-2.6.2" + (sources."socks-proxy-agent-6.1.1" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) sources."spawn-sync-1.0.15" sources."stack-trace-0.0.10" sources."statuses-1.5.0" @@ -78492,7 +78771,7 @@ in }) sources."through-2.3.8" sources."tiny-emitter-2.1.0" - sources."tiny-secp256k1-2.1.2" + sources."tiny-secp256k1-2.2.0" sources."tmp-0.0.29" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.1" @@ -78501,7 +78780,7 @@ in sources."tslib-2.3.1" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-2.8.0" + sources."type-fest-2.11.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" @@ -78543,7 +78822,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.3.0" + sources."ws-8.4.2" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -78641,7 +78920,7 @@ in sources."lodash.sortby-4.7.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -78677,7 +78956,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."w3c-hr-time-1.0.2" sources."web-tree-sitter-0.19.4" @@ -78803,9 +79082,9 @@ in sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."state-toggle-1.0.3" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -78843,7 +79122,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."web-tree-sitter-0.17.1" @@ -78951,7 +79230,7 @@ in sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-db-1.51.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -78985,7 +79264,7 @@ in ]; }) sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.1.1" @@ -79156,7 +79435,7 @@ in }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" @@ -79261,7 +79540,7 @@ in sha512 = "9ElnnA/u+s2Jd+IgY+2SImB+sAEIteHsMG0NR96m7Ph/wztpvJCUpyC2on1KqmG9iAp941j+5jfmd34tEguGbg=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.2" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -79306,7 +79585,7 @@ in ]; }) sources."connect-history-api-fallback-1.6.0" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."depd-1.1.2" @@ -79382,10 +79661,10 @@ in sources."mime-1.4.1" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mitt-1.2.0" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."on-finished-2.3.0" sources."openurl-1.1.1" @@ -79513,15 +79792,15 @@ in sources."@babel/code-frame-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" - sources."@babel/types-7.16.8" + sources."@babel/parser-7.17.0" + sources."@babel/types-7.17.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" sources."@types/node-10.12.18" sources."@types/normalize-package-data-2.4.1" sources."@uphold/request-logger-2.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-7.4.1" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -79764,7 +80043,7 @@ in sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."mkdirp-0.5.5" @@ -79780,7 +80059,7 @@ in sources."mv-2.1.1" sources."nan-2.15.0" sources."ncp-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-package-data-3.0.3" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -79974,7 +80253,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -80036,7 +80315,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-8.3.0" + sources."commander-9.0.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -80158,7 +80437,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.3.5" sources."mkdirp-classic-0.5.3" @@ -80272,9 +80551,9 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" (sources."simple-peer-6.4.4" // { dependencies = [ sources."isarray-1.0.0" @@ -80709,7 +80988,7 @@ in sources."mime-2.6.0" sources."mimic-fn-1.2.0" sources."min-document-2.19.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { @@ -80824,7 +81103,7 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."slice-ansi-0.0.4" (sources."snapdragon-0.8.2" // { @@ -80980,17 +81259,17 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.82"; + version = "1.0.92"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.82.tgz"; - sha512 = "lzvZVO555YM7Z39hA6Tyg28RMedCues7Wh3hv1RaAGZ7lyAkTT12kUELOg6jM+VQ0NZD+90sAcBk8NXNghuZkA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.92.tgz"; + sha512 = "ZsZ4w1g1SiHmQiJaSRV16vutkLtAewDwYZLLZJC9r2cM34M4DpPSSaflGyvtejGI/MzV0fP7PazLy9u6fVQeug=="; }; dependencies = [ sources."@jsii/check-node-1.52.1" sources."@jsii/spec-1.52.1" - sources."@types/node-12.20.42" + sources."@types/node-12.20.43" sources."@xmldom/xmldom-0.8.0" - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."at-least-node-1.0.0" @@ -80998,8 +81277,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.4.10" - sources."cdk8s-plus-22-1.0.0-beta.96" + sources."cdk8s-1.5.9" + sources."cdk8s-plus-22-1.0.0-beta.110" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -81012,7 +81291,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.197" + sources."constructs-3.3.210" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-5.0.1" @@ -81030,7 +81309,7 @@ in sources."escape-string-regexp-4.0.0" sources."fast-deep-equal-3.1.3" sources."find-up-4.1.0" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."foreach-2.0.5" (sources."fs-extra-8.1.0" // { dependencies = [ @@ -81092,14 +81371,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.454" // { + (sources."jsii-srcmak-0.1.468" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.114" + sources."json2jsii-0.2.128" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -81137,7 +81416,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.180" + sources."sscaff-1.2.194" (sources."streamroller-3.0.2" // { dependencies = [ sources."fs-extra-10.0.0" @@ -81188,22 +81467,22 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.8.6"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.8.6.tgz"; - sha512 = "rUYylxYOSnZOVDON6ma/n12DGKz4jArtWkMeUseseRCh5Y8Q45Pi6gRETLMZzFYMxgDuJpt6az5NqAisue3Ryg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.0.tgz"; + sha512 = "VpboTW7lFOkLQVy6iiViSWsFy13n1cxiCEjbjLgY4gPIsxLrSfU9skIYC+jyDXhs5b8NW2a+gL/tIi8IINJEHA=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/types-7.16.8" - sources."@cdktf/hcl2cdk-0.8.6" - sources."@cdktf/hcl2json-0.8.6" - sources."@cdktf/provider-generator-0.8.6" + sources."@babel/types-7.17.0" + sources."@cdktf/hcl2cdk-0.9.0" + sources."@cdktf/hcl2json-0.9.0" + sources."@cdktf/provider-generator-0.9.0" (sources."@jsii/check-node-1.52.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -81215,7 +81494,7 @@ in ]; }) sources."@jsii/spec-1.52.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/node-fetch-2.5.12" sources."@xmldom/xmldom-0.8.0" sources."ansi-regex-5.0.1" @@ -81228,7 +81507,7 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.8.6" + sources."cdktf-0.9.0" sources."chalk-2.4.2" sources."cliui-6.0.0" sources."clone-2.1.2" @@ -81243,7 +81522,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.42" + sources."constructs-10.0.54" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-1.2.0" @@ -81261,7 +81540,7 @@ in sources."escape-string-regexp-1.0.5" sources."events-3.3.0" sources."find-up-4.1.0" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."foreach-2.0.5" sources."form-data-3.0.1" sources."fs-extra-8.1.0" @@ -81270,10 +81549,10 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.9" - sources."graphology-0.20.0" - sources."graphology-types-0.19.5" + sources."graphology-0.23.2" + sources."graphology-types-0.21.2" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" @@ -81367,7 +81646,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.454" // { + (sources."jsii-srcmak-0.1.468" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -81383,7 +81662,7 @@ in sources."mdurl-1.0.1" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."ms-2.1.2" sources."ncp-2.0.0" @@ -81392,7 +81671,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."obliterator-1.6.1" + sources."obliterator-2.0.1" sources."once-1.4.0" sources."oo-ascii-tree-1.52.1" sources."p-limit-2.3.0" @@ -81485,10 +81764,10 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.5.0"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.5.0.tgz"; - sha512 = "Vr9t8o59YaPcRw/4hyJjEh4zU/BlOtlJJ8465El6QMYWbkf5nN1mhAljX6FIb0bfpkGlYNFKPCyTz7oFCHOblQ=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.5.2.tgz"; + sha512 = "4y5FD+ayRz7IWqZRCCMvFxNUhluc1Yv8mNPmrHbrm2NjKsv9uaQZedZKN4L+QMkTqANL1RfOwhpe22neDEgEMA=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -81497,7 +81776,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chokidar-3.5.3" - sources."clean-css-5.2.2" + sources."clean-css-5.2.4" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fill-range-7.0.1" @@ -81511,7 +81790,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -81549,7 +81828,7 @@ in sources."arch-2.2.0" sources."arrify-1.0.1" sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."chalk-2.4.2" sources."clipboardy-3.0.0" sources."color-convert-1.9.3" @@ -81609,7 +81888,7 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -81799,10 +82078,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.2.tgz"; - sha512 = "Cg4Ys7D2EhxweGBdSJn75Q8nNxU41A6T1pWSc0gxmn+jodL98+jCkA2XGtdN41/c7/R+OJXr0scifwpugmWM3g=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.4.tgz"; + sha512 = "h2Smr06oDucP0uh9pWay7f1r9pPCBM1R3+fthe1eOE28+vRBnoc131R5k0nPvoEaAeHZib5rooPkCOniNzxD3Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -81817,10 +82096,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.21.1"; + version = "0.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.21.1.tgz"; - sha512 = "+J77if2qoBt1KWC2nu5/1KnRpydEnZX28rL0MQC1RFicxiwQ77WKrtcTkm/qgvWGWt/OuX+T5734Crbh0pRGog=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.22.3.tgz"; + sha512 = "OLJNrUoGiDIfyfM1iyusqMZ/iP0phbl13FQBJlkPoBEQTeBOk1E11D6oYtY0yuWgV8F+C5c7Jom1Jlb6a2mgag=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -81850,7 +82129,7 @@ in sources."make-dir-3.1.0" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" (sources."mount-point-3.0.0" // { dependencies = [ sources."@sindresorhus/df-1.0.1" @@ -81875,7 +82154,7 @@ in sources."semver-6.3.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."strip-final-newline-2.0.0" sources."trash-7.2.0" @@ -81899,10 +82178,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.6.tgz"; - sha512 = "8FKQN7v+FcjRQkwspoVw/mWByhELFy9nLWu0/c24Y1AKj7yEkVlFTsoqwtOIaCD3r5D5S/dYT1DygIA1JIMwlQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.7.tgz"; + sha512 = "rtt2W7g8oTfg1ZAIu+Y3gDqI305j68edgJJjWpdTSQHZXq2i9T0keaWHZAIdgV819wxTcBoaghCLNjDf1rPHJA=="; }; buildInputs = globalBuildInputs; meta = { @@ -81927,7 +82206,7 @@ in sources."node-fetch-2.6.7" sources."tr46-0.0.3" sources."tslib-2.3.1" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-uri-3.0.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -82095,7 +82374,7 @@ in sha512 = "mRjStj+wjmqp9Lb3cDYegz+cavykWNYQf1ecdwrF2HEtbKVIcc+k62NS5wM6QVB5Y6FD2OxjPNWcoQmIFM1cfQ=="; }; dependencies = [ - sources."@chemzqm/neovim-5.6.4" + sources."@chemzqm/neovim-5.6.10" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -82109,7 +82388,7 @@ in sources."bser-2.1.1" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."chainsaw-0.1.0" sources."chownr-2.0.0" @@ -82137,7 +82416,7 @@ in sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."follow-redirects-1.14.7" sources."fp-ts-2.11.8" sources."fs-extra-10.0.0" @@ -82196,7 +82475,7 @@ in sources."log4js-6.4.1" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minizlib-2.1.2" @@ -82242,7 +82521,7 @@ in sources."shebang-regex-1.0.0" sources."shell-quote-1.7.3" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."streamroller-3.0.2" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" @@ -82268,7 +82547,7 @@ in sources."vscode-languageserver-types-3.15.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" @@ -82290,10 +82569,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.3.1.tgz"; - sha512 = "V9MlHr2TAdlCQKHuVLtz8rixh36HwRvKKtlhNuedhI/ljF5uzoNd2wFl345aRRzi6ceUcsDZ5QCwG9UzGkLFjw=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.3.2.tgz"; + sha512 = "dinOWxcKvSghIEyRHy0vfjIUturfX1HiRHZ+vyInHXP3lXFq1SQF3B9RzwHj1eXjfmqKMDVsgwjAftAx8j8Rbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82394,7 +82673,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -82456,7 +82735,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -82492,7 +82771,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -82611,7 +82890,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -82633,7 +82912,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - sources."globals-13.12.0" + sources."globals-13.12.1" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -82798,7 +83077,7 @@ in ]; }) sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { @@ -83043,7 +83322,7 @@ in }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -83159,7 +83438,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -83291,13 +83570,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.210"; + version = "1.1.215"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.210.tgz"; - sha512 = "d+x38jGi3b0gD4axhYdHcS6TX9T/Q6qndVbn3TQMbLdQxiGmBBoy/hB/AouXwEByg/XyBtmyDiaWxm7r0UfgQw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.215.tgz"; + sha512 = "cI+cB93Im7UC0vLv0k0pcJ16bmtwdVLzf2Kf1qTCe0R5mwSZubXC57RLdiox+CvKPq3BHZZF9a2dCVNncNhKtw=="; }; dependencies = [ - sources."pyright-1.1.214" + sources."pyright-1.1.219" ]; buildInputs = globalBuildInputs; meta = { @@ -83338,7 +83617,7 @@ in dependencies = [ sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; @@ -83447,10 +83726,11 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.12" - sources."@babel/generator-7.16.8" + sources."@babel/compat-data-7.17.0" + sources."@babel/core-7.17.0" + sources."@babel/generator-7.17.0" sources."@babel/helper-compilation-targets-7.16.7" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.16.7" @@ -83462,16 +83742,19 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -83482,7 +83765,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -83505,7 +83788,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -83542,7 +83825,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83559,7 +83842,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -83630,7 +83913,7 @@ in sources."micromark-2.11.4" sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minimist-options-4.1.0" // { dependencies = [ @@ -83707,7 +83990,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-6.3.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -83760,7 +84043,7 @@ in sources."vscode-languageserver-types-3.16.0-next.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-1.3.1" @@ -83850,7 +84133,7 @@ in sources."is-core-module-2.8.1" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."once-1.4.0" @@ -83890,7 +84173,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."get-caller-file-1.0.3" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mock-require-3.0.3" sources."normalize-path-2.1.1" sources."remove-trailing-separator-1.1.0" @@ -83913,10 +84196,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.8.tgz"; - sha512 = "fbVD0V2ZWlX8471cqeILz0k1OfHd20WI9tmrLfZy1vsUZtAFVXtvwO9cuA6FZ1vm/vpoUHelQ70Yd6ENFIddRQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.9.tgz"; + sha512 = "hYuFRCg7A6wAuEG8Al0B/rjDNJkMT2EIoujOcE+yPCGru7Vu3IR9eT6+ira0yAWpnKhgdAazSBWjfEiIw92+7Q=="; }; dependencies = [ sources."typescript-4.5.5" @@ -84040,14 +84323,14 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-intrinsic-1.1.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" @@ -84073,7 +84356,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" @@ -84114,7 +84397,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -84176,10 +84459,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.0.tgz"; - sha512 = "1CFLycCS+gbvUzVnrdN9SU7clGaPckD8uj+1XFqfuRqh+m58rUd0+xchNSJZcVHMGXlH5fJMvaJyAgZNjU2m/g=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.1.tgz"; + sha512 = "mSnoYlb0J41LG6uTgGlLOj/jM4wEYKv1IhP0p7LUo+eZSzdlWuuP2r+zmNbd+MeN/k5ftcgahVSLaUv5QVtpsA=="; }; buildInputs = globalBuildInputs; meta = { @@ -84224,7 +84507,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" @@ -84267,7 +84550,7 @@ in sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; }; dependencies = [ - sources."@xstate/fsm-1.6.3" + sources."@xstate/fsm-1.6.4" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -84351,7 +84634,7 @@ in sources."pify-3.0.0" ]; }) - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."nice-try-1.0.5" @@ -84391,7 +84674,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-2.0.0" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -84479,7 +84762,7 @@ in sources."onetime-2.0.1" sources."ora-1.4.0" sources."restore-cursor-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -84546,10 +84829,10 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.0.tgz"; - sha512 = "iuaG85EDWIp02Dm1LZsi7vRE4CH5cRwo2+GaEEAi6fgX3dRLpt/jhQc7ylwXibi4kUjMvpV/xbMwjRRmGcg4NQ=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.1.tgz"; + sha512 = "SALL4kqMSKdpClQnFe2h8qSQyWrShXWepiQwci6PNc/7Le+L9RRiQc/X+YEY6hDhIkaAneUlApQfWfnW/JSdqg=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -84561,7 +84844,7 @@ in sources."color-string-1.9.0" sources."colors-1.4.0" sources."colorspace-1.1.4" - sources."commander-8.0.0" + sources."commander-7.2.0" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" sources."fecha-4.2.1" @@ -84572,14 +84855,18 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.3.2" + (sources."logform-2.3.2" // { + dependencies = [ + sources."safe-stable-stringify-1.1.1" + ]; + }) sources."ms-2.1.3" sources."one-time-1.0.0" - sources."prom-client-13.1.0" + sources."prom-client-14.0.1" sources."readable-stream-3.6.0" sources."requires-port-1.0.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."strftime-0.10.1" @@ -84588,8 +84875,8 @@ in sources."text-hex-1.0.0" sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" - sources."winston-3.3.4" - sources."winston-transport-4.4.2" + sources."winston-3.5.1" + sources."winston-transport-4.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -84796,7 +85083,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -84843,18 +85130,14 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" - (sources."accepts-1.3.7" // { - dependencies = [ - sources."negotiator-0.6.2" - ]; - }) + sources."accepts-1.3.8" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.0" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -84943,7 +85226,7 @@ in sources."concat-map-0.0.1" (sources."conf-10.1.1" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."dot-prop-6.0.1" sources."json-schema-traverse-1.0.0" ]; @@ -85193,7 +85476,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" @@ -85330,10 +85613,10 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -85351,7 +85634,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.10.7" + sources."systeminformation-5.11.2" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -85448,7 +85731,7 @@ in sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -85618,7 +85901,7 @@ in sources."merge2-1.4.1" sources."micromatch-3.1.10" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" @@ -85820,7 +86103,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -85864,7 +86147,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -85930,7 +86213,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."snabbdom-0.7.0" sources."snabbdom-selector-1.2.1" sources."sorted-immutable-list-1.1.0" @@ -86008,7 +86291,7 @@ in sources."jsonfile-6.1.0" sources."kleur-3.0.3" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -86084,10 +86367,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "5.16.0"; + version = "5.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-5.16.0.tgz"; - sha512 = "giK0IZz1cK51mTSTox51GUxgcbKy5Y5yXvyqVpfQ6m4nATSuiSRiMPvlxX3Er2uAiNkolyLTIgUxBAV/c8U3PQ=="; + url = "https://registry.npmjs.org/cspell/-/cspell-5.18.4.tgz"; + sha512 = "u/6iw8Zc4RICTtmipM3i25s6+7NwbtGbxT3Xws7BLZ5qb2hsvSGSSJLgAMaQ3BFHZikdeHBDhGw2g67M3S5V8Q=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -86102,21 +86385,22 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-5.16.0" - sources."@cspell/cspell-types-5.16.0" + sources."@cspell/cspell-bundled-dicts-5.18.4" + sources."@cspell/cspell-pipe-5.18.4" + sources."@cspell/cspell-types-5.18.4" sources."@cspell/dict-ada-1.1.2" sources."@cspell/dict-aws-1.0.14" - sources."@cspell/dict-bash-1.0.17" + sources."@cspell/dict-bash-1.0.18" sources."@cspell/dict-companies-2.0.2" sources."@cspell/dict-cpp-1.1.40" sources."@cspell/dict-cryptocurrencies-1.0.10" sources."@cspell/dict-csharp-2.0.1" - sources."@cspell/dict-css-1.0.12" + sources."@cspell/dict-css-1.0.13" sources."@cspell/dict-django-1.0.26" sources."@cspell/dict-dotnet-1.0.32" sources."@cspell/dict-elixir-1.0.26" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-2.1.4" + sources."@cspell/dict-en_us-2.1.5" sources."@cspell/dict-filetypes-2.0.1" sources."@cspell/dict-fonts-1.0.14" sources."@cspell/dict-fullstack-2.0.4" @@ -86134,12 +86418,13 @@ in sources."@cspell/dict-powershell-1.0.19" sources."@cspell/dict-public-licenses-1.0.4" sources."@cspell/dict-python-2.0.5" + sources."@cspell/dict-r-1.0.1" sources."@cspell/dict-ruby-1.0.15" sources."@cspell/dict-rust-1.0.23" sources."@cspell/dict-scala-1.0.21" - sources."@cspell/dict-software-terms-2.0.12" + sources."@cspell/dict-software-terms-2.0.14" sources."@cspell/dict-swift-1.0.1" - sources."@cspell/dict-typescript-1.0.19" + sources."@cspell/dict-typescript-1.0.20" sources."@cspell/dict-vue-2.0.1" sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.1" @@ -86153,28 +86438,29 @@ in sources."clear-module-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.3.0" - sources."comment-json-4.1.1" + sources."commander-9.0.0" + sources."comment-json-4.2.2" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."core-util-is-1.0.3" sources."cosmiconfig-7.0.1" sources."crypto-random-string-2.0.0" - sources."cspell-gitignore-5.16.0" - sources."cspell-glob-5.16.0" - sources."cspell-io-5.16.0" - sources."cspell-lib-5.16.0" - sources."cspell-trie-lib-5.16.0" + sources."cspell-gitignore-5.18.4" + sources."cspell-glob-5.18.4" + sources."cspell-io-5.18.4" + sources."cspell-lib-5.18.4" + sources."cspell-trie-lib-5.18.4" sources."dot-prop-5.3.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."fast-equals-2.0.4" sources."fast-json-stable-stringify-2.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."gensequence-3.1.1" @@ -86210,7 +86496,7 @@ in ]; }) sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -86225,7 +86511,7 @@ in sources."resolve-global-1.0.0" sources."rimraf-3.0.2" sources."semver-7.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" @@ -86363,7 +86649,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."bulk-write-stream-1.1.4" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -86602,7 +86888,7 @@ in sources."mime-types-2.1.34" sources."mimic-response-2.1.0" sources."min-document-2.19.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mirror-folder-3.1.0" (sources."mixin-deep-1.3.2" // { @@ -86716,10 +87002,10 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shuffled-priority-queue-2.1.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."signed-varint-2.0.1" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" (sources."siphash24-1.3.0" // { dependencies = [ sources."nanoassert-2.0.0" @@ -86920,14 +87206,11 @@ in version = "1.26.0"; src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.16.8" // { + sources."@babel/compat-data-7.17.0" + sources."@babel/core-7.17.0" + (sources."@babel/generator-7.17.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -86935,8 +87218,8 @@ in sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" @@ -86956,9 +87239,9 @@ in sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -87030,16 +87313,19 @@ in sources."@babel/preset-env-7.16.11" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.16.7" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@blueprintjs/colors-4.0.0-beta.3" sources."@blueprintjs/core-3.52.0" sources."@blueprintjs/icons-3.31.0" sources."@deltachat/message_parser_wasm-0.1.0" sources."@electron/get-1.13.1" sources."@hypnosphi/create-react-context-0.3.1" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@mapbox/extent-0.4.0" sources."@mapbox/geojson-coords-0.0.2" sources."@mapbox/geojson-extent-1.0.1" @@ -87061,16 +87347,16 @@ in sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" - sources."@types/node-14.18.9" + sources."@types/node-14.18.10" sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" - sources."@types/react-16.14.21" + sources."@types/react-16.14.23" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" - sources."@types/react-window-infinite-loader-1.0.5" + sources."@types/react-window-infinite-loader-1.0.6" sources."@types/scheduler-0.16.2" - sources."@types/url-parse-1.4.7" + sources."@types/url-parse-1.4.8" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -87092,7 +87378,7 @@ in sources."atob-2.1.2" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-polyfill-corejs2-0.3.1" - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" (sources."base-0.11.2" // { dependencies = [ @@ -87118,7 +87404,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -87159,7 +87445,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -87184,8 +87470,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.6.7" - sources."electron-to-chromium-1.4.51" + sources."electron-13.6.9" + sources."electron-to-chromium-1.4.65" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -87438,14 +87724,14 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.1" - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -87465,7 +87751,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.49.0" // { + (sources."sass-1.49.7" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -87687,7 +87973,7 @@ in sources."lodash-4.17.21" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -87712,7 +87998,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" @@ -87739,14 +88025,14 @@ in sources."dockerfile-ast-0.4.2" sources."dockerfile-language-service-0.8.1" sources."dockerfile-utils-0.9.4" - sources."vscode-jsonrpc-8.0.0-next.5" - sources."vscode-languageserver-8.0.0-next.6" - (sources."vscode-languageserver-protocol-3.17.0-next.12" // { + sources."vscode-jsonrpc-8.0.0-next.6" + sources."vscode-languageserver-8.0.0-next.8" + (sources."vscode-languageserver-protocol-3.17.0-next.14" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.6" + sources."vscode-languageserver-types-3.17.0-next.7" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.17.0-next.3" ]; buildInputs = globalBuildInputs; @@ -87762,15 +88048,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.79.3"; + version = "6.80.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.79.3.tgz"; - sha512 = "u4NUMlGJjJXOnRfp6LXSVQdQzaVmjsXJwaUxvRBEUxjVhC2WEptTkyuCcsyLLOof3oEaEonC7gJC/+eXd1I+6g=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.80.1.tgz"; + sha512 = "s3E6aSo3DLkdrjuB4WhMDTzezvj/aLd+SBBQZMoZAX87u/2s/DnGjl9JLBJzhc+9zrhKAezYwu6d2p5lLF8WDQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.9" + sources."@types/node-14.18.10" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.6" @@ -87785,7 +88071,7 @@ in sources."big.js-5.2.2" sources."buffer-4.9.2" sources."buffer-queue-1.0.0" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" @@ -87965,7 +88251,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-1.1.0" sources."@npmcli/move-file-1.1.2" - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.4.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" @@ -87973,7 +88259,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -88239,7 +88525,7 @@ in sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."junk-3.1.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -88275,7 +88561,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" @@ -88289,7 +88575,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.5.0" + sources."node-abi-3.8.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" sources."node-fetch-2.6.7" @@ -88412,7 +88698,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."single-line-log-1.1.2" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -88422,7 +88708,7 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" @@ -88547,14 +88833,15 @@ in sha512 = "ceJSyC2s1VCIqyzGkHeJkWBq/85QXaHM+0rZ1lRRtmcK9CsfRDyLSIZ7KJDZhPdIRUXBgBkdcOAW3AIu/yO/ew=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" (sources."@babel/helper-compilation-targets-7.16.7" // { dependencies = [ @@ -88572,9 +88859,9 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-proposal-object-rest-spread-7.16.7" sources."@babel/plugin-syntax-jsx-7.16.7" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -88582,8 +88869,11 @@ in sources."@babel/plugin-transform-parameters-7.16.7" sources."@babel/plugin-transform-react-jsx-7.16.7" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/yoga-layout-1.9.2" @@ -88608,7 +88898,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -88637,7 +88927,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -88674,7 +88964,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."ink-text-input-4.0.2" // { + (sources."ink-text-input-4.0.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -88722,7 +89012,7 @@ in }) sources."mimic-fn-3.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."ms-2.1.2" @@ -88763,7 +89053,7 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.22.1" + sources."react-devtools-core-4.23.0" sources."react-is-16.13.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { @@ -88791,7 +89081,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.3" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -88882,7 +89172,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.181.0" + sources."@fluentui/react-7.181.1" sources."@fluentui/react-focus-7.18.1" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -88897,7 +89187,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.244" + sources."@microsoft/load-themed-styles-1.10.245" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -88975,7 +89265,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-5.7.4" sources."after-0.8.2" sources."aggregate-error-3.1.0" @@ -89412,7 +89702,7 @@ in sources."express-openapi-7.0.1" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -89766,7 +90056,7 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { dependencies = [ @@ -89857,7 +90147,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."next-tick-1.0.0" sources."node-addon-api-2.0.0" @@ -89926,7 +90216,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.181.0" + sources."office-ui-fabric-react-7.181.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -90041,7 +90331,7 @@ in }) sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" - sources."pg-pool-3.4.1" + sources."pg-pool-3.5.1" sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" @@ -90153,7 +90443,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.49.0" // { + (sources."sass-1.49.7" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -90185,7 +90475,7 @@ in sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" sources."sift-7.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -90431,7 +90721,7 @@ in }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.3" + sources."url-toolkit-2.2.5" sources."use-3.1.1" sources."util-0.11.1" sources."util-deprecate-1.0.2" @@ -90576,10 +90866,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.7.0"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz"; - sha512 = "ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz"; + sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; }; dependencies = [ (sources."@eslint/eslintrc-1.0.5" // { @@ -90587,7 +90877,7 @@ in sources."ignore-4.0.6" ]; }) - sources."@humanwhocodes/config-array-0.9.2" + sources."@humanwhocodes/config-array-0.9.3" sources."@humanwhocodes/object-schema-1.2.1" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -90624,12 +90914,12 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.0" sources."glob-parent-6.0.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."has-flag-4.0.0" sources."ignore-5.2.0" sources."import-fresh-3.3.0" @@ -90644,7 +90934,7 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" sources."lodash.merge-4.6.2" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."ms-2.1.2" sources."natural-compare-1.4.0" sources."once-1.4.0" @@ -90764,12 +91054,12 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -90788,7 +91078,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."ms-2.1.2" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" @@ -90821,7 +91111,7 @@ in sources."supports-color-8.1.1" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -90878,7 +91168,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" @@ -90888,25 +91178,25 @@ in sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.16.7" // { dependencies = [ sources."@babel/code-frame-7.16.7" ]; }) - (sources."@babel/traverse-7.16.10" // { + (sources."@babel/traverse-7.17.0" // { dependencies = [ sources."@babel/code-frame-7.16.7" ]; }) - sources."@babel/types-7.16.8" + sources."@babel/types-7.17.0" sources."@expo/apple-utils-0.0.0-alpha.26" sources."@expo/bunyan-4.0.0" sources."@expo/config-6.0.14" @@ -91015,7 +91305,7 @@ in sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.4.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" @@ -91028,7 +91318,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" @@ -91074,7 +91364,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-6.4.2" sources."address-1.1.2" sources."agent-base-6.0.2" @@ -91236,7 +91526,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -91494,7 +91784,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91904,7 +92194,7 @@ in ]; }) sources."jimp-compact-0.16.1" - sources."joi-17.5.0" + sources."joi-17.6.0" sources."join-component-1.1.0" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { @@ -91933,7 +92223,7 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.2" sources."keychain-1.3.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."killable-1.0.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" @@ -92010,7 +92300,7 @@ in }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minipass-2.3.5" // { dependencies = [ @@ -92077,7 +92367,7 @@ in sources."debug-3.2.7" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nested-error-stacks-2.0.1" sources."nice-try-1.0.5" @@ -92272,7 +92562,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" @@ -92512,7 +92802,11 @@ in sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."readdirp-3.6.0" - sources."recursive-readdir-2.2.2" + (sources."recursive-readdir-2.2.2" // { + dependencies = [ + sources."minimatch-3.0.4" + ]; + }) sources."regenerator-runtime-0.13.9" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.1" @@ -92616,7 +92910,7 @@ in sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."simple-plist-1.3.0" // { dependencies = [ sources."bplist-parser-0.3.0" @@ -92672,7 +92966,7 @@ in sources."faye-websocket-0.11.4" ]; }) - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-list-map-2.0.1" sources."source-map-0.5.7" @@ -93059,6 +93353,7 @@ in sources."bplist-parser-0.3.1" sources."chownr-1.1.4" sources."fs-minipass-1.2.7" + sources."minimatch-3.0.4" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."p-map-3.0.0" @@ -93111,16 +93406,17 @@ in fast-cli = nodeEnv.buildNodePackage { name = "fast-cli"; packageName = "fast-cli"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-cli/-/fast-cli-3.1.0.tgz"; - sha512 = "vpRrhwFHZGzf/cGKbl1m/JUx+H27zmeUMaOsCknEmKHPvDlL+HQL6YTxK4XYRCUEQmxOGYOUSGG4udBpprG7gg=="; + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-3.2.0.tgz"; + sha512 = "sA4bbCHFe8DqtRjlIVD5Hga+tDpYOgoOOG+NKyLFYJfLrxlmU28RmSjr+pC15q0xU67g7Ut3jDskasmjeLgRsg=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.12" - sources."@babel/generator-7.16.8" + sources."@babel/compat-data-7.17.0" + sources."@babel/core-7.17.0" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" sources."@babel/helper-environment-visitor-7.16.7" @@ -93134,9 +93430,9 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-proposal-object-rest-spread-7.16.7" sources."@babel/plugin-syntax-jsx-7.16.7" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -93144,10 +93440,13 @@ in sources."@babel/plugin-transform-parameters-7.16.7" sources."@babel/plugin-transform-react-jsx-7.16.7" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -93174,7 +93473,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -93198,7 +93497,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.948846" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -93260,12 +93559,12 @@ in }) sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."node-fetch-2.6.5" + sources."node-fetch-2.6.7" sources."node-releases-2.0.1" (sources."normalize-package-data-3.0.3" // { dependencies = [ @@ -93289,7 +93588,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - (sources."puppeteer-13.1.1" // { + (sources."puppeteer-13.1.3" // { dependencies = [ sources."debug-4.3.2" sources."ws-8.2.3" @@ -93297,7 +93596,7 @@ in }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.22.1" + sources."react-devtools-core-4.23.0" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -93322,7 +93621,7 @@ in sources."scheduler-0.20.2" sources."semver-6.3.0" sources."shell-quote-1.7.3" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -93413,10 +93712,11 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.16" - sources."@oclif/config-1.18.2" + sources."@oclif/config-1.18.3" sources."@oclif/errors-1.3.5" (sources."@oclif/help-1.0.1" // { dependencies = [ + sources."@oclif/config-1.18.2" sources."wrap-ansi-6.2.0" ]; }) @@ -93451,7 +93751,6 @@ in }) sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."abort-controller-3.0.0" sources."ajv-6.12.6" sources."ansi-align-3.0.1" sources."ansi-escapes-3.2.0" @@ -93546,7 +93845,6 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."event-target-shim-5.0.1" sources."execa-0.10.0" sources."extend-3.0.2" sources."external-editor-3.1.0" @@ -93557,7 +93855,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - sources."faunadb-4.4.1" + sources."faunadb-4.5.2" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -93657,6 +93955,7 @@ in ]; }) sources."nice-try-1.0.5" + sources."node-abort-controller-3.0.1" sources."node-fetch-2.6.7" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" @@ -93707,7 +94006,7 @@ in sources."semver-7.3.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sort-keys-2.0.0" sources."source-map-0.6.1" @@ -93775,10 +94074,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "10.1.2"; + version = "10.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.1.2.tgz"; - sha512 = "Z8TA9wGeN5vbl/NJBhiwrm2RLmZgHPvv9G4mQhqyWkfcrlglWwqxgA4KsmZABwtyE7A4teDC4yBdw4K7d6JTcw=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.1.4.tgz"; + sha512 = "TtIpTLHOOaFxnCPiNAapuQswu1DS/wLHM2CGb+cAuqgpeUZ+V3KnLVC1HqFNbXzsDmSPjFikGyN3e8IMlNPmig=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -93792,8 +94091,8 @@ in sources."@google-cloud/precise-date-2.0.4" sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" - sources."@google-cloud/pubsub-2.18.4" - sources."@grpc/grpc-js-1.4.6" + sources."@google-cloud/pubsub-2.18.5" + sources."@grpc/grpc-js-1.5.4" sources."@grpc/proto-loader-0.6.9" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.1.0" // { @@ -93806,8 +94105,8 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@opentelemetry/api-1.0.4" - sources."@opentelemetry/semantic-conventions-0.24.0" + sources."@opentelemetry/api-1.1.0" + sources."@opentelemetry/semantic-conventions-1.0.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -93824,17 +94123,17 @@ in sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.0" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -93977,7 +94276,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" - sources."crc-32-1.2.0" + sources."crc-32-1.2.1" sources."crc32-stream-4.0.2" (sources."cross-env-5.2.1" // { dependencies = [ @@ -94052,7 +94351,7 @@ in sources."events-listener-1.1.0" (sources."exegesis-4.1.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" sources."semver-7.3.5" ]; @@ -94068,7 +94367,7 @@ in }) (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -94144,7 +94443,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-7.11.0" - sources."google-gax-2.28.1" + sources."google-gax-2.29.4" sources."google-p12-pem-3.1.3" sources."got-9.6.0" sources."graceful-fs-4.2.9" @@ -94216,7 +94515,7 @@ in sources."json-bigint-1.0.0" sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" - sources."json-ptr-3.0.1" + sources."json-ptr-3.1.0" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -94268,6 +94567,7 @@ in (sources."logform-2.3.2" // { dependencies = [ sources."colors-1.4.0" + sources."safe-stable-stringify-1.1.1" ]; }) sources."long-4.0.0" @@ -94284,7 +94584,7 @@ in sources."socks-proxy-agent-6.1.1" ]; }) - sources."marked-4.0.10" + sources."marked-4.0.12" (sources."marked-terminal-3.3.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -94309,7 +94609,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" @@ -94334,7 +94634,7 @@ in sources."async-1.5.2" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."netmask-2.0.2" sources."next-tick-1.0.0" sources."nice-try-1.0.5" @@ -94388,12 +94688,16 @@ in }) sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."printj-1.1.2" + sources."printj-1.3.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" + (sources."promise-retry-2.0.1" // { + dependencies = [ + sources."retry-0.12.0" + ]; + }) sources."proto3-json-serializer-0.1.8" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" @@ -94429,7 +94733,7 @@ in sources."require-from-string-2.0.2" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."retry-request-4.2.2" sources."rimraf-3.0.2" (sources."router-1.3.6" // { @@ -94443,7 +94747,7 @@ in sources."run-async-2.4.1" sources."rxjs-7.5.2" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" (sources."semver-diff-3.1.1" // { @@ -94468,10 +94772,10 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -94562,11 +94866,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - (sources."universal-analytics-0.4.23" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) + sources."universal-analytics-0.5.3" sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unzipper-0.10.11" // { @@ -94608,8 +94908,8 @@ in sources."which-1.3.1" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - sources."winston-3.4.0" - sources."winston-transport-4.4.2" + sources."winston-3.5.1" + sources."winston-transport-4.5.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" @@ -94661,7 +94961,7 @@ in sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."json5-relaxed-0.5.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."require-directory-2.1.1" @@ -94716,7 +95016,7 @@ in sources."bl-4.1.0" sources."buffer-5.7.1" sources."camelcase-6.3.0" - (sources."camelcase-keys-7.0.1" // { + (sources."camelcase-keys-7.0.2" // { dependencies = [ sources."type-fest-1.4.0" ]; @@ -94855,7 +95155,7 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { dependencies = [ sources."ansi-styles-6.1.0" @@ -94907,7 +95207,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -94962,7 +95262,7 @@ in sources."esprima-4.0.1" sources."ethereum-bloom-filters-1.0.10" sources."ethereum-cryptography-0.1.3" - (sources."ethereumjs-util-7.1.3" // { + (sources."ethereumjs-util-7.1.4" // { dependencies = [ sources."bn.js-5.2.0" ]; @@ -95074,7 +95374,7 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" sources."stealthy-require-1.1.1" @@ -95139,12 +95439,13 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-4.0.2.tgz"; - sha512 = "4m31xy8+Rszy1Dq6grPF1dDoEXW5su94JLT3cH0RJcgt+htu9NKVdeNMUeNtUbJ9iSYfuAL3ZpKW8/WTFXu2Sg=="; + url = "https://registry.npmjs.org/forever/-/forever-4.0.3.tgz"; + sha512 = "N8aVtvB3bdh3lXPE9Rb+ErISSnJsAkv0GgZ0h6qtN8UXFgcSqJNMyBst9r3SBNk6+n4iBVaZso16mr1SUVvG3Q=="; }; dependencies = [ + sources."@dabh/diagnostics-2.0.2" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -95205,12 +95506,23 @@ in }) (sources."cliff-0.1.10" // { dependencies = [ + sources."async-0.2.10" sources."colors-1.0.3" + (sources."winston-0.8.3" // { + dependencies = [ + sources."colors-0.6.2" + ]; + }) ]; }) sources."clone-2.1.2" sources."collection-visit-1.0.0" + sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.9.0" sources."colors-0.6.2" + sources."colorspace-1.1.4" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."configstore-4.0.0" @@ -95227,6 +95539,7 @@ in sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" + sources."enabled-2.0.0" sources."es-abstract-1.19.1" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" @@ -95260,6 +95573,7 @@ in ]; }) sources."eyes-0.1.8" + sources."fecha-4.2.1" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -95268,6 +95582,7 @@ in ]; }) sources."flatiron-0.4.3" + sources."fn.name-1.1.0" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-monitor-3.0.3" @@ -95304,6 +95619,7 @@ in sources."internal-slot-1.0.3" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" + sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" @@ -95328,6 +95644,7 @@ in sources."is-regex-1.1.4" sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.1" + sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" @@ -95340,13 +95657,21 @@ in sources."isstream-0.1.2" sources."jsonify-0.0.0" sources."kind-of-6.0.3" + sources."kuler-2.0.0" sources."lazy-1.0.11" + (sources."logform-2.3.2" // { + dependencies = [ + sources."colors-1.4.0" + sources."ms-2.1.3" + sources."safe-stable-stringify-1.1.1" + ]; + }) sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" sources."micromatch-3.1.10" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-0.0.10" sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.5" // { @@ -95391,6 +95716,7 @@ in sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" + sources."one-time-1.0.0" sources."optimist-0.6.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -95406,7 +95732,12 @@ in ]; }) sources."process-nextick-args-2.0.1" - sources."prompt-0.2.14" + (sources."prompt-0.2.14" // { + dependencies = [ + sources."async-0.2.10" + sources."winston-0.8.3" + ]; + }) sources."ps-tree-1.2.0" sources."read-1.0.7" (sources."readable-stream-2.3.7" // { @@ -95427,6 +95758,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safe-stable-stringify-2.3.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -95435,7 +95767,8 @@ in }) sources."shush-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" + sources."simple-swizzle-0.2.2" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -95498,6 +95831,7 @@ in sources."deep-equal-0.1.2" ]; }) + sources."text-hex-1.0.0" sources."through-2.3.8" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -95506,6 +95840,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."triple-beam-1.3.0" sources."unbox-primitive-1.0.1" (sources."union-value-1.0.1" // { dependencies = [ @@ -95536,9 +95871,15 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-typed-array-1.1.7" - (sources."winston-0.8.3" // { + (sources."winston-3.5.1" // { dependencies = [ - sources."async-0.2.10" + sources."async-3.2.3" + sources."readable-stream-3.6.0" + ]; + }) + (sources."winston-transport-4.5.0" // { + dependencies = [ + sources."readable-stream-3.6.0" ]; }) sources."wordwrap-0.0.3" @@ -95611,21 +95952,21 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.5.2"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.5.2.tgz"; - sha512 = "AAltHfDTqOq4RL0oBgsmZb+IIDiV1zMdEzCgYIeEqWtc7nesKwHs4myYqhQV8wmXwyWKKWuXuTAqSoxuQT+X5w=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.6.1.tgz"; + sha512 = "+yrFjkoJFNbxBhQdhWZaQ6X8p/9Z9pdVptrAoJH9FVSvckLFRVj2Rws5fkqcBZGMUYkKDqqgo0sLQUbXBWjQjg=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.0" // { dependencies = [ sources."semver-6.3.0" - sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.8" // { + (sources."@babel/generator-7.17.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -95646,23 +95987,26 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.12" - sources."@babel/runtime-7.16.7" + sources."@babel/parser-7.17.0" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@hapi/hoek-9.2.1" sources."@hapi/topo-5.1.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.4.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.1.7" @@ -95671,7 +96015,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/node-fetch-2.5.12" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -95681,7 +96025,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.1" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."arch-2.2.0" sources."async-retry-ng-2.0.1" @@ -95700,7 +96044,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95725,7 +96069,6 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" ]; }) @@ -95738,7 +96081,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.5.1" + sources."create-gatsby-2.6.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -95765,7 +96108,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -95799,8 +96142,8 @@ in sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.5.2" - (sources."gatsby-telemetry-3.5.2" // { + sources."gatsby-core-utils-3.6.0" + (sources."gatsby-telemetry-3.6.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95839,11 +96182,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."inquirer-7.3.3" sources."is-ci-2.0.0" sources."is-docker-2.2.1" sources."is-extglob-1.0.0" @@ -95861,13 +96200,13 @@ in sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" - sources."joi-17.5.0" + sources."joi-17.6.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" sources."json5-2.2.0" sources."jsonfile-6.1.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."kleur-3.0.3" sources."latest-version-5.1.0" sources."locate-path-5.0.0" @@ -95886,7 +96225,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -95935,7 +96274,7 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."picocolors-1.0.0" sources."prepend-http-2.0.0" sources."pretty-error-2.1.2" @@ -95962,7 +96301,6 @@ in sources."registry-url-5.1.0" (sources."renderkid-2.0.7" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."strip-ansi-3.0.1" ]; }) @@ -95989,31 +96327,27 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" sources."source-map-0.7.3" sources."split-on-first-1.1.0" sources."stack-trace-0.0.10" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - (sources."strip-ansi-5.2.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.1" ]; }) sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" sources."through-2.3.8" @@ -96042,7 +96376,6 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -96059,7 +96392,9 @@ in sources."yoga-layout-prebuilt-1.10.0" (sources."yurnalist-2.1.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."chalk-2.4.2" + sources."strip-ansi-5.2.0" ]; }) ]; @@ -96076,10 +96411,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.6.tgz"; - sha512 = "cSSf/fBruT8zs12vg5X2rSpmwjnq/u9vpRrUPjxudm8T6a268NEe6JlphRAES3SpO65SZs7XI11UIY8NMJSqZg=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.7.tgz"; + sha512 = "T6i3kosKqbzgVP99cFpGyovKpNHpTmxPIZjfbNMlyCinj1oIclZ3qcHnI7jttJbXb/XHfNPqDLKQEHL+jCHTZQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -96157,7 +96492,7 @@ in sources."lru-cache-6.0.0" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."ms-2.1.2" sources."node-fetch-2.6.7" @@ -96195,7 +96530,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sort-keys-4.2.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -96371,17 +96706,17 @@ in sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" - sources."multiserver-3.7.2" + sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" - sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.5.4" + sources."multiserver-scopes-2.0.0" + sources."muxrpc-6.7.0" sources."nearley-2.20.1" sources."node-gyp-build-4.3.0" sources."node-polyglot-1.0.0" - sources."non-private-ip-1.4.4" + sources."non-private-ip-2.2.0" sources."os-homedir-1.0.2" sources."packet-stream-2.0.6" - sources."packet-stream-codec-1.1.3" + sources."packet-stream-codec-1.2.0" sources."pako-1.0.11" sources."private-box-0.3.1" sources."progress-1.1.8" @@ -96442,7 +96777,7 @@ in sources."separator-escape-0.0.1" sources."sha.js-2.4.5" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -96464,7 +96799,11 @@ in }) ]; }) - sources."ssb-config-2.3.9" + (sources."ssb-config-2.3.9" // { + dependencies = [ + sources."non-private-ip-1.4.4" + ]; + }) sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" @@ -96527,21 +96866,21 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "35.1.0"; + version = "35.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.1.0.tgz"; - sha512 = "hQ+sXT//GPp5ZwqujZ6p5O7MmvO4sgF8D5mhnRCBmp5oPGyJ3+1r9pfFnWI+BIFOpO9pi0+L1ZljNJS3175SfA=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.3.0.tgz"; + sha512 = "9oHGYdwHStVXYkqOPTmEfvRO0IirrN8GNSRB0jUqbu52wfdFKQ3Uz5tReupWG8ERqcMmmEZ9c/L5rqbjgUr3Lw=="; }; dependencies = [ - sources."@gitbeaker/core-35.1.0" - sources."@gitbeaker/node-35.1.0" - sources."@gitbeaker/requester-utils-35.1.0" - sources."@sindresorhus/is-4.3.0" + sources."@gitbeaker/core-35.3.0" + sources."@gitbeaker/node-35.3.0" + sources."@gitbeaker/requester-utils-35.3.0" + sources."@sindresorhus/is-4.4.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -96587,7 +96926,7 @@ in sources."is-interactive-2.0.0" sources."is-unicode-supported-1.1.0" sources."json-buffer-3.0.1" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."li-1.3.0" (sources."log-symbols-5.1.0" // { dependencies = [ @@ -96608,7 +96947,7 @@ in sources."p-cancelable-2.1.1" sources."pump-3.0.0" sources."qs-6.10.3" - sources."query-string-7.1.0" + sources."query-string-7.1.1" sources."quick-lru-5.1.1" sources."readable-stream-3.6.0" sources."resolve-alpn-1.2.1" @@ -96616,7 +96955,7 @@ in sources."restore-cursor-4.0.0" sources."safe-buffer-5.2.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."split-on-first-1.1.0" sources."strict-uri-encode-2.0.0" sources."string_decoder-1.3.0" @@ -96641,10 +96980,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.7.0.tgz"; - sha512 = "8PVebGkXGXlNE2T7You4gzX4SFiULZja38LInfmnJQFfMgmeOT8br/WpirCkqhBVA28tTMYflQj5QGoeGLfTUQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.8.0.tgz"; + sha512 = "ZsO1OzFXEM53+K5yUUHRg7fwJqomkq2YLfgrKUr4rbIccQAybNNyp2x91GjDhnky7I/hkeiio5iImtTLr23KEw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -96665,7 +97004,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."agent-base-6.0.2" - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."ajv-formats-2.1.1" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -96931,9 +97270,9 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."spdx-correct-3.1.1" @@ -97007,7 +97346,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" @@ -97105,7 +97444,7 @@ in sources."pify-3.0.0" ]; }) - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.3" @@ -97125,7 +97464,7 @@ in sources."kleur-3.0.3" ]; }) - sources."query-string-7.1.0" + sources."query-string-7.1.1" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -97263,7 +97602,7 @@ in }) (sources."@graphql-tools/schema-8.3.1" // { dependencies = [ - sources."@graphql-tools/merge-8.2.1" + sources."@graphql-tools/merge-8.2.2" sources."@graphql-tools/utils-8.6.1" sources."tslib-2.3.1" ]; @@ -97295,7 +97634,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-17.0.10" + sources."@types/node-17.0.15" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -97443,6 +97782,7 @@ in (sources."graphql-config-3.0.3" // { dependencies = [ sources."cosmiconfig-6.0.0" + sources."minimatch-3.0.4" ]; }) sources."graphql-subscriptions-1.2.1" @@ -97566,7 +97906,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minizlib-2.1.2" @@ -97682,7 +98022,7 @@ in sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-git-2.21.0" sources."slash-3.0.0" sources."sprintf-js-1.0.3" @@ -97790,9 +98130,9 @@ in sources."@graphql-tools/import-6.6.5" sources."@graphql-tools/json-file-loader-7.3.3" sources."@graphql-tools/load-7.5.1" - sources."@graphql-tools/merge-8.2.1" + sources."@graphql-tools/merge-8.2.2" sources."@graphql-tools/schema-8.3.1" - (sources."@graphql-tools/url-loader-7.7.0" // { + (sources."@graphql-tools/url-loader-7.7.1" // { dependencies = [ (sources."subscriptions-transport-ws-0.11.0" // { dependencies = [ @@ -97835,12 +98175,12 @@ in }) sources."@oclif/screen-1.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/parse-json-4.0.0" - sources."@types/websocket-1.0.4" + sources."@types/websocket-1.0.5" sources."@types/ws-8.2.2" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -97866,7 +98206,7 @@ in sources."callsites-3.1.0" sources."cardinal-2.1.1" sources."chalk-4.1.2" - sources."chroma-js-2.1.2" + sources."chroma-js-2.4.2" sources."clean-stack-3.0.1" (sources."cli-ux-4.9.3" // { dependencies = [ @@ -97897,21 +98237,12 @@ in sources."cosmiconfig-7.0.1" sources."cosmiconfig-toml-loader-1.0.0" sources."create-require-1.1.1" - (sources."cross-env-6.0.3" // { - dependencies = [ - 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."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."cross-undici-fetch-0.1.16" + sources."cross-undici-fetch-0.1.23" sources."cwise-compiler-1.1.3" sources."dataloader-2.0.0" sources."debug-4.3.3" @@ -98024,7 +98355,7 @@ in sources."ms-2.1.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nextgen-events-1.5.2" sources."nice-try-1.0.5" sources."node-bitmap-0.0.1" @@ -98109,7 +98440,7 @@ in sources."ts-node-9.1.1" sources."tslib-2.3.1" sources."type-is-1.6.18" - sources."undici-4.12.2" + sources."undici-4.13.0" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" @@ -98247,7 +98578,7 @@ in sha512 = "aTPHEnqnIDzsCcL7O7FPnMmKN0Z9Sy5rl58atknikYbLISiu3LHESWUFvFGHHodSs0NVCGM/m5OR5BIVWYxnMg=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."array-flatten-1.1.1" sources."body-parser-1.19.1" sources."bytes-3.1.1" @@ -98279,7 +98610,7 @@ in sources."mime-types-2.1.34" sources."minimist-1.2.5" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."on-finished-2.3.0" sources."options-0.0.6" sources."parseurl-1.3.3" @@ -98439,7 +98770,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.10.7" + sources."systeminformation-5.11.2" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -98605,7 +98936,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -98718,7 +99049,7 @@ in ]; }) sources."micromatch-3.1.10" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -99016,7 +99347,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -99337,7 +99668,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -99353,10 +99684,10 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.1.tgz"; - sha512 = "d6k9QnjrLDl7FXNqyXHaEV5voTuaJYZ/iWkub1gMBwG40CvGJpxMbLb1vcw4eGxV1DOLNRk81WSkgHsjj6RVyA=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.2.tgz"; + sha512 = "3rUS4ROXjyRidMiThTXhwtAotmGvOOof3uUk1X0YWjJF63qOP0sorogfgvo+XFcp5Q6IWhiFcZqd3giCrKHg+g=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -99378,7 +99709,7 @@ in sources."is-dotfile-1.0.3" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."node-fetch-2.6.7" sources."once-1.4.0" sources."parse-glob-3.0.4" @@ -99477,7 +99808,7 @@ in sources."bfile-0.2.2" sources."bfilter-1.0.5" sources."bheep-0.1.5" - sources."binet-0.3.6" + sources."binet-0.3.7" sources."blgr-0.2.0" sources."blru-0.1.6" sources."blst-0.1.5" @@ -99596,7 +99927,7 @@ in sources."inherits-2.0.4" sources."latest-0.2.0" sources."lstream-0.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mired-0.0.0" sources."npm-2.15.12" sources."once-1.4.0" @@ -99632,7 +99963,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.9" + sources."@types/node-14.18.10" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -99641,7 +99972,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1062.0" + sources."aws-sdk-2.1069.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -100105,7 +100436,7 @@ in sources."inherits-2.0.4" sources."isarray-0.0.1" sources."isstream-0.1.2" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-0.0.10" (sources."mkdirp-0.5.5" // { dependencies = [ @@ -100216,7 +100547,7 @@ in sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."once-1.4.0" @@ -100231,7 +100562,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."strip-eof-1.0.0" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -100390,7 +100721,7 @@ in sources."micromatch-4.0.4" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."nopt-5.0.0" @@ -100426,7 +100757,7 @@ in sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."vscode-css-languageservice-5.1.9" // { + (sources."vscode-css-languageservice-5.1.12" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; @@ -100448,7 +100779,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.17.0-next.1" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" @@ -100639,7 +100970,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -100690,7 +101021,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -100700,7 +101031,7 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."split2-3.2.2" @@ -100906,7 +101237,7 @@ in sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."once-1.4.0" @@ -100933,7 +101264,7 @@ in ]; }) sources."seq-0.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."source-map-resolve-0.6.0" sources."spiro-3.0.0" @@ -101011,7 +101342,7 @@ in sources."escape-string-regexp-1.0.5" sources."filelist-1.0.2" sources."has-flag-3.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."supports-color-5.5.0" ]; buildInputs = globalBuildInputs; @@ -101040,7 +101371,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."bufrw-1.3.0" - sources."chai-4.3.4" + sources."chai-4.3.6" sources."chai-as-promised-7.1.1" sources."chalk-2.4.2" sources."check-error-1.0.2" @@ -101064,7 +101395,8 @@ in sources."jaeger-client-3.19.0" sources."lodash-4.17.21" sources."long-2.4.0" - sources."minimatch-3.0.4" + sources."loupe-2.3.3" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mz-2.7.0" sources."node-int64-0.4.0" @@ -101149,86 +101481,86 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.47.2" - sources."@aws-sdk/chunked-blob-reader-3.47.1" - sources."@aws-sdk/chunked-blob-reader-native-3.47.2" - sources."@aws-sdk/client-s3-3.48.0" - sources."@aws-sdk/client-sso-3.48.0" - sources."@aws-sdk/client-sts-3.48.0" - sources."@aws-sdk/config-resolver-3.47.2" - sources."@aws-sdk/credential-provider-env-3.47.2" - sources."@aws-sdk/credential-provider-imds-3.47.2" - sources."@aws-sdk/credential-provider-ini-3.48.0" - sources."@aws-sdk/credential-provider-node-3.48.0" - sources."@aws-sdk/credential-provider-process-3.47.2" - sources."@aws-sdk/credential-provider-sso-3.48.0" - sources."@aws-sdk/credential-provider-web-identity-3.47.2" - sources."@aws-sdk/eventstream-marshaller-3.47.2" - sources."@aws-sdk/eventstream-serde-browser-3.47.2" - sources."@aws-sdk/eventstream-serde-config-resolver-3.47.2" - sources."@aws-sdk/eventstream-serde-node-3.47.2" - sources."@aws-sdk/eventstream-serde-universal-3.47.2" - sources."@aws-sdk/fetch-http-handler-3.47.2" - sources."@aws-sdk/hash-blob-browser-3.47.2" - sources."@aws-sdk/hash-node-3.47.2" - sources."@aws-sdk/hash-stream-node-3.47.2" - sources."@aws-sdk/invalid-dependency-3.47.2" - sources."@aws-sdk/is-array-buffer-3.47.1" - sources."@aws-sdk/md5-js-3.47.2" - sources."@aws-sdk/middleware-apply-body-checksum-3.47.2" - sources."@aws-sdk/middleware-bucket-endpoint-3.47.2" - sources."@aws-sdk/middleware-content-length-3.47.2" - sources."@aws-sdk/middleware-expect-continue-3.47.2" - sources."@aws-sdk/middleware-header-default-3.47.2" - sources."@aws-sdk/middleware-host-header-3.47.2" - sources."@aws-sdk/middleware-location-constraint-3.47.2" - sources."@aws-sdk/middleware-logger-3.47.2" - (sources."@aws-sdk/middleware-retry-3.47.2" // { + sources."@aws-sdk/abort-controller-3.49.0" + sources."@aws-sdk/chunked-blob-reader-3.49.0" + sources."@aws-sdk/chunked-blob-reader-native-3.49.0" + sources."@aws-sdk/client-s3-3.49.0" + sources."@aws-sdk/client-sso-3.49.0" + sources."@aws-sdk/client-sts-3.49.0" + sources."@aws-sdk/config-resolver-3.49.0" + sources."@aws-sdk/credential-provider-env-3.49.0" + sources."@aws-sdk/credential-provider-imds-3.49.0" + sources."@aws-sdk/credential-provider-ini-3.49.0" + sources."@aws-sdk/credential-provider-node-3.49.0" + sources."@aws-sdk/credential-provider-process-3.49.0" + sources."@aws-sdk/credential-provider-sso-3.49.0" + sources."@aws-sdk/credential-provider-web-identity-3.49.0" + sources."@aws-sdk/eventstream-marshaller-3.49.0" + sources."@aws-sdk/eventstream-serde-browser-3.49.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.49.0" + sources."@aws-sdk/eventstream-serde-node-3.49.0" + sources."@aws-sdk/eventstream-serde-universal-3.49.0" + sources."@aws-sdk/fetch-http-handler-3.49.0" + sources."@aws-sdk/hash-blob-browser-3.49.0" + sources."@aws-sdk/hash-node-3.49.0" + sources."@aws-sdk/hash-stream-node-3.49.0" + sources."@aws-sdk/invalid-dependency-3.49.0" + sources."@aws-sdk/is-array-buffer-3.49.0" + sources."@aws-sdk/md5-js-3.49.0" + sources."@aws-sdk/middleware-apply-body-checksum-3.49.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.49.0" + sources."@aws-sdk/middleware-content-length-3.49.0" + sources."@aws-sdk/middleware-expect-continue-3.49.0" + sources."@aws-sdk/middleware-header-default-3.49.0" + sources."@aws-sdk/middleware-host-header-3.49.0" + sources."@aws-sdk/middleware-location-constraint-3.49.0" + sources."@aws-sdk/middleware-logger-3.49.0" + (sources."@aws-sdk/middleware-retry-3.49.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.47.2" - sources."@aws-sdk/middleware-sdk-sts-3.47.2" - sources."@aws-sdk/middleware-serde-3.47.2" - sources."@aws-sdk/middleware-signing-3.47.2" - sources."@aws-sdk/middleware-ssec-3.47.2" - sources."@aws-sdk/middleware-stack-3.47.2" - sources."@aws-sdk/middleware-user-agent-3.47.2" - sources."@aws-sdk/node-config-provider-3.47.2" - sources."@aws-sdk/node-http-handler-3.47.2" - sources."@aws-sdk/property-provider-3.47.2" - sources."@aws-sdk/protocol-http-3.47.2" - sources."@aws-sdk/querystring-builder-3.47.2" - sources."@aws-sdk/querystring-parser-3.47.2" - sources."@aws-sdk/s3-request-presigner-3.48.0" - sources."@aws-sdk/service-error-classification-3.47.2" - sources."@aws-sdk/shared-ini-file-loader-3.47.1" - sources."@aws-sdk/signature-v4-3.47.2" - sources."@aws-sdk/smithy-client-3.47.2" - sources."@aws-sdk/types-3.47.1" - sources."@aws-sdk/url-parser-3.47.2" - sources."@aws-sdk/util-arn-parser-3.47.1" - sources."@aws-sdk/util-base64-browser-3.47.1" - sources."@aws-sdk/util-base64-node-3.47.2" - sources."@aws-sdk/util-body-length-browser-3.47.1" - sources."@aws-sdk/util-body-length-node-3.47.1" - sources."@aws-sdk/util-buffer-from-3.47.2" - sources."@aws-sdk/util-config-provider-3.47.1" - sources."@aws-sdk/util-create-request-3.47.2" - sources."@aws-sdk/util-credentials-3.47.2" - sources."@aws-sdk/util-defaults-mode-browser-3.47.2" - sources."@aws-sdk/util-defaults-mode-node-3.47.2" - sources."@aws-sdk/util-format-url-3.47.2" - sources."@aws-sdk/util-hex-encoding-3.47.1" - sources."@aws-sdk/util-locate-window-3.47.1" - sources."@aws-sdk/util-uri-escape-3.47.1" - sources."@aws-sdk/util-user-agent-browser-3.47.2" - sources."@aws-sdk/util-user-agent-node-3.47.2" - sources."@aws-sdk/util-utf8-browser-3.47.1" - sources."@aws-sdk/util-utf8-node-3.47.2" - sources."@aws-sdk/util-waiter-3.47.2" - sources."@aws-sdk/xml-builder-3.47.1" + sources."@aws-sdk/middleware-sdk-s3-3.49.0" + sources."@aws-sdk/middleware-sdk-sts-3.49.0" + sources."@aws-sdk/middleware-serde-3.49.0" + sources."@aws-sdk/middleware-signing-3.49.0" + sources."@aws-sdk/middleware-ssec-3.49.0" + sources."@aws-sdk/middleware-stack-3.49.0" + sources."@aws-sdk/middleware-user-agent-3.49.0" + sources."@aws-sdk/node-config-provider-3.49.0" + sources."@aws-sdk/node-http-handler-3.49.0" + sources."@aws-sdk/property-provider-3.49.0" + sources."@aws-sdk/protocol-http-3.49.0" + sources."@aws-sdk/querystring-builder-3.49.0" + sources."@aws-sdk/querystring-parser-3.49.0" + sources."@aws-sdk/s3-request-presigner-3.49.0" + sources."@aws-sdk/service-error-classification-3.49.0" + sources."@aws-sdk/shared-ini-file-loader-3.49.0" + sources."@aws-sdk/signature-v4-3.49.0" + sources."@aws-sdk/smithy-client-3.49.0" + sources."@aws-sdk/types-3.49.0" + sources."@aws-sdk/url-parser-3.49.0" + sources."@aws-sdk/util-arn-parser-3.49.0" + sources."@aws-sdk/util-base64-browser-3.49.0" + sources."@aws-sdk/util-base64-node-3.49.0" + sources."@aws-sdk/util-body-length-browser-3.49.0" + sources."@aws-sdk/util-body-length-node-3.49.0" + sources."@aws-sdk/util-buffer-from-3.49.0" + sources."@aws-sdk/util-config-provider-3.49.0" + sources."@aws-sdk/util-create-request-3.49.0" + sources."@aws-sdk/util-credentials-3.49.0" + sources."@aws-sdk/util-defaults-mode-browser-3.49.0" + sources."@aws-sdk/util-defaults-mode-node-3.49.0" + sources."@aws-sdk/util-format-url-3.49.0" + sources."@aws-sdk/util-hex-encoding-3.49.0" + sources."@aws-sdk/util-locate-window-3.49.0" + sources."@aws-sdk/util-uri-escape-3.49.0" + sources."@aws-sdk/util-user-agent-browser-3.49.0" + sources."@aws-sdk/util-user-agent-node-3.49.0" + sources."@aws-sdk/util-utf8-browser-3.49.0" + sources."@aws-sdk/util-utf8-node-3.49.0" + sources."@aws-sdk/util-waiter-3.49.0" + sources."@aws-sdk/xml-builder-3.49.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" sources."@joplin/fork-htmlparser2-4.1.39" @@ -101288,7 +101620,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1069.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -101324,7 +101656,7 @@ in sources."charenc-0.0.2" sources."chokidar-3.5.3" sources."chownr-1.1.4" - sources."chroma-js-2.1.2" + sources."chroma-js-2.4.2" sources."clean-css-4.2.4" sources."cliss-0.0.2" sources."code-point-at-1.1.0" @@ -101340,8 +101672,6 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cross-env-6.0.3" - sources."cross-spawn-7.0.3" sources."crypt-0.0.2" (sources."css-3.0.0" // { dependencies = [ @@ -101433,7 +101763,7 @@ in sources."datauri-4.1.0" sources."debug-0.7.4" sources."decode-uri-component-0.2.0" - sources."decompress-response-4.2.1" + sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" @@ -101441,7 +101771,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.0" sources."diff-match-patch-1.0.5" (sources."dom-serializer-1.3.2" // { dependencies = [ @@ -101620,7 +101950,7 @@ in sources."commander-8.3.0" ]; }) - sources."keytar-7.7.0" + sources."keytar-7.8.0" sources."khroma-1.4.1" sources."klaw-1.3.1" sources."lazyness-1.2.0" @@ -101657,13 +101987,7 @@ in sources."markdown-it-footnote-3.0.3" sources."markdown-it-ins-3.0.1" sources."markdown-it-mark-3.0.1" - (sources."markdown-it-multimd-table-4.1.2" // { - dependencies = [ - sources."entities-2.1.0" - sources."linkify-it-3.0.3" - sources."markdown-it-12.3.2" - ]; - }) + sources."markdown-it-multimd-table-4.1.3" sources."markdown-it-sub-1.0.0" sources."markdown-it-sup-1.0.0" sources."markdown-it-toc-done-right-4.2.0" @@ -101674,8 +101998,8 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimer-2.0.2" - sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" + sources."mimic-response-3.1.0" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { dependencies = [ @@ -101701,12 +102025,8 @@ in }) sources."nextgen-events-1.5.2" sources."no-case-2.3.2" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."node-addon-api-3.2.1" + sources."node-abi-3.8.0" + sources."node-addon-api-4.3.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" sources."node-fetch-1.7.3" @@ -101726,6 +102046,7 @@ in sources."node-persist-2.1.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ + sources."detect-libc-1.0.3" sources."semver-5.7.1" ]; }) @@ -101760,14 +102081,13 @@ in sources."parse5-5.1.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-3.0.0" sources."pipe-functions-1.3.0" sources."pn-1.1.0" sources."pngjs-5.0.0" - sources."prebuild-install-6.1.4" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -101827,17 +102147,26 @@ in (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.2.1" - sources."decompress-response-6.0.0" - sources."mimic-response-3.1.0" - sources."simple-get-4.0.0" + sources."decompress-response-4.2.1" + sources."detect-libc-1.0.3" + sources."mimic-response-2.1.0" + (sources."node-abi-2.30.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."node-addon-api-3.2.1" + (sources."prebuild-install-6.1.4" // { + dependencies = [ + sources."simple-get-3.1.1" + ]; + }) ]; }) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."shellwords-0.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-4.0.1" sources."simple-swizzle-0.2.2" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -101849,7 +102178,11 @@ in sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.2" + (sources."sqlite3-5.0.2" // { + dependencies = [ + sources."node-addon-api-3.2.1" + ]; + }) sources."sshpk-1.17.0" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" @@ -102004,7 +102337,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."lru-cache-4.1.5" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."nopt-5.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -102049,13 +102382,13 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.9"; + version = "3.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.9.tgz"; - sha512 = "bVrM2DT2iLmv6jd2IdTRk67tC4iaSDUicD+47y+cNCYlE8dccd4xZnlANG4M+OmGyV389bABSTKKfoPCOofbKw=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.10.tgz"; + sha512 = "IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg=="; }; dependencies = [ - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" @@ -102070,7 +102403,7 @@ in sources."lodash-4.17.21" sources."markdown-it-12.3.2" sources."markdown-it-anchor-8.4.1" - sources."marked-4.0.10" + sources."marked-4.0.12" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -102093,10 +102426,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.13.3"; + version = "2.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.3.tgz"; - sha512 = "zlVQz8XAl1ODXEOVMPkDNuntPebPIE39Xn7ex/JAI9+TmBIf/fcUuj58FaLCC88rOHy8leq0N5ChBB+V5fmpzA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz"; + sha512 = "HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -102124,11 +102457,10 @@ in sources."inherits-2.0.4" sources."isarray-0.0.1" sources."lodash-4.17.21" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."readable-stream-1.1.14" - sources."shelljs-0.3.0" sources."string_decoder-0.10.31" sources."strip-json-comments-1.0.4" sources."wrappy-1.0.2" @@ -102180,7 +102512,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."heap-0.2.7" @@ -102280,7 +102612,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -102411,7 +102743,7 @@ in }) sources."ms-2.0.0" sources."nanoid-3.2.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -102461,7 +102793,7 @@ in sources."serve-static-1.14.2" sources."server-destroy-1.0.1" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."statuses-1.5.0" sources."steno-0.4.4" sources."string-width-4.2.3" @@ -102534,7 +102866,7 @@ in sha1 = "f2de92d8c2f9211e7b4e859ef73d44d32b1b5bfd"; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ajv-6.12.6" sources."ansi-align-1.1.0" sources."ansi-regex-2.1.1" @@ -102811,7 +103143,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-status-codes-1.0.0" sources."node-uuid-1.4.8" sources."normalize-package-data-2.5.0" @@ -103113,10 +103445,11 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.16" - sources."@oclif/config-1.18.2" + sources."@oclif/config-1.18.3" sources."@oclif/errors-1.3.5" (sources."@oclif/help-1.0.1" // { dependencies = [ + sources."@oclif/config-1.18.2" sources."wrap-ansi-6.2.0" ]; }) @@ -103124,11 +103457,12 @@ in sources."@oclif/parser-3.8.6" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ + sources."@oclif/config-1.18.2" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.23.2" // { + (sources."@putdotio/api-client-8.25.0" // { dependencies = [ sources."axios-0.21.4" ]; @@ -103234,7 +103568,7 @@ in sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."js-base64-2.6.4" + sources."js-base64-2.6.3" sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" @@ -103294,7 +103628,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" @@ -103305,7 +103639,7 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."type-2.5.0" + sources."type-2.6.0" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" @@ -103352,18 +103686,18 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.11"; + version = "6.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.11.tgz"; - sha512 = "QGUh4yXgizzDNPLB5nWTvP+wysKexngbyLVWFOyikB661hpa2RZLf5anZQzqliWtAQuYVep0ot0D1U7UQKpsxQ=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.15.tgz"; + sha512 = "4O5X6zVFdmwo/fgjRN84fPG3IvaiOxOjIeZBwBrQYz4nIyGqlF8Wm7C1Hr7idQ9NHgnvJM+LSjZwS1C+qALMGw=="; }; dependencies = [ sources."@socket.io/base64-arraybuffer-1.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.10" - sources."accepts-1.3.7" + sources."@types/node-17.0.15" + sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" @@ -103383,7 +103717,7 @@ in sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" sources."date-format-4.0.3" @@ -103408,7 +103742,7 @@ in sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."follow-redirects-1.14.7" sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" @@ -103440,9 +103774,11 @@ in sources."mime-2.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -103520,15 +103856,16 @@ in sha512 = "ffn0F9o3Yy6E9UFAS/vzOpsYxbVwk/pbSWrS3YPIZs+PtUv6zmwrkZ+71xSSb6tHBkJw5k93vOdkbo4cViFdFA=="; }; dependencies = [ - sources."@babel/cli-7.16.8" + sources."@ampproject/remapping-2.1.0" + sources."@babel/cli-7.17.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" (sources."@babel/helper-compilation-targets-7.16.7" // { dependencies = [ @@ -103546,16 +103883,19 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" sources."@babel/node-7.16.8" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-syntax-jsx-7.16.7" sources."@babel/plugin-transform-react-jsx-7.16.7" - sources."@babel/register-7.16.9" + sources."@babel/register-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@tootallnate/once-1.1.2" sources."@xmpp/base64-0.12.1" sources."@xmpp/client-0.12.1" @@ -103585,7 +103925,7 @@ in sources."@xmpp/websocket-0.12.1" sources."@xmpp/xml-0.12.1" sources."abab-2.0.5" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ @@ -103621,7 +103961,7 @@ in sources."bytes-3.1.1" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.4.0" @@ -103643,7 +103983,7 @@ in sources."convert-source-map-1.8.0" sources."cookie-0.4.1" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -103676,7 +104016,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -103797,10 +104137,10 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."ms-2.1.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-environment-flags-1.0.6" sources."node-fetch-2.6.7" sources."node-localstorage-1.3.1" @@ -103826,7 +104166,7 @@ in sources."path-to-regexp-0.1.7" sources."picocolors-1.0.0" sources."pify-4.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-3.0.0" sources."prelude-ls-1.1.2" sources."proxy-addr-2.0.7" @@ -103987,7 +104327,7 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."lazystream-1.0.1" sources."lead-1.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" sources."object-keys-1.1.1" @@ -104152,7 +104492,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.29.1" @@ -104218,7 +104558,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -104402,7 +104742,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."moment-2.29.1" @@ -104458,7 +104798,7 @@ in sources."sax-1.2.4" sources."secure-keys-1.0.0" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -104700,7 +105040,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" (sources."are-we-there-yet-1.1.7" // { @@ -104743,19 +105083,14 @@ in sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-deep-4.0.1" sources."cmd-shim-4.1.0" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."columnify-1.5.4" + sources."columnify-1.6.0" sources."combined-stream-1.0.8" (sources."compare-func-2.0.0" // { dependencies = [ @@ -104844,9 +105179,11 @@ in sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) sources."get-caller-file-2.0.5" @@ -104919,12 +105256,7 @@ in sources."read-package-json-4.1.1" ]; }) - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."inquirer-7.3.3" sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."is-arrayish-0.2.1" @@ -105020,7 +105352,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minimist-options-4.1.0" // { dependencies = [ @@ -105186,11 +105518,11 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."slide-1.1.6" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."sort-keys-2.0.0" sources."source-map-0.6.1" @@ -105204,16 +105536,11 @@ in sources."sshpk-1.17.0" sources."ssri-8.0.1" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."string-width-4.2.3" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.3.0" - sources."strip-ansi-3.0.1" + sources."strip-ansi-6.0.1" sources."strip-bom-4.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" @@ -105242,7 +105569,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -105265,12 +105592,7 @@ in sources."which-boxed-primitive-1.0.2" sources."wide-align-1.1.5" sources."wordwrap-1.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" (sources."write-json-file-4.3.0" // { @@ -105314,7 +105636,7 @@ in sha512 = "EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA=="; }; dependencies = [ - sources."copy-anything-2.0.3" + sources."copy-anything-2.0.6" sources."debug-3.2.7" sources."errno-0.1.8" sources."graceful-fs-4.2.9" @@ -105377,7 +105699,7 @@ in sha512 = "Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -105538,7 +105860,7 @@ in sources."ms-2.0.0" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -105708,7 +106030,7 @@ in sha512 = "C5x12+bwk7m2Sx3U27VZ7h5KP7vIlKfZGCabMi73nBGp0zPHtCaxQTPXDRoX5479EZUvycYJI0aD4h1d4+ds7w=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.2" sources."ajv-6.12.6" sources."anymatch-1.3.2" @@ -105951,7 +106273,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -106230,15 +106552,16 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.12" - sources."@babel/generator-7.16.8" + sources."@babel/compat-data-7.17.0" + sources."@babel/core-7.17.0" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" @@ -106258,13 +106581,13 @@ in sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-external-helpers-7.8.3" @@ -106324,7 +106647,7 @@ in sources."@babel/plugin-transform-property-literals-7.16.7" sources."@babel/plugin-transform-regenerator-7.16.7" sources."@babel/plugin-transform-reserved-words-7.16.7" - sources."@babel/plugin-transform-runtime-7.16.10" + sources."@babel/plugin-transform-runtime-7.17.0" sources."@babel/plugin-transform-shorthand-properties-7.16.7" sources."@babel/plugin-transform-spread-7.16.7" sources."@babel/plugin-transform-sticky-regex-7.16.7" @@ -106335,10 +106658,10 @@ in sources."@babel/preset-env-7.16.11" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -106349,17 +106672,20 @@ in ]; }) sources."@jest/types-25.5.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@types/babel__core-7.1.18" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" - sources."@types/estree-0.0.50" + sources."@types/estree-0.0.51" sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -106449,7 +106775,7 @@ in sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-polyfill-corejs2-0.3.1" - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" @@ -106532,7 +106858,7 @@ in sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -106603,7 +106929,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -106655,7 +106981,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106921,7 +107247,7 @@ in sources."mime-types-2.1.34" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { @@ -107013,7 +107339,7 @@ in sources."pify-4.0.1" sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" @@ -107051,13 +107377,13 @@ in sources."readdirp-3.6.0" sources."realpath-native-2.0.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -107121,7 +107447,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.3" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -107393,7 +107719,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -107426,7 +107752,7 @@ in sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mkdirp-0.3.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -107512,7 +107838,7 @@ in sources."lru-cache-4.1.5" sources."lstream-0.0.4" sources."mime-1.2.11" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -107635,36 +107961,34 @@ in markdownlint-cli = nodeEnv.buildNodePackage { name = "markdownlint-cli"; packageName = "markdownlint-cli"; - version = "0.30.0"; + version = "0.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.30.0.tgz"; - sha512 = "NiG8iERjwsRZtJAIyLMDdYL2O3bJVn3fUxzDl+6Iv61/YYz9H9Nzgke/v0/cW9HfGvgZHhbfI19LFMp6gbKdyw=="; + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.31.0.tgz"; + sha512 = "UCNA10I2evrEqGWUGM4I6ae6LubLeySkKegP1GQaZSES516BYBgOn8Ai8MXU+5rSIeCvMyKi91alqHyRDuUnYA=="; }; dependencies = [ sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."commander-8.3.0" + sources."commander-9.0.0" sources."concat-map-0.0.1" sources."deep-extend-0.6.0" sources."entities-2.1.0" sources."fs.realpath-1.0.0" - sources."get-stdin-8.0.0" + sources."get-stdin-9.0.0" sources."glob-7.2.0" - sources."ignore-5.1.9" + sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" sources."js-yaml-4.1.0" sources."jsonc-parser-3.0.0" sources."linkify-it-3.0.3" - sources."lodash.differencewith-4.5.0" - sources."lodash.flatten-4.4.0" - sources."markdown-it-12.2.0" - sources."markdownlint-0.24.0" - sources."markdownlint-rule-helpers-0.15.0" + sources."markdown-it-12.3.2" + sources."markdownlint-0.25.1" + sources."markdownlint-rule-helpers-0.16.0" sources."mdurl-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -107741,10 +108065,10 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.9.2.tgz"; - sha512 = "f6ZZaFIFe6lviqzWglHgzPg7xeIJ+7QnaJZosPRaJyeZigRiG03WDjcChuV6k21kdyDhCwBO9HoISh2oxP4Hjw=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.9.3.tgz"; + sha512 = "eXW4jTs0z7MBnTnpgaM+jRNtEwBjKCW3yldNCE4v7kHqpm4BTGPaBbXqzt/Kdz1/fZl91hIXgBE/21yps1PtIQ=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -107762,7 +108086,7 @@ in sources."link-check-5.0.2" sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.1" - sources."marked-4.0.10" + sources."marked-4.0.12" sources."ms-2.1.3" sources."needle-3.0.0" sources."progress-2.0.3" @@ -107787,7 +108111,7 @@ in version = "0.0.1"; src = ../../misc/vim-plugins/markdown-preview-nvim; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-1.0.0" @@ -107843,7 +108167,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.3" sources."msgpack-lite-0.1.26" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neovim-4.2.1" sources."object-component-0.0.3" sources."parseqs-0.0.5" @@ -107899,10 +108223,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.13.7-20211027152950"; + version = "1.13.8-20220129172727"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.7-20211027152950.tgz"; - sha512 = "M+/MOAADju8toJAvN03Gj5KkR42Ud2SKkm183uWuO0DcWBJxjT60GYwbgdLeDAc8V0YC8F0ee6oR9yxJ4H9LZg=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.8-20220129172727.tgz"; + sha512 = "uBYlTnpHrVQ6+K9qQHaoLfvUKL8W5RLjdPmIzSC48+F0TSwDv+zAq19Sv5kx4Rxv4K+3c9j15xMI+mEs3bD7Lg=="; }; dependencies = [ sources."acorn-5.7.4" @@ -107999,7 +108323,7 @@ in sources."exit-hook-1.1.1" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -108087,7 +108411,7 @@ in sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -108255,14 +108579,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.13.8"; + version = "8.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.13.8.tgz"; - sha512 = "T2IGxPOVrzFaO4jl1ADUa1X6AmR3RwTI8nC3c3EBEg3mJVM4/DP0TDO7wfdGFTJEle3WtPvO6oNILffTckHjwQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.13.10.tgz"; + sha512 = "JS7z1E0a3IRTo2iHZ0gEwA/3+LzAyvaAA5uftu4jXC3FcAypm7NIg+zMB3TZtkHml3kUcIkRP08G46V+OU7A1A=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -108376,11 +108700,11 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."mermaid-8.13.10" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mkdirp-classic-0.5.3" sources."moment-mini-2.24.0" sources."ms-2.1.2" - sources."node-fetch-2.6.5" + sources."node-fetch-2.6.7" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -108392,7 +108716,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-13.1.1" + sources."puppeteer-13.1.3" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -108427,10 +108751,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.1.4"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.4.tgz"; - sha512 = "+q2aV5VlJZuLgCWoBvGI5zEwPF9eEI0kr/sAA9Jm4xMND7RfIEyF8JE7C0JIg8WXRG+P1sdIAb5ccoHPlXLzcw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz"; + sha512 = "kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -108450,12 +108774,12 @@ in sources."supports-color-7.2.0" ]; }) - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; @@ -108471,7 +108795,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" @@ -108491,7 +108815,7 @@ in sources."log-symbols-4.1.0" sources."minimatch-3.0.4" sources."ms-2.1.3" - sources."nanoid-3.1.25" + sources."nanoid-3.2.0" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" @@ -108510,7 +108834,7 @@ in sources."supports-color-8.1.1" sources."to-regex-range-5.0.1" sources."which-2.0.2" - sources."workerpool-6.1.5" + sources."workerpool-6.2.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" @@ -108649,7 +108973,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -108715,7 +109039,7 @@ in sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" sources."winston-3.3.3" - sources."winston-transport-4.4.2" + sources."winston-transport-4.5.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -108807,7 +109131,7 @@ in sources."isexe-2.0.0" sources."lru-cache-6.0.0" sources."make-fetch-happen-9.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -108832,9 +109156,9 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."ssri-8.0.1" sources."string-width-4.2.3" @@ -108887,7 +109211,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.2" sources."ajv-4.11.8" sources."ansi-regex-2.1.1" @@ -109019,12 +109343,12 @@ in sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."nan-2.15.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" (sources."node-pre-gyp-0.6.39" // { dependencies = [ sources."glob-7.2.0" @@ -109097,7 +109421,7 @@ in sources."serve-static-1.14.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sntp-1.0.9" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -109221,7 +109545,7 @@ in sources."ini-1.3.8" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -109249,7 +109573,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -109277,34 +109601,34 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.1.6.tgz"; - sha512 = "R65ZWxAnZtcPfvDtc/+pk5ilb8CoT4TYc0Ze5TRvewsC56TcwHfka8t1pFvXsc855GbcD4Ky49hfocwZTuJXMA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.2.0.tgz"; + sha512 = "KHxnMMWKxMFBxLf6FICfzBLoQLB8v4CFidREeCruoXa7UQDqXi29nJcE4WHG0c17A+kDE2XStuEcEIqXCERs/A=="; }; dependencies = [ - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@mapbox/node-pre-gyp-1.0.8" - sources."@node-red/editor-api-2.1.6" - sources."@node-red/editor-client-2.1.6" - (sources."@node-red/nodes-2.1.6" // { + sources."@node-red/editor-api-2.2.0" + sources."@node-red/editor-client-2.2.0" + (sources."@node-red/nodes-2.2.0" // { dependencies = [ sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" ]; }) - sources."@node-red/registry-2.1.6" - sources."@node-red/runtime-2.1.6" - sources."@node-red/util-2.1.6" - sources."@sindresorhus/is-4.3.0" + sources."@node-red/registry-2.2.0" + sources."@node-red/runtime-2.2.0" + sources."@node-red/util-2.2.0" + sources."@sindresorhus/is-4.4.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-8.7.0" sources."acorn-walk-8.2.0" (sources."agent-base-6.0.2" // { @@ -109313,7 +109637,7 @@ in sources."ms-2.1.2" ]; }) - sources."ajv-8.8.2" + sources."ajv-8.9.0" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.1" sources."append-field-1.0.0" @@ -109329,7 +109653,7 @@ in sources."async-0.1.22" sources."async-mutex-0.3.2" sources."asynckit-0.4.0" - sources."axios-0.22.0" + sources."axios-0.25.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -109461,7 +109785,7 @@ in sources."ms-2.1.2" ]; }) - sources."i18next-21.6.6" + sources."i18next-21.6.10" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" @@ -109481,7 +109805,7 @@ in sources."universalify-2.0.0" ]; }) - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-2.0.0" @@ -109500,11 +109824,11 @@ in }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-2.5.2" + sources."mime-3.0.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minipass-3.1.6" // { dependencies = [ @@ -109527,7 +109851,6 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.6" sources."yallist-4.0.0" ]; }) @@ -109538,13 +109861,13 @@ in ]; }) sources."ms-2.0.0" - sources."multer-1.4.3" + sources."multer-1.4.4" sources."mustache-4.2.0" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" sources."node-fetch-2.6.7" - sources."node-red-admin-2.2.1" + sources."node-red-admin-2.2.2" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-5.0.1" @@ -109610,7 +109933,7 @@ in sources."serve-static-1.14.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" @@ -109636,7 +109959,7 @@ in sources."tslib-2.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.0" sources."uid-safe-2.1.5" sources."uid2-0.0.4" sources."universalify-0.1.2" @@ -109650,7 +109973,7 @@ in sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.1" + sources."ws-7.5.6" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" @@ -109744,7 +110067,7 @@ in sources."lru-cache-6.0.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minizlib-2.1.2" @@ -109804,7 +110127,7 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.1" @@ -109951,7 +110274,7 @@ in ]; }) sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."ms-2.1.3" sources."nopt-1.0.10" @@ -109984,7 +110307,7 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" @@ -110055,7 +110378,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -110258,7 +110581,7 @@ in sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lines-and-columns-1.2.4" @@ -110331,7 +110654,7 @@ in sources."mimic-fn-1.2.0" sources."mimic-response-2.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."mute-stream-0.0.8" @@ -110365,7 +110688,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { dependencies = [ - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.4.0" sources."type-fest-0.20.2" ]; }) @@ -110480,7 +110803,7 @@ in }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.1" @@ -110549,10 +110872,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.3.2"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.3.2.tgz"; - sha512 = "xZAC9GpWNOyiS1TtBqBy0HJpjIVI8zsVXEOEwcmgqYFtqOy7sXUL0ByOrkhfcGmf+akSXz3uOxLYB8aLlYivQQ=="; + url = "https://registry.npmjs.org/npm/-/npm-8.4.1.tgz"; + sha512 = "Br6GQ6MGF06MhgBNhAJ4heYsCO5NJDKXnwHGaBgNDFz6HZiEOhc+sDGEcoXki4IlSUuAFdLY66BWaFI7BasMCA=="; }; buildInputs = globalBuildInputs; meta = { @@ -110731,7 +111054,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" @@ -110753,7 +111076,13 @@ in sources."npm-package-arg-8.1.5" sources."npm-packlist-3.0.0" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-11.0.0" + (sources."npm-registry-fetch-12.0.1" // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" + sources."make-fetch-happen-10.0.0" + ]; + }) sources."npmlog-6.0.0" sources."once-1.4.0" sources."p-cancelable-1.1.0" @@ -110766,7 +111095,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-12.0.2" + sources."pacote-12.0.3" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -110803,11 +111132,11 @@ in }) sources."semver-utils-1.1.4" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" @@ -110955,7 +111284,7 @@ in sources."jsprim-1.4.2" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.3.5" sources."natives-1.1.6" @@ -110991,7 +111320,7 @@ in sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slide-1.1.6" sources."sshpk-1.17.0" sources."string-width-4.2.3" @@ -111127,7 +111456,7 @@ in sources."inherits-2.0.4" sources."lodash-4.17.5" sources."lokijs-1.5.3" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pegjs-0.10.0" @@ -111158,16 +111487,16 @@ in sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.0" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" - sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.8" // { + (sources."@babel/generator-7.17.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -111179,8 +111508,8 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" @@ -111204,9 +111533,9 @@ in sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -111280,11 +111609,14 @@ in ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@iarna/toml-2.2.5" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -111343,7 +111675,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -111405,7 +111737,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -111431,7 +111763,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -111542,7 +111874,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.51" + sources."electron-to-chromium-1.4.65" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111783,7 +112115,7 @@ in sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -111956,7 +112288,7 @@ in }) sources."readdirp-2.2.1" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { @@ -111965,9 +112297,9 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -112018,7 +112350,7 @@ in sources."object-inspect-1.12.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -112188,9 +112520,9 @@ in sha512 = "t29ujC7jgKzuA25yXritkuF/rFGduN08c2CLOeSAjlKAzc/BUamZgvPWFqU/UVSRubnMYawJIQDX3m/RqKz7Xw=="; }; dependencies = [ - (sources."accepts-1.3.7" // { + (sources."accepts-1.3.8" // { dependencies = [ - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" ]; }) sources."ajv-6.12.6" @@ -112336,7 +112668,7 @@ in sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -112429,7 +112761,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -112507,7 +112839,7 @@ in sources."jsonfile-4.0.0" sources."klaw-sync-6.0.0" sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."nice-try-1.0.5" sources."once-1.4.0" @@ -112697,7 +113029,7 @@ in sources."mime-2.6.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.3.5" sources."mkdirp-classic-0.5.3" @@ -112781,9 +113113,9 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."server-destroy-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.2" (sources."simple-websocket-4.3.1" // { @@ -112862,7 +113194,7 @@ in sha512 = "NGLR8G6SP7WriloFrS5JDU8Rx1Ia1OlbJOpqGeAzMKxhrajnAdPza8VeXozMUk0oBCS8hr+cuLQ7stprgzISXg=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."addr-to-ip-port-1.5.4" sources."after-0.8.2" sources."ajv-6.12.6" @@ -113055,7 +113387,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" @@ -113070,7 +113402,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" @@ -113135,7 +113467,7 @@ in sources."serve-static-1.14.2" sources."setprototypeof-1.2.0" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" (sources."simple-peer-6.4.4" // { dependencies = [ sources."readable-stream-2.3.7" @@ -113366,9 +113698,9 @@ in sources."safe-buffer-5.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."slash-3.0.0" sources."source-map-0.6.1" sources."stream-meter-1.0.4" @@ -113548,7 +113880,7 @@ in sources."lodash-4.17.21" sources."log-driver-1.2.7" sources."lru-cache-5.1.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."mkdirp-1.0.4" sources."module-details-from-path-1.0.3" sources."moment-2.29.1" @@ -113603,9 +113935,9 @@ in }) sources."setprototypeof-1.2.0" sources."shimmer-1.2.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" @@ -113614,7 +113946,7 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.10.7" + sources."systeminformation-5.11.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.3.1" @@ -113650,10 +113982,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.27.1"; + version = "6.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.27.1.tgz"; - sha512 = "aW+oDXiMk9mzInmIaRv9v9+FSNkXBs60rVUO6QBpalPja0eO3J5ePSyBxAbLsuhGGbEOpwRq0aNywFq8yIi9HQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.30.0.tgz"; + sha512 = "qsnc5wxI5nIkdh7lDv2mQiniPdsSD46a1A1Nz+qzcMuh4FFiXAq1Ntfszdm21bVm0OFEn/FSgaQDZxYXYPmCTw=="; }; buildInputs = globalBuildInputs; meta = { @@ -113696,10 +114028,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.5"; + version = "8.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz"; - sha512 = "jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"; + sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; }; dependencies = [ sources."nanoid-3.2.0" @@ -113843,13 +114175,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.8.1.tgz"; - sha512 = "Q8zHwS9m70TaD7qI8u+8hTAmiTpK+IpvRYF3Rgb/OeWGQJOMgZCFFvNCiSfoLEQ95wilK7ctW3KOpc9AuYnRUA=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.9.1.tgz"; + sha512 = "IGcJAu5LzlFv+i+NNhOEh1J1xVVttsVdRBxmrMN7eIH+7mRN6L89Hz1npUAiz4jOpNlHC7n9QwaOYZGxTqlwQw=="; }; dependencies = [ - sources."@prisma/engines-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" + sources."@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" ]; buildInputs = globalBuildInputs; meta = { @@ -113864,20 +114196,35 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.8.1.tgz"; - sha512 = "u2gbnek4HU4p/LzCX1FRsrHHGBWh+5T/PyNUwC9if2wQmdTnurqBziPNY7jtJenWw6nEWG/38VlyNfnzGjXt0Q=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.9.1.tgz"; + sha512 = "Avfh6w7VOYM67Yfunl8nlavU5VZRpLbuEBnqvc7Nl182e55GbyXs6mougE/Me/yOL4z6hEDf6yR//cQSP3jhmw=="; }; dependencies = [ - sources."@prisma/prisma-fmt-wasm-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" + sources."@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" sources."@types/js-levenshtein-1.1.1" + sources."anymatch-3.1.2" + sources."binary-extensions-2.2.0" + sources."braces-3.0.2" + sources."chokidar-3.5.3" + sources."fill-range-7.0.1" + sources."fsevents-2.3.2" + sources."glob-parent-5.1.2" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" sources."js-levenshtein-1.1.6" sources."klona-2.0.5" + sources."normalize-path-3.0.0" + sources."picomatch-2.3.1" + sources."readdirp-3.6.0" + sources."to-regex-range-5.0.1" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; @@ -113915,7 +114262,7 @@ in sources."isexe-2.0.0" sources."keypress-0.2.1" sources."lodash-4.17.21" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."which-2.0.2" @@ -114082,7 +114429,7 @@ in sources."mime-1.6.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" @@ -114213,11 +114560,11 @@ in sources."isexe-2.0.0" sources."shell-quote-1.7.3" sources."uuid-3.4.0" - sources."vscode-jsonrpc-8.0.0-next.5" - sources."vscode-languageserver-8.0.0-next.6" - sources."vscode-languageserver-protocol-3.17.0-next.12" - sources."vscode-languageserver-textdocument-1.0.3" - sources."vscode-languageserver-types-3.17.0-next.6" + sources."vscode-jsonrpc-8.0.0-next.6" + sources."vscode-languageserver-8.0.0-next.8" + sources."vscode-languageserver-protocol-3.17.0-next.14" + sources."vscode-languageserver-textdocument-1.0.4" + sources."vscode-languageserver-types-3.17.0-next.7" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -114353,7 +114700,7 @@ in sources."side-channel-1.0.4" sources."sisteransi-1.0.5" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."strip-json-comments-2.0.1" sources."to-readable-stream-1.0.0" @@ -114375,10 +114722,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.214"; + version = "1.1.219"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.214.tgz"; - sha512 = "miNDlJV7pfaZuzRD6NKbUebcC2Ko9P1IjbqNd0wcnFepaVxdhHgxl544GkM59tjYlS/YgwuiiCAzW/icIFI/9g=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.219.tgz"; + sha512 = "Efxav0PuY8Svs3V1RRxoUconLfCGng4eBtPzeyVHNTqASPtGSd1+GwMrWNOfnfZfz+8kxuB9R5SzWRb4z6L+2w=="; }; buildInputs = globalBuildInputs; meta = { @@ -114487,7 +114834,7 @@ in ]; }) sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."moment-2.29.1" sources."nice-try-1.0.5" @@ -114533,7 +114880,7 @@ in sources."shallow-copy-0.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" (sources."static-eval-2.1.0" // { dependencies = [ @@ -114680,7 +115027,7 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isstream-0.1.2" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" @@ -114735,15 +115082,16 @@ in sha512 = "JQACM+3GgF1vkUH6E6w1k0Qut6IbcfXjU37shGUWM9tIs3F9e/33saXK4G/uSl1kc8qjI+RekAQs/qyjMlUKlg=="; }; dependencies = [ - sources."@babel/cli-7.16.8" + sources."@ampproject/remapping-2.1.0" + sources."@babel/cli-7.17.0" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.0" + (sources."@babel/core-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.0" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" (sources."@babel/helper-compilation-targets-7.16.7" // { @@ -114751,8 +115099,8 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" @@ -114776,9 +115124,9 @@ in sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.0" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -114842,7 +115190,7 @@ in sources."@babel/plugin-transform-react-pure-annotations-7.16.7" sources."@babel/plugin-transform-regenerator-7.16.7" sources."@babel/plugin-transform-reserved-words-7.16.7" - (sources."@babel/plugin-transform-runtime-7.16.10" // { + (sources."@babel/plugin-transform-runtime-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -114862,17 +115210,20 @@ in sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.16.7" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.16.9" - sources."@babel/runtime-7.16.7" + sources."@babel/register-7.17.0" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.4" + sources."@jridgewell/sourcemap-codec-1.4.10" + sources."@jridgewell/trace-mapping-0.3.2" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -114896,7 +115247,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."@zeit/schemas-2.6.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-6.4.2" sources."acorn-walk-7.2.0" sources."after-0.8.2" @@ -114970,7 +115321,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" @@ -115064,7 +115415,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -115143,12 +115494,12 @@ in }) sources."content-type-1.0.4" sources."convert-source-map-1.8.0" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -115292,7 +115643,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -115365,6 +115716,7 @@ in }) (sources."express-4.17.2" // { dependencies = [ + sources."cookie-0.4.1" sources."debug-2.6.9" sources."ms-2.0.0" sources."path-to-regexp-0.1.7" @@ -115697,7 +116049,7 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."mississippi-3.0.0" // { dependencies = [ @@ -115719,7 +116071,7 @@ in sources."mute-stream-0.0.7" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."no-case-2.3.2" @@ -115819,7 +116171,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-3.0.0" (sources."portfinder-1.0.28" // { dependencies = [ @@ -116006,16 +116358,16 @@ in sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.1" - sources."regexpu-core-4.8.0" + sources."regexpu-core-5.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -116096,6 +116448,7 @@ in sources."content-disposition-0.5.2" sources."mime-db-1.33.0" sources."mime-types-2.1.18" + sources."minimatch-3.0.4" ]; }) (sources."serve-index-1.9.1" // { @@ -116122,7 +116475,7 @@ in sources."shebang-regex-1.0.0" sources."shorthash-0.0.2" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -116523,7 +116876,7 @@ in sources."source-map-0.1.31" ]; }) - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."once-1.4.0" @@ -116585,7 +116938,7 @@ in sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."domexception-4.0.0" - sources."dompurify-2.3.4" + sources."dompurify-2.3.5" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -116651,14 +117004,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.2"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.2.tgz"; - sha512 = "eRGRmAKPvm8ozCb8TxaBlHF0BjeFOXYUKDTx7RD3ABkPKsDamle776GwMrrf1ojgl5i+RSSJfP62k1gTP7Owaw=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.7.tgz"; + sha512 = "MkRGhBJfEESAhNnH+duJIkcS+PO5CRPzfJuHjd8tJEfdSXeCu+6UfBVyX4zrstbNGPtZkLn+ZV+bBl5obIcMIA=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" - (sources."@babel/generator-7.16.8" // { + (sources."@babel/generator-7.17.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -116672,21 +117025,21 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" - sources."@babel/runtime-7.16.7" + sources."@babel/parser-7.17.0" + sources."@babel/runtime-7.17.0" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.0" + sources."@babel/types-7.17.0" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.79" + sources."@redocly/openapi-core-1.0.0-beta.80" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" - sources."@types/node-14.18.9" + sources."@types/node-14.18.10" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -116762,7 +117115,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.3.4" + sources."dompurify-2.3.5" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116820,7 +117173,7 @@ in sources."loose-envify-1.4.0" sources."lunr-2.3.9" sources."mark.js-8.11.1" - sources."marked-0.7.0" + sources."marked-4.0.12" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { dependencies = [ @@ -116829,7 +117182,7 @@ in }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."mobx-6.3.13" @@ -116886,7 +117239,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.59" // { + (sources."redoc-2.0.0-rc.63" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -116916,6 +117269,7 @@ in sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" + sources."style-loader-3.3.1" sources."styled-components-5.3.3" sources."supports-color-5.5.0" sources."swagger2openapi-7.0.8" @@ -116925,7 +117279,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -117076,7 +117430,7 @@ in sources."restore-cursor-3.1.0" sources."scheduler-0.18.0" sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -117141,7 +117495,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."agent-base-4.3.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -117276,7 +117630,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."livereload-0.9.3" - sources."livereload-js-3.3.2" + sources."livereload-js-3.3.3" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -117292,12 +117646,12 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mustache-4.2.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."on-finished-2.3.0" @@ -117373,7 +117727,7 @@ in }) sources."serve-static-1.14.2" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" sources."string-width-4.2.3" @@ -117438,7 +117792,7 @@ in sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" @@ -117456,10 +117810,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.66.0"; + version = "2.67.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.66.0.tgz"; - sha512 = "L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.67.1.tgz"; + sha512 = "1Sbcs4OuW+aD+hhqpIRl+RqooIpF6uQcfzU/QSI7vGkwADY6cM4iLsBGRM2CGLXDTDN5y/yShohFmnKegSPWzg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -117484,7 +117838,10 @@ in sources."@babel/helper-validator-identifier-7.16.7" (sources."@babel/highlight-7.16.10" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" ]; }) @@ -117493,7 +117850,7 @@ in sources."ignore-4.0.6" ]; }) - sources."@hpcc-js/wasm-1.4.1" + sources."@hpcc-js/wasm-1.12.8" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -117506,7 +117863,7 @@ in sources."@types/mocha-8.2.3" sources."@types/node-14.17.34" sources."@types/node-fetch-2.5.12" - sources."@types/vscode-1.63.1" + sources."@types/vscode-1.64.0" sources."@typescript-eslint/eslint-plugin-4.33.0" sources."@typescript-eslint/experimental-utils-4.33.0" sources."@typescript-eslint/parser-4.33.0" @@ -117521,7 +117878,7 @@ in sources."ajv-6.12.6" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.7" @@ -117555,21 +117912,18 @@ in sources."chainsaw-0.1.0" (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."cheerio-1.0.0-rc.10" sources."cheerio-select-1.5.0" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chownr-1.1.4" sources."cliui-7.0.4" sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."commander-7.2.0" sources."commandpost-1.4.0" @@ -117595,7 +117949,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.0.1" - (sources."d3-graphviz-4.0.0" // { + (sources."d3-graphviz-4.1.0" // { dependencies = [ sources."d3-color-2.0.0" sources."d3-dispatch-2.0.0" @@ -117627,14 +117981,14 @@ in sources."d3-zoom-3.0.0" sources."debug-4.3.3" sources."decamelize-4.0.0" - sources."decompress-response-4.2.1" + sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denodeify-1.2.1" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.0" sources."diff-5.0.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" @@ -117700,7 +118054,7 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" @@ -117725,7 +118079,7 @@ in sources."github-from-package-0.0.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."globby-11.1.0" sources."graceful-fs-4.2.9" sources."growl-1.10.5" @@ -117760,7 +118114,7 @@ in sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."keytar-7.7.0" + sources."keytar-7.8.0" sources."leven-3.1.0" sources."levn-0.4.1" sources."linkify-it-2.2.0" @@ -117782,37 +118136,30 @@ in sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" + sources."mimic-response-3.1.0" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - (sources."mocha-9.1.4" // { + (sources."mocha-9.2.0" // { dependencies = [ sources."argparse-2.0.1" - (sources."debug-4.3.2" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."glob-7.1.7" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" + sources."minimatch-3.0.4" sources."ms-2.1.3" sources."supports-color-8.1.1" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.4" ]; }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.1.25" + sources."nanoid-3.2.0" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."node-addon-api-3.2.1" + sources."node-abi-3.8.0" + sources."node-addon-api-4.3.0" sources."node-fetch-2.6.7" sources."normalize-path-3.0.0" sources."npmlog-4.1.2" @@ -117841,7 +118188,7 @@ in sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.1" - sources."prebuild-install-6.1.4" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -117883,17 +118230,11 @@ in sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."sigmund-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-4.0.1" sources."slash-3.0.0" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."slice-ansi-4.0.0" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { @@ -117906,7 +118247,7 @@ in sources."supports-color-5.5.0" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -117943,7 +118284,10 @@ in sources."v8-compile-cache-2.3.0" (sources."vsce-1.103.1" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."commander-6.2.1" sources."escape-string-regexp-1.0.5" sources."semver-5.7.1" @@ -117959,21 +118303,15 @@ in sources."which-2.0.2" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" - sources."workerpool-6.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."workerpool-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.4" + sources."yargs-17.3.1" + sources."yargs-parser-21.0.0" sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" @@ -118002,7 +118340,7 @@ in sources."p-locate-5.0.0" sources."path-exists-4.0.0" sources."picocolors-1.0.0" - sources."postcss-8.4.5" + sources."postcss-8.4.6" sources."source-map-js-1.0.2" sources."strip-json-comments-3.1.1" sources."yocto-queue-0.1.0" @@ -118116,10 +118454,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.49.0"; + version = "1.49.7"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz"; - sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz"; + sha512 = "13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -118182,7 +118520,7 @@ in }; dependencies = [ sources."@zeit/schemas-2.6.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ajv-6.12.6" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -118243,7 +118581,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."on-headers-1.0.2" @@ -118268,7 +118606,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" @@ -118296,127 +118634,47 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.72.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.72.1.tgz"; - sha512 = "SxmxyBgWQvcKvEXdP0fR3Y+nljOQ+nWCPDZXnhic//w+k0kNQ/bHcd3S1VZQqU3m7nZZwMsdC5lxB26EpUFELA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.1.1.tgz"; + sha512 = "oqbaQEVeYs0eMtz1pgKbbPoP53bahwMF3MaJq/YiB7a6+eSsOzN5OQJQoBt5Avz7DV2PjcppnxD6vf7z4VLSKQ=="; }; dependencies = [ sources."2-thenable-1.0.0" - (sources."@kwsites/file-exists-1.1.1" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) + sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@protobufjs/aspromise-1.1.2" - sources."@protobufjs/base64-1.1.2" - sources."@protobufjs/codegen-2.0.4" - sources."@protobufjs/eventemitter-1.1.0" - sources."@protobufjs/fetch-1.1.0" - sources."@protobufjs/float-1.0.2" - sources."@protobufjs/inquire-1.1.0" - sources."@protobufjs/path-1.1.2" - sources."@protobufjs/pool-1.1.0" - sources."@protobufjs/utf8-1.1.0" - (sources."@serverless/cli-1.6.0" // { - dependencies = [ - sources."@serverless/utils-1.2.0" - sources."chalk-2.4.2" - sources."dotenv-8.6.0" - sources."uuid-3.4.0" - ]; - }) - sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.18.2" // { - dependencies = [ - (sources."@serverless/utils-4.1.0" // { - dependencies = [ - sources."js-yaml-4.1.0" - ]; - }) - sources."argparse-2.0.1" - sources."dotenv-8.6.0" - (sources."js-yaml-3.14.1" // { - dependencies = [ - sources."argparse-1.0.10" - ]; - }) - sources."ramda-0.27.2" - sources."write-file-atomic-3.0.3" - ]; - }) - (sources."@serverless/core-1.1.2" // { - dependencies = [ - sources."fs-extra-7.0.1" - sources."js-yaml-3.14.1" - sources."semver-6.3.0" - ]; - }) - sources."@serverless/dashboard-plugin-5.5.4" + sources."@serverless/dashboard-plugin-6.0.0" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.3.0" // { + (sources."@serverless/platform-client-4.3.1" // { dependencies = [ sources."js-yaml-3.14.1" - sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.3.4" // { + (sources."@serverless/utils-6.0.1" // { dependencies = [ - sources."dotenv-8.6.0" - sources."js-yaml-3.14.1" + sources."jwt-decode-3.1.2" ]; }) - sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.20.3" // { - dependencies = [ - sources."get-stream-6.0.1" - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - sources."write-file-atomic-3.0.3" - ]; - }) - sources."@serverless/utils-china-1.1.5" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-1.1.8" + sources."@sindresorhus/is-4.4.0" + sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" - sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/lodash-4.14.178" - sources."@types/long-4.0.1" - sources."@types/node-17.0.10" - sources."@types/request-2.48.8" - sources."@types/request-promise-native-1.0.18" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" - sources."@types/tough-cookie-4.0.1" sources."adm-zip-0.5.9" - sources."after-0.8.2" - (sources."agent-base-6.0.2" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) - sources."ajv-6.12.6" - sources."ajv-keywords-3.5.2" - (sources."ansi-align-3.0.1" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) + sources."agent-base-6.0.2" + sources."ajv-8.10.0" + sources."ajv-formats-2.1.1" sources."ansi-escapes-4.3.2" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."aproba-1.2.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -118424,34 +118682,16 @@ in }) (sources."archiver-5.3.0" // { dependencies = [ - sources."async-3.2.3" - sources."bl-4.1.0" - sources."tar-stream-2.2.0" - ]; - }) - (sources."archiver-utils-2.1.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - (sources."are-we-there-yet-1.1.7" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" ]; }) + sources."archiver-utils-2.1.0" sources."argparse-1.0.10" sources."array-union-2.1.0" - sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1069.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -118459,40 +118699,16 @@ in sources."uuid-3.3.2" ]; }) - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."axios-0.21.4" - sources."backo2-1.0.2" sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - (sources."bl-2.2.1" // { + (sources."bl-4.1.0" // { dependencies = [ - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."readable-stream-3.6.0" ]; }) - sources."blob-0.0.5" sources."bluebird-3.7.2" - (sources."boxen-5.1.2" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."type-fest-0.20.2" - ]; - }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" @@ -118500,29 +118716,17 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffermaker-1.2.1" - sources."buffers-0.1.1" sources."builtin-modules-3.2.0" sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-6.1.0" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" ]; }) sources."cachedir-2.3.0" - sources."camelcase-6.3.0" - sources."caseless-0.12.0" - (sources."chainsaw-0.1.0" // { - dependencies = [ - sources."traverse-0.3.9" - ]; - }) + sources."call-bind-1.0.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" ]; @@ -118530,40 +118734,44 @@ in sources."chardet-0.7.0" sources."child-process-ext-2.1.1" sources."chokidar-3.5.3" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-3.3.0" - sources."cli-boxes-2.2.1" sources."cli-color-2.0.1" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.3.0" + sources."cli-spinners-2.6.1" (sources."cli-sprintf-format-1.1.1" // { dependencies = [ sources."supports-color-6.1.0" ]; }) sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."clone-response-1.0.2" - sources."code-point-at-1.1.0" - sources."color-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-string-1.9.0" - sources."colornames-1.1.1" - sources."colors-1.3.3" - sources."colorspace-1.1.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-2.19.0" - sources."component-bind-1.0.0" + sources."commander-2.20.3" sources."component-emitter-1.3.0" - sources."component-inherit-0.0.3" - sources."compress-commons-4.1.1" + (sources."compress-commons-4.1.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.4" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."cookiejar-2.1.3" - sources."core-util-is-1.0.2" - sources."crc-32-1.2.0" - sources."crc32-stream-4.0.2" + sources."core-util-is-1.0.3" + sources."crc-32-1.2.1" + (sources."crc32-stream-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -118574,9 +118782,8 @@ in sources."type-1.2.0" ]; }) - sources."dashdash-1.14.1" sources."dayjs-1.10.7" - sources."debug-2.6.9" + sources."debug-4.3.3" (sources."decompress-4.2.1" // { dependencies = [ (sources."make-dir-1.3.0" // { @@ -118586,10 +118793,16 @@ in }) ]; }) - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) (sources."decompress-tar-4.1.1" // { dependencies = [ + sources."bl-1.2.3" sources."file-type-5.2.0" + sources."tar-stream-1.6.2" ]; }) (sources."decompress-tarbz2-4.1.1" // { @@ -118608,37 +118821,22 @@ in sources."get-stream-2.3.1" ]; }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" + sources."defaults-1.0.3" + sources."defer-to-connect-2.0.1" sources."deferred-0.7.11" sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."denque-1.5.1" - sources."detect-libc-1.0.3" - sources."diagnostics-1.1.1" - sources."dijkstrajs-1.0.2" sources."dir-glob-3.0.1" - sources."dot-qs-0.2.0" sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" - sources."duplexer3-0.1.4" - sources."duplexify-4.1.2" sources."duration-0.2.2" - sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" - sources."enabled-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-client-3.5.2" // { + (sources."es5-ext-0.10.53" // { dependencies = [ - sources."debug-3.1.0" - sources."ws-7.4.6" + sources."next-tick-1.0.0" ]; }) - sources."engine.io-parser-2.2.1" - sources."env-variable-0.0.6" - sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" - sources."es6-promisify-6.1.1" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -118653,23 +118851,18 @@ in sources."event-emitter-0.3.5" sources."events-1.1.1" sources."exit-on-epipe-1.0.1" - sources."expand-template-2.0.3" sources."ext-1.6.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" sources."extend-3.0.2" sources."external-editor-3.1.0" - sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" - sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.12" sources."fastq-1.13.0" sources."fd-slicer-1.1.0" - sources."fecha-4.2.1" sources."figures-3.2.0" sources."file-type-16.5.3" - sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" sources."filesize-8.0.7" @@ -118677,111 +118870,62 @@ in sources."find-requires-1.0.0" sources."flat-5.0.2" sources."follow-redirects-1.14.7" - sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.6" sources."fs-constants-1.0.0" - (sources."fs-extra-9.1.0" // { - dependencies = [ - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" - ]; - }) + sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fs2-0.3.9" sources."fsevents-2.3.2" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."get-stdin-8.0.0" - sources."get-stream-4.1.0" - sources."getpass-0.1.7" - sources."github-from-package-0.0.0" + sources."get-stream-6.0.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.1.0" - (sources."got-11.8.3" // { - dependencies = [ - sources."@sindresorhus/is-4.3.0" - sources."@szmarczak/http-timer-4.0.6" - sources."cacheable-request-7.0.2" - sources."decompress-response-6.0.0" - sources."defer-to-connect-2.0.1" - sources."get-stream-5.2.0" - sources."json-buffer-3.0.1" - sources."keyv-4.0.5" - sources."lowercase-keys-2.0.0" - sources."mimic-response-3.1.0" - sources."normalize-url-6.1.0" - sources."p-cancelable-2.1.1" - sources."responselike-2.0.0" - ]; - }) + sources."got-11.8.3" sources."graceful-fs-4.2.9" sources."graphlib-2.1.8" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) - sources."has-cors-1.1.0" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-unicode-2.0.1" + sources."has-symbols-1.0.2" sources."http-cache-semantics-4.1.0" - sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" - (sources."https-proxy-agent-5.0.0" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.0" sources."immediate-3.0.6" sources."imurmurhash-0.1.4" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) - sources."inquirer-autocomplete-prompt-1.4.0" - sources."is-arrayish-0.3.2" + sources."inquirer-8.2.0" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-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-natural-number-4.0.1" sources."is-number-7.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isomorphic-ws-4.0.1" - sources."isstream-0.1.2" sources."jmespath-0.16.0" (sources."js-yaml-4.1.0" // { dependencies = [ sources."argparse-2.0.1" ]; }) - sources."jsbn-0.1.1" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-cycle-1.3.0" (sources."json-refs-3.0.15" // { dependencies = [ @@ -118789,33 +118933,12 @@ in sources."js-yaml-3.14.1" ]; }) - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.2" - (sources."jszip-3.7.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."jwt-decode-3.1.2" - (sources."kafka-node-5.0.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."keyv-3.1.0" - sources."kuler-1.0.1" - (sources."lazystream-1.0.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."json-schema-traverse-1.0.0" + sources."jsonfile-6.1.0" + sources."jszip-3.7.1" + sources."jwt-decode-2.2.0" + sources."keyv-4.1.1" + sources."lazystream-1.0.1" sources."lie-3.3.0" sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" @@ -118824,21 +118947,9 @@ in sources."lodash.isplainobject-4.0.6" sources."lodash.union-4.6.0" sources."log-6.3.1" - (sources."log-node-8.0.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - (sources."logform-2.3.2" // { - dependencies = [ - sources."colors-1.4.0" - sources."ms-2.1.3" - ]; - }) - sources."long-1.1.2" - sources."lowercase-keys-1.0.1" + sources."log-node-8.0.3" + sources."log-symbols-4.1.0" + sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" (sources."make-dir-3.1.0" // { @@ -118846,12 +118957,7 @@ in sources."semver-6.3.0" ]; }) - sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) + sources."memoizee-0.4.15" sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.4" @@ -118860,260 +118966,132 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.0.5" sources."minipass-3.1.6" sources."minizlib-2.1.2" - sources."mkdirp-0.5.5" - sources."ms-2.0.0" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.15.0" - sources."nanoid-2.1.11" - sources."napi-build-utils-1.0.2" sources."native-promise-only-0.8.1" - sources."ncjsm-4.2.0" - sources."nested-error-stacks-2.1.0" - sources."next-tick-1.0.0" + sources."ncjsm-4.3.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) sources."node-dir-0.1.17" sources."node-fetch-2.6.7" - sources."noop-logger-0.1.1" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" + sources."normalize-url-6.1.0" sources."object-assign-4.1.1" + sources."object-hash-2.2.0" + sources."object-inspect-1.12.0" sources."once-1.4.0" - sources."one-time-0.0.4" sources."onetime-5.1.2" sources."open-7.4.2" - sources."optional-0.1.4" - sources."os-homedir-1.0.2" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" + sources."p-cancelable-2.1.1" sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-timeout-3.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."got-9.6.0" - sources."semver-6.3.0" - ]; - }) sources."pako-1.0.11" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."pend-1.2.0" - sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."prebuild-install-5.3.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."prepend-http-2.0.0" - sources."prettyoutput-1.2.0" - sources."printj-1.1.2" + sources."printj-1.3.1" sources."process-nextick-args-2.0.1" sources."process-utils-4.0.0" sources."promise-queue-2.2.5" - (sources."protobufjs-6.11.2" // { - dependencies = [ - sources."long-4.0.0" - ]; - }) - sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qrcode-terminal-0.12.0" - sources."qs-6.5.3" + sources."qs-6.10.3" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - sources."ramda-0.26.1" - sources."rc-1.2.8" - sources."readable-stream-3.6.0" - sources."readable-web-to-node-stream-3.0.2" - sources."readdir-glob-1.1.1" - sources."readdirp-3.6.0" - sources."registry-auth-token-4.2.1" - sources."registry-url-5.1.0" - sources."replaceall-0.1.6" - (sources."request-2.88.2" // { + sources."readable-stream-2.3.7" + (sources."readable-web-to-node-stream-3.0.2" // { dependencies = [ - sources."form-data-2.3.3" - sources."uuid-3.4.0" + sources."readable-stream-3.6.0" ]; }) - sources."request-promise-core-1.1.4" - sources."request-promise-native-1.0.9" + sources."readdir-glob-1.1.1" + sources."readdirp-3.6.0" + sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" - sources."responselike-1.0.2" + sources."responselike-2.0.0" sources."restore-cursor-3.1.0" - sources."retry-0.10.1" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."rxjs-7.5.2" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-7.3.5" - sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shortid-2.2.16" - sources."signal-exit-3.0.6" - sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" - (sources."simple-git-2.48.0" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) - sources."simple-swizzle-0.2.2" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + sources."simple-git-2.48.0" sources."slash-3.0.0" - sources."snappy-6.3.5" - (sources."socket.io-client-2.4.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."socket.io-parser-3.3.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."isarray-2.0.1" - ]; - }) sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."split2-3.2.2" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."sprintf-js-1.0.3" sources."sprintf-kit-2.0.1" - sources."sshpk-1.17.0" - sources."stack-trace-0.0.10" - sources."stealthy-require-1.1.1" sources."stream-promise-3.2.0" - sources."stream-shift-1.0.1" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - sources."string_decoder-1.3.0" - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + sources."string-width-4.2.3" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.1" sources."strip-dirs-2.1.0" - sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.3" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) - sources."supports-color-5.5.0" - (sources."tabtab-3.0.2" // { + (sources."supports-color-8.1.1" // { dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."chalk-2.4.2" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."debug-4.3.3" - sources."figures-2.0.0" - sources."inquirer-6.5.2" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."ms-2.1.2" - sources."mute-stream-0.0.7" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) - sources."untildify-3.0.3" + sources."has-flag-4.0.0" ]; }) - (sources."tar-6.1.11" // { + sources."tar-6.1.11" + (sources."tar-stream-2.2.0" // { dependencies = [ - sources."chownr-2.0.0" - sources."mkdirp-1.0.4" + sources."readable-stream-3.6.0" ]; }) - (sources."tar-fs-1.16.3" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) - (sources."tar-stream-1.6.2" // { - dependencies = [ - sources."bl-1.2.3" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."tencent-serverless-http-1.3.2" - sources."text-hex-1.0.0" sources."throat-5.0.0" sources."through-2.3.8" sources."timers-ext-0.1.7" sources."tmp-0.0.33" - sources."to-array-0.1.4" sources."to-buffer-1.1.1" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."token-types-4.1.1" - sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" - sources."triple-beam-1.3.0" - sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-2.5.0" + sources."tslib-2.3.1" + sources."type-2.6.0" sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typedarray-to-buffer-3.1.5" + sources."typedarray-to-buffer-4.0.0" sources."unbzip2-stream-1.4.3" sources."uni-global-1.0.0" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."untildify-4.0.0" sources."uri-js-4.4.1" (sources."url-0.10.3" // { @@ -119122,46 +119100,27 @@ in sources."querystring-0.2.0" ]; }) - sources."url-parse-lax-3.0.0" - sources."urlencode-1.1.0" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" - sources."verror-1.10.0" + sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.5" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) - sources."winston-3.2.1" - sources."winston-transport-4.4.2" - (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."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" + sources."write-file-atomic-4.0.0" sources."ws-7.5.6" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."xmlhttprequest-ssl-1.6.3" sources."xtend-4.0.2" sources."yallist-4.0.0" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" sources."yauzl-2.10.0" - sources."yeast-0.1.2" - sources."zip-stream-4.1.0" + (sources."zip-stream-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -119184,7 +119143,7 @@ in dependencies = [ sources."CSSselect-0.4.1" sources."CSSwhat-0.4.7" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.1" sources."ajv-6.12.6" sources."array-flatten-1.1.1" @@ -119302,7 +119261,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-0.3.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" @@ -119700,7 +119659,7 @@ in sources."keep-alive-agent-0.0.1" sources."lru-cache-2.2.0" sources."mime-1.6.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mv-2.1.1" @@ -119801,10 +119760,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.834.0"; + version = "1.848.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.834.0.tgz"; - sha512 = "0XKshpV1azNRxOKwFV+NuR/ukT0OAhsUZI/jSN6O2XIQ5lYWXC8wNgvtpJ4pmhekMjBCj4rH6mxYDo2USWEZ1g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.848.0.tgz"; + sha512 = "hVPv6F+4o2OrTPj/qrdoJ5NffFi2zgo5Q1pHp/XgmP4alIE7TIeHsJnFFNrCpyNpMYCMOUrpc33c4ZQcCkaqAA=="; }; buildInputs = globalBuildInputs; meta = { @@ -119829,11 +119788,11 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.10" - sources."accepts-1.3.7" + sources."@types/node-17.0.15" + sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.3" sources."engine.io-6.1.2" @@ -119841,7 +119800,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."ms-2.1.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."object-assign-4.1.1" sources."socket.io-adapter-2.3.3" sources."socket.io-parser-4.0.4" @@ -119890,7 +119849,7 @@ in sources."bl-5.0.0" sources."buffer-6.0.3" sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."chalk-4.1.2" sources."cli-cursor-4.0.0" sources."cli-spinners-2.6.1" @@ -119965,7 +119924,7 @@ in sources."safe-buffer-5.2.1" sources."sax-1.2.4" sources."semver-7.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { dependencies = [ sources."ansi-styles-6.1.0" @@ -120430,7 +120389,7 @@ in sources."math-random-1.0.4" sources."mdmanifest-1.0.8" sources."micromatch-2.3.11" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -120445,11 +120404,11 @@ in sources."multiblob-1.13.7" sources."multiblob-http-1.2.0" sources."multicb-1.2.2" - sources."multiserver-3.7.2" + sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" - sources."multiserver-scopes-1.0.0" + sources."multiserver-scopes-2.0.0" sources."mutexify-1.4.0" - sources."muxrpc-6.5.4" + sources."muxrpc-6.7.0" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -120473,7 +120432,7 @@ in sources."nice-try-1.0.5" sources."node-bindgen-loader-1.0.1" sources."node-gyp-build-4.3.0" - sources."non-private-ip-1.4.4" + sources."non-private-ip-2.2.0" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" sources."npm-prefix-1.2.0" @@ -120491,7 +120450,7 @@ in }) ]; }) - sources."object-inspect-1.11.1" + sources."object-inspect-1.12.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -120520,7 +120479,7 @@ in sources."osenv-0.1.5" sources."p-defer-3.0.0" sources."packet-stream-2.0.6" - sources."packet-stream-codec-1.1.3" + sources."packet-stream-codec-1.2.0" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" @@ -120702,7 +120661,7 @@ in sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."requires-port-1.0.0" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."resumer-0.0.0" @@ -120760,7 +120719,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -120791,7 +120750,7 @@ in ]; }) sources."ssb-db-19.2.0" - (sources."ssb-db2-2.8.6" // { + (sources."ssb-db2-2.8.9" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -120845,9 +120804,9 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" - sources."ssb-typescript-2.5.0" + sources."ssb-typescript-2.6.0" sources."ssb-unix-socket-1.0.0" - sources."ssb-uri2-1.6.0" + sources."ssb-uri2-1.6.1" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -120889,9 +120848,10 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tape-4.14.0" // { + sources."supports-preserve-symlinks-flag-1.0.0" + (sources."tape-4.15.0" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" ]; }) sources."text-table-0.2.0" @@ -121011,7 +120971,7 @@ in }) sources."@types/babel-types-7.0.11" sources."@types/babylon-6.16.6" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-3.3.0" (sources."acorn-globals-3.1.0" // { dependencies = [ @@ -121059,7 +121019,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1069.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121203,7 +121163,7 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-3.5.0" // { dependencies = [ - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."debug-4.1.1" sources."ws-7.4.6" ]; @@ -121425,7 +121385,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" @@ -121439,7 +121399,7 @@ in sources."native-promise-only-0.8.1" sources."ncp-2.0.0" sources."needle-1.6.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" sources."node-forge-0.7.6" sources."node-uuid-1.4.8" @@ -121593,7 +121553,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."sntp-1.0.9" (sources."socket.io-2.4.1" // { @@ -121852,7 +121812,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -121896,7 +121856,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-8.0.0" @@ -121949,7 +121909,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nanoid-3.2.0" @@ -121968,7 +121928,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.5" + sources."postcss-8.4.6" sources."postcss-media-query-parser-0.2.3" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" @@ -121998,7 +121958,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."semver-7.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -122129,7 +122089,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.3" (sources."mkdirp-0.5.5" // { dependencies = [ @@ -122158,7 +122118,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."split-0.3.1" sources."sshpk-1.17.0" sources."string-width-2.1.1" @@ -122192,16 +122152,16 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.3.0.tgz"; - sha512 = "SBKdJyUmxzPmJf/ZPqDSQOoa9JzOcgEpV7u3UaYcgVn7fA0veZ3FA5JgLU8KYtf84Gp6guBVcrC7XKLjJa5SXQ=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.4.2.tgz"; + sha512 = "QUS3YXEfJf9RdNOPdztzxUxB2XCSNG+0AtkRuZwe/OvOXMv9WKqrmGOny0PW1DtflyWiGIVgYoUIqS/zlBMJFQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122234,7 +122194,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mri-1.2.0" @@ -122274,10 +122234,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.18"; + version = "0.14.20"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.18.tgz"; - sha512 = "/qHEz7D2MUZVpUk8biYx6Xfk2W8SHeWOsQdrKLcJ5SH7MrwgxcIg5RRAEgMrrT4WyTNzD9IOQWVSokd+yS84Ww=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.20.tgz"; + sha512 = "BdgLQzPbS8WpE2l779MB6nAoqI9BJdeA/Xz3BciwoBks0vARN+hBi++Cf53H+QBUC0u7bePnXHH7mzv9ab9RHg=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" @@ -122286,7 +122246,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122323,7 +122283,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."no-case-3.0.4" @@ -122344,13 +122304,13 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-3.46.2" + sources."svelte-3.46.4" sources."svelte-preprocess-4.10.2" - sources."svelte2tsx-0.4.14" + sources."svelte2tsx-0.5.2" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."typescript-4.5.5" - sources."vscode-css-languageservice-5.1.9" + sources."vscode-css-languageservice-5.1.12" (sources."vscode-emmet-helper-2.6.4" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -122369,7 +122329,7 @@ in sources."vscode-jsonrpc-6.0.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" @@ -122757,7 +122717,7 @@ in sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" sources."mkdirp-0.5.1" @@ -122894,7 +122854,7 @@ in sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."sigmund-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -123006,7 +122966,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -123066,10 +123026,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.0.15"; + version = "3.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.15.tgz"; - sha512 = "bT2iy7FtjwgsXik4ZoJnHXR+SRCiGR1W95fVqpLZebr64m4ahwUwRbIAc5w5+2fzr1YF4Ct2eI7dojMRRl8sVQ=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.18.tgz"; + sha512 = "ihPTpEyA5ANgZbwKlgrbfnzOp9R5vDHFWmqxB1PT8NwOGCOFVVMl+Ps1cQQ369acaqqf1BEF77roCwK0lvNmTw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -123280,7 +123240,7 @@ in sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."typegram-3.7.0" + sources."typegram-3.8.0" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -123351,7 +123311,7 @@ in sources."inherits-2.0.4" sources."isarray-1.0.0" sources."memory-fs-0.3.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -123431,7 +123391,7 @@ in sources."@textlint/utils-12.1.0" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -123541,7 +123501,7 @@ in sources."micromark-extension-gfm-table-0.4.3" sources."micromark-extension-gfm-tagfilter-0.3.0" sources."micromark-extension-gfm-task-list-item-0.3.3" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" @@ -123904,7 +123864,7 @@ in sources."meow-7.1.1" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."ms-2.1.2" @@ -123980,7 +123940,7 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sliced-1.0.1" sources."space-separated-tokens-1.1.5" (sources."spawn-to-readstream-0.1.3" // { @@ -124489,7 +124449,7 @@ in sha512 = "dkVdH21q9vipV7UU10qQQprPuP8rG+IDJSHUtmOC0WDYvwYTiUC9IYLIpkyWdgfwFYegDTnnR4duHNZynqOXTA=="; }; dependencies = [ - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.4.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -124498,11 +124458,15 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.34" + ]; + }) (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.3" @@ -124564,7 +124528,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.2.1" @@ -124597,7 +124561,7 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-4.1.2" // { dependencies = [ - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."debug-4.3.3" sources."ms-2.1.2" ]; @@ -124706,7 +124670,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -124718,11 +124682,15 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + (sources."mime-types-2.1.33" // { + dependencies = [ + sources."mime-db-1.50.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { dependencies = [ @@ -124739,7 +124707,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" sources."node-forge-0.10.0" (sources."node-gyp-3.8.0" // { @@ -124803,7 +124771,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -124847,7 +124815,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" (sources."socket.io-3.1.2" // { dependencies = [ @@ -124862,7 +124830,7 @@ in sources."ms-2.1.2" ]; }) - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sqlite3-5.0.2" sources."sshpk-1.17.0" sources."statuses-1.5.0" @@ -124883,7 +124851,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ @@ -124954,7 +124922,7 @@ in sha512 = "o24rZwvzeMbbvuara2bGaX6eHw925aQw1BZhl7VHtY6xlWrJ9Sy7P29/Q2GQNIP4Otzcf09TX29zTBbRjKbrSA=="; }; dependencies = [ - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.4.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -124963,11 +124931,15 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.34" + ]; + }) (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.3" @@ -125029,7 +125001,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.2.1" @@ -125062,7 +125034,7 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-4.1.2" // { dependencies = [ - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."debug-4.3.3" sources."ms-2.1.2" ]; @@ -125171,7 +125143,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -125183,11 +125155,15 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + (sources."mime-types-2.1.33" // { + dependencies = [ + sources."mime-db-1.50.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { dependencies = [ @@ -125204,7 +125180,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" sources."node-forge-0.10.0" (sources."node-gyp-3.8.0" // { @@ -125268,7 +125244,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -125312,7 +125288,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" (sources."socket.io-3.1.2" // { dependencies = [ @@ -125327,7 +125303,7 @@ in sources."ms-2.1.2" ]; }) - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sqlite3-5.0.2" sources."sshpk-1.17.0" sources."statuses-1.5.0" @@ -125348,7 +125324,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ @@ -125424,7 +125400,11 @@ in sources."@szmarczak/http-timer-1.1.2" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.34" + ]; + }) sources."after-0.8.2" sources."agent-base-4.3.0" sources."ajv-6.12.6" @@ -125501,7 +125481,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -125655,11 +125635,15 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.51.0" + (sources."mime-types-2.1.24" // { + dependencies = [ + sources."mime-db-1.40.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -125673,7 +125657,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" @@ -125749,7 +125733,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -126089,11 +126073,15 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.34" + ]; + }) sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ @@ -126165,7 +126153,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -126299,7 +126287,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -126310,11 +126298,15 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.51.0" + (sources."mime-types-2.1.27" // { + dependencies = [ + sources."mime-db-1.44.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -126327,7 +126319,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-2.0.0" sources."node-forge-0.9.1" (sources."node-gyp-3.8.0" // { @@ -126390,7 +126382,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -126433,7 +126425,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -126475,7 +126467,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" sources."tar-4.4.19" sources."thelounge-4.2.0" @@ -126546,11 +126538,15 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.34" + ]; + }) sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ @@ -126622,7 +126618,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -126756,7 +126752,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -126767,11 +126763,15 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.51.0" + (sources."mime-types-2.1.27" // { + dependencies = [ + sources."mime-db-1.44.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -126784,7 +126784,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-2.0.0" sources."node-forge-0.9.1" (sources."node-gyp-3.8.0" // { @@ -126847,7 +126847,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -126890,7 +126890,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -126932,7 +126932,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" sources."tar-4.4.19" sources."thelounge-4.2.0" @@ -127387,10 +127387,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.136.0"; + version = "0.137.5"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.136.0.tgz"; - sha512 = "+fEMX7nYLz2ZesVP/dyifli5Jf8gR3XPAnFJveQ80aMhibFduzrADnjMbARXh8+W9qLK7rshJCjAIL/6cDxC+A=="; + url = "https://registry.npmjs.org/three/-/three-0.137.5.tgz"; + sha512 = "rTyr+HDFxjnN8+N/guZjDgfVxgHptZQpf6xfL/Mo7a5JYIFwK6tAq3bzxYYB4Ae0RosDZlDuP+X5aXDXz+XnHQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -127502,7 +127502,7 @@ in sources."lru-cache-6.0.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."node-appc-1.1.3" @@ -127634,7 +127634,7 @@ in sources."lru-cache-4.1.5" sources."lstream-0.0.4" sources."mime-1.6.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.29.1" @@ -127786,7 +127786,7 @@ in sources."has-ansi-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-0.0.10" sources."node-color-readline-1.0.1" sources."once-1.4.0" @@ -127813,10 +127813,10 @@ in ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-3.0.0.tgz"; - sha512 = "Y/ymhhYr/lLkf66BnLQBs3LjttPDE+1BJcFHq/oJN5SnZTacMWVdPfGLB5eIVnC2iT9gZ2ls/Bre2zbKq6hNsA=="; + url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-3.1.0.tgz"; + sha512 = "aHTbcYosNHVqb2Qtt9Xfta77ae/5y0VfdwNLUS6sGBeGr22cX2JDMo/i5h3uuOf+FAD3akYOr17+fYd5NK8aXw=="; }; dependencies = [ sources."argparse-2.0.1" @@ -127852,10 +127852,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.9.4"; + version = "0.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.4.tgz"; - sha512 = "Ku40l2JQyj4rB/qHLRMm/k2nqAppR6equ4LCqiLSOH/tDypsSPjgQfeYJ+gterQbdYOpCqLimiL2AP1BeHpTQw=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.6.tgz"; + sha512 = "nLB9qvCFq/jRj21tC6SPZgde8JkNbCQZVjoeBHYsCZvzBgSyNh1A1k5puAM9g/kWlEvAlN/G4J8tETbnJySVpg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -127867,7 +127867,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."clean-stack-2.2.0" - sources."commander-8.3.0" + sources."commander-9.0.0" sources."concat-map-0.0.1" sources."crypto-random-string-2.0.0" sources."del-6.0.0" @@ -127898,7 +127898,7 @@ in sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."once-1.4.0" sources."p-debounce-2.1.0" sources."p-limit-2.3.0" @@ -127925,7 +127925,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-3.0.3" sources."which-2.0.2" @@ -127944,10 +127944,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.5"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz"; - sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz"; + sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -127980,22 +127980,27 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.18"; + version = "1.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.18.tgz"; - sha512 = "E8fuVzs7KhfqWyk+MQ+LqP2A0IXFW643Xu2BJCw4iLpmFBoKHl+7AUZ5q4o2qefe1DFoAMijmbFsxbIcmDuvWg=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.19.tgz"; + sha512 = "ryOJUymx7IUm7H9Y/3O+amMhhqjfQjkr+cuf2cwYm0UzF+GeBMP8ZtdsnEgi0SjKiwVBCpQkYMNgtSmHAIiukg=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-14.1.0" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" + sources."@primer/octicons-16.3.0" + sources."@sindresorhus/is-4.4.0" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.18.9" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.3" + sources."@types/node-16.11.22" + sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ansi-regex-5.0.1" (sources."ansi-styles-4.3.0" // { dependencies = [ @@ -128006,19 +128011,14 @@ in sources."array-flatten-1.1.1" sources."async-3.2.3" sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" - sources."blueimp-md5-2.18.0" + sources."blueimp-md5-2.19.0" sources."body-parser-1.19.1" sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" sources."bytes-3.1.1" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" sources."cliui-7.0.4" sources."clone-2.1.2" sources."clone-response-1.0.2" @@ -128038,28 +128038,31 @@ in sources."cors-2.8.5" sources."crossroads-0.12.2" sources."debug-2.6.9" - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" + sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.14" + sources."diff2html-3.4.15" sources."dnd-page-scroll-0.0.4" - sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-5.1.1" // { + (sources."engine.io-6.1.2" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.3" + sources."engine.io-parser-5.0.3" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -128077,10 +128080,10 @@ in sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" - sources."getmac-5.17.0" + sources."get-stream-5.2.0" + sources."getmac-5.20.0" sources."glob-7.2.0" - sources."got-9.6.0" + sources."got-11.8.3" sources."hasher-1.2.0" (sources."hogan.js-3.0.2" // { dependencies = [ @@ -128089,8 +128092,9 @@ in }) sources."http-cache-semantics-4.1.0" sources."http-errors-1.8.1" + sources."http2-wrapper-1.0.3" sources."iconv-lite-0.4.24" - sources."ignore-5.1.9" + sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -128101,21 +128105,21 @@ in sources."is-stream-2.0.1" sources."is-wsl-2.2.0" sources."jquery-3.6.0" - sources."jquery-ui-1.12.1" - sources."json-buffer-3.0.0" + sources."jquery-ui-1.13.1" + sources."json-buffer-3.0.1" sources."just-detect-adblock-1.1.0" - sources."keyv-3.1.0" + sources."keyv-4.1.1" sources."knockout-3.5.1" sources."kuler-2.0.0" - sources."latest-version-5.1.0" - sources."locks-0.2.2" + sources."latest-version-6.0.0" sources."lodash-4.17.21" (sources."logform-2.3.2" // { dependencies = [ sources."ms-2.1.3" + sources."safe-stable-stringify-1.1.1" ]; }) - sources."lowercase-keys-1.0.1" + sources."lowercase-keys-2.0.0" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" (sources."memorystore-1.6.6" // { @@ -128130,40 +128134,38 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."moment-2.29.1" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-cache-5.1.2" + sources."node-watch-0.7.3" sources."nopt-1.0.10" - sources."normalize-url-4.5.1" + sources."normalize-url-6.1.0" sources."nprogress-0.2.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-8.1.0" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."open-8.4.0" + sources."p-cancelable-2.1.1" + sources."p-limit-4.0.0" + sources."package-json-7.0.0" sources."parseurl-1.3.3" - sources."passport-0.4.1" + sources."passport-0.5.2" sources."passport-local-1.0.0" sources."passport-strategy-1.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."pause-0.0.1" - sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."qs-6.9.6" + sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" sources."raven-js-3.27.2" @@ -128173,10 +128175,11 @@ in sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."require-directory-2.1.1" - sources."responselike-1.0.2" + sources."resolve-alpn-1.2.1" + sources."responselike-2.0.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" (sources."semver-7.3.5" // { dependencies = [ @@ -128194,7 +128197,7 @@ in sources."signals-1.0.0" sources."simple-swizzle-0.2.2" sources."snapsvg-0.5.1" - (sources."socket.io-4.1.3" // { + (sources."socket.io-4.4.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -128220,25 +128223,24 @@ in ]; }) sources."text-hex-1.0.0" - sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.1" sources."triple-beam-1.3.0" sources."type-is-1.6.18" sources."uid-safe-2.1.5" sources."unpipe-1.0.0" - sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."winston-3.3.4" - sources."winston-transport-4.4.2" + sources."winston-3.5.1" + sources."winston-transport-4.5.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.6" + sources."ws-8.2.3" sources."y18n-5.0.8" sources."yallist-2.1.2" - sources."yargs-17.0.1" - sources."yargs-parser-20.2.9" + sources."yargs-17.3.1" + sources."yargs-parser-21.0.0" + sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -128253,10 +128255,10 @@ in unified-language-server = nodeEnv.buildNodePackage { name = "unified-language-server"; packageName = "unified-language-server"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-2.0.0.tgz"; - sha512 = "TYqgb2zdbbbEI4vI78HEdPx7UQx2EmN59sZAdL/Cf5dF5yzLMGA2v0LpozY3wLYEqPY/z0ChKK8jjZXeFMWYrw=="; + url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-2.1.0.tgz"; + sha512 = "OJA4rcB3hVvJ4tOYN9YW9EcmRyjTJTzZfbDfSTLy/86CFE8P/LoNEv5GeNR+cdy1+wrJj74jc9yuesB735ml8g=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -128267,7 +128269,7 @@ in sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" sources."@types/ms-0.7.31" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."ansi-regex-6.0.1" @@ -128311,7 +128313,7 @@ in sources."load-plugin-4.0.1" sources."locate-path-3.0.0" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."ms-2.1.2" sources."once-1.4.0" sources."p-limit-2.3.0" @@ -128346,7 +128348,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -128436,7 +128438,7 @@ in ]; }) sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" @@ -128458,9 +128460,9 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -128577,7 +128579,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -128652,7 +128654,7 @@ in sources."responselike-1.0.2" sources."semver-6.3.0" sources."semver-diff-3.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."string-width-4.2.3" @@ -128793,14 +128795,14 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-intrinsic-1.1.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" @@ -128826,7 +128828,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" @@ -128867,7 +128869,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -128992,7 +128994,7 @@ in sources."jsonc-parser-3.0.0" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.10" // { + (sources."vscode-json-languageservice-4.2.0" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -129000,7 +129002,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.3" @@ -129050,7 +129052,7 @@ in sources."vscode-languageserver-types-3.5.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-2.0.2" sources."vscode-uri-1.0.8" @@ -129074,22 +129076,22 @@ in sha512 = "DTFhpzUhP3M5WA62WT/SVSxtq47R5rbIEznA7svxWD19/+D1iGBrrzAa8LrDCkLUMxyG3gbya99LczV4F9m6Yg=="; }; dependencies = [ - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."jsonc-parser-3.0.0" sources."regenerator-runtime-0.13.9" sources."request-light-0.5.7" sources."typescript-4.5.5" - sources."vscode-css-languageservice-5.1.9" + sources."vscode-css-languageservice-5.1.12" sources."vscode-html-languageservice-4.2.1" - sources."vscode-json-languageservice-4.2.0-next.2" - sources."vscode-jsonrpc-8.0.0-next.5" - sources."vscode-languageserver-8.0.0-next.6" - (sources."vscode-languageserver-protocol-3.17.0-next.12" // { + sources."vscode-json-languageservice-4.2.0" + sources."vscode-jsonrpc-8.0.0-next.6" + sources."vscode-languageserver-8.0.0-next.8" + (sources."vscode-languageserver-protocol-3.17.0-next.14" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.6" + sources."vscode-languageserver-types-3.17.0-next.7" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" @@ -129118,7 +129120,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.63.1" + sources."@types/vscode-1.64.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -129136,9 +129138,9 @@ in sources."@webassemblyjs/wasm-opt-1.11.1" sources."@webassemblyjs/wasm-parser-1.11.1" sources."@webassemblyjs/wast-printer-1.11.1" - sources."@webpack-cli/configtest-1.1.0" - sources."@webpack-cli/info-1.4.0" - sources."@webpack-cli/serve-1.6.0" + sources."@webpack-cli/configtest-1.1.1" + sources."@webpack-cli/info-1.4.1" + sources."@webpack-cli/serve-1.6.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.7.0" @@ -129163,7 +129165,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -129203,7 +129205,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.3.0" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -129262,7 +129264,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.4.6" + sources."jest-worker-27.5.0" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -129357,7 +129359,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" @@ -129376,7 +129378,7 @@ in sources."source-map-0.7.3" ]; }) - (sources."terser-webpack-plugin-5.3.0" // { + (sources."terser-webpack-plugin-5.3.1" // { dependencies = [ sources."serialize-javascript-6.0.0" ]; @@ -129413,8 +129415,8 @@ in sources."vscode-debugadapter-testsupport-1.51.0" sources."vscode-debugprotocol-1.51.0" sources."watchpack-2.3.1" - sources."webpack-5.67.0" - (sources."webpack-cli-4.9.1" // { + sources."webpack-5.68.0" + (sources."webpack-cli-4.9.2" // { dependencies = [ sources."commander-7.2.0" ]; @@ -129467,13 +129469,10 @@ in sha512 = "swQ0bfyJSWfFr42IXr8A774yA1n+YudhzsaHBKhWSkczSqjvgZvSvM8NEnx6QKnfOHBXbdNR5vhahjNUMlftQQ=="; }; dependencies = [ - sources."absolute-0.0.1" sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" - sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ansi-wrap-0.1.0" sources."argparse-1.0.10" sources."array-differ-1.0.0" sources."array-union-1.0.2" @@ -129491,6 +129490,7 @@ in sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -129505,7 +129505,7 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.1" - sources."clone-1.0.4" + sources."clone-2.1.2" sources."co-3.1.0" sources."co-from-stream-0.0.0" sources."co-fs-extra-1.2.1" @@ -129520,6 +129520,7 @@ in sources."consolidate-0.14.5" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."decompress-4.2.1" sources."decompress-tar-4.1.1" @@ -129555,6 +129556,7 @@ in sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" + sources."fill-range-7.0.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-constants-1.0.0" @@ -129567,17 +129569,11 @@ in sources."glob-7.2.0" sources."got-6.7.1" sources."graceful-fs-4.2.9" - sources."gray-matter-2.1.1" + sources."gray-matter-4.0.3" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."has-flag-3.0.0" - sources."has-generators-1.0.1" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-signature-1.2.0" @@ -129587,10 +129583,10 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-6.5.2" - sources."is-3.3.0" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-natural-number-4.0.1" + sources."is-number-7.0.0" sources."is-object-1.0.2" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" @@ -129598,6 +129594,7 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" sources."js-yaml-3.14.1" @@ -129607,6 +129604,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.2" + sources."kind-of-6.0.3" sources."klaw-1.3.1" sources."lodash-4.17.21" sources."log-symbols-2.2.0" @@ -129616,19 +129614,23 @@ in sources."pify-3.0.0" ]; }) - (sources."metalsmith-2.3.0" // { + (sources."metalsmith-2.4.1" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.2.1" + sources."has-flag-4.0.0" + sources."rimraf-3.0.2" + sources."supports-color-7.2.0" ]; }) + sources."micromatch-4.0.4" sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."multimatch-2.1.0" @@ -129647,8 +129649,10 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -129664,7 +129668,6 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."recursive-readdir-2.2.2" sources."request-2.88.2" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" @@ -129672,13 +129675,16 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" + sources."section-matter-1.0.0" sources."seek-bzip-1.0.6" sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" - sources."stat-mode-0.2.2" + sources."stat-mode-1.0.0" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -129694,6 +129700,7 @@ in sources."ansi-regex-4.1.0" ]; }) + sources."strip-bom-string-1.0.0" sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" sources."supports-color-5.5.0" @@ -129705,13 +129712,13 @@ in sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."toml-2.3.6" + sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -129729,7 +129736,7 @@ in ]; }) sources."ware-1.3.0" - sources."win-fork-1.1.1" + sources."which-2.0.2" sources."wordwrap-1.0.0" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -129774,7 +129781,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -130218,7 +130225,7 @@ in sources."micromatch-3.1.10" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { @@ -130408,7 +130415,7 @@ in sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { @@ -130639,7 +130646,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-textbuffer-1.0.0" @@ -130700,7 +130707,7 @@ in sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.16.8" + sources."@babel/runtime-corejs3-7.17.0" sources."@mapbox/node-pre-gyp-1.0.8" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -130735,7 +130742,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.20.3" + sources."core-js-pure-3.21.0" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -130806,7 +130813,7 @@ in sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minizlib-2.1.2" @@ -130839,9 +130846,9 @@ in sources."saxes-5.0.1" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."source-map-0.6.1" sources."stackblur-canvas-2.5.0" sources."string-width-4.2.3" @@ -130934,7 +130941,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/yauzl-2.9.2" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -131104,7 +131111,7 @@ in }) sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -131131,7 +131138,7 @@ in sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - sources."globals-13.12.0" + sources."globals-13.12.1" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -131247,7 +131254,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."moment-2.29.1" @@ -131369,7 +131376,7 @@ in sources."common-tags-1.8.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sonic-boom-2.6.0" sources."source-map-0.6.1" sources."source-map-js-0.6.2" @@ -131469,17 +131476,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.67.0"; + version = "5.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz"; - sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz"; + sha512 = "zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g=="; }; dependencies = [ sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -131503,10 +131510,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.19.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001309" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.65" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -131523,7 +131530,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" - sources."jest-worker-27.4.6" + sources."jest-worker-27.5.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -131547,7 +131554,7 @@ in sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.3.0" + sources."terser-webpack-plugin-5.3.1" sources."uri-js-4.4.1" sources."watchpack-2.3.1" sources."webpack-sources-3.2.3" @@ -131565,16 +131572,16 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz"; - sha512 = "JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz"; + sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.6" - sources."@webpack-cli/configtest-1.1.0" - sources."@webpack-cli/info-1.4.0" - sources."@webpack-cli/serve-1.6.0" + sources."@webpack-cli/configtest-1.1.1" + sources."@webpack-cli/info-1.4.1" + sources."@webpack-cli/serve-1.6.1" sources."clone-deep-4.0.1" sources."colorette-2.0.16" sources."commander-7.2.0" @@ -131614,7 +131621,7 @@ in sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."strip-final-newline-2.0.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."webpack-merge-5.8.0" @@ -131634,10 +131641,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.7.3"; + version = "4.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz"; - sha512 = "mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz"; + sha512 = "nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -131652,7 +131659,7 @@ in sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.9" sources."@types/mime-1.3.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.1" @@ -131660,9 +131667,9 @@ in sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" sources."@types/ws-8.2.2" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."aggregate-error-3.1.0" - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."ansi-html-community-0.0.8" @@ -131798,13 +131805,13 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-forge-1.2.1" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" @@ -131875,7 +131882,7 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sockjs-0.3.24" (sources."spdy-4.0.2" // { @@ -131909,7 +131916,7 @@ in sources."uuid-8.3.2" sources."vary-1.1.2" sources."wbuf-1.7.3" - sources."webpack-dev-middleware-5.3.0" + sources."webpack-dev-middleware-5.3.1" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" @@ -131929,17 +131936,17 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "10.2.1"; + version = "10.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz"; - sha512 = "nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; + sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@types/json-schema-7.0.9" - sources."ajv-8.9.0" + sources."ajv-8.10.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."array-union-3.0.1" @@ -131991,10 +131998,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.2.tgz"; - sha512 = "GQ+iobyUrnRqBdQRqZHghj6qOz3WHDDoq028N7NcUKgU7eaDBgu2m3hBfpCmIvn9mNlRRGk6utNh++tNVdTmnQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.3.tgz"; + sha512 = "UuAv33TkzZGpGYgWH8rLWkvebd91UWid6tueQhUj6eGxfLUpAEl6uFyRMLAEmg2/kskKQzI2YPl8+tgex3TWxg=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -132009,7 +132016,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.15" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -132046,7 +132053,7 @@ in sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."blob-to-buffer-1.2.9" @@ -132107,7 +132114,11 @@ in }) sources."dns-packet-5.3.1" sources."dns-txt-2.0.2" - sources."ecstatic-4.1.4" + (sources."ecstatic-4.1.4" // { + dependencies = [ + sources."mime-2.6.0" + ]; + }) sources."ee-first-1.1.1" sources."elementtree-0.1.7" sources."emoji-regex-8.0.0" @@ -132155,7 +132166,7 @@ in dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."long-4.0.0" @@ -132171,9 +132182,9 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" sources."memory-chunk-store-1.3.5" - sources."mime-2.6.0" + sources."mime-3.0.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" @@ -132201,7 +132212,7 @@ in dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."path-is-absolute-1.0.1" @@ -132243,7 +132254,7 @@ in sources."sax-1.1.4" sources."semver-5.1.1" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" (sources."simple-peer-9.11.0" // { dependencies = [ sources."debug-4.3.3" @@ -132258,14 +132269,14 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.12.0" + sources."streamx-2.12.1" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" @@ -132303,14 +132314,13 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.7.1" // { + (sources."webtorrent-1.8.1" // { dependencies = [ sources."debug-4.3.3" sources."decompress-response-6.0.0" - sources."mime-3.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."winreg-1.2.4" @@ -132382,10 +132392,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.3.0.tgz"; - sha512 = "4F6NSkS6np7oUU3uM5ZIfNmKD33RuOaqQ+3kf/2oCotfJ3MYUH8NFofpBBsOvyXdrzA4KkOJ+ZU/FeC96HjncA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.4.0.tgz"; + sha512 = "NgUzbSbRQvIH++P303a6Y20qLRqM8qhPESoJ/n26NBXA+GITozV1/JRl2FLEt9oPSR9WkQ1a9J3EsToHfKGQWA=="; }; dependencies = [ sources."jsonc-parser-3.0.0" @@ -132394,11 +132404,11 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" - sources."yaml-2.0.0-8" + sources."yaml-2.0.0-10" ]; buildInputs = globalBuildInputs; meta = { @@ -132443,7 +132453,7 @@ in sources."ini-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."jsonfile-4.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-2.2.2" @@ -132497,13 +132507,13 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.0" sources."@gar/promisify-1.1.2" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-4.2.1" // { + (sources."@npmcli/arborist-4.3.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -132658,7 +132668,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.20.3" + sources."core-js-3.21.0" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -132875,7 +132885,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."locutus-2.0.15" + sources."locutus-2.0.16" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" @@ -132916,7 +132926,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.0.5" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" @@ -132986,7 +132996,16 @@ in sources."semver-7.3.5" ]; }) - sources."npm-registry-fetch-11.0.0" + (sources."npm-registry-fetch-12.0.1" // { + dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."debug-4.3.3" + sources."http-cache-semantics-4.1.0" + sources."http-proxy-agent-5.0.0" + sources."make-fetch-happen-10.0.0" + sources."ms-2.1.2" + ]; + }) sources."npm-run-path-2.0.2" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -133043,7 +133062,7 @@ in }) sources."p-try-1.0.0" sources."package-json-5.0.0" - (sources."pacote-12.0.2" // { + (sources."pacote-12.0.3" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -133173,10 +133192,10 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" (sources."socks-proxy-agent-6.1.1" // { dependencies = [ sources."debug-4.3.3" @@ -133439,7 +133458,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-16.11.21" + sources."@types/node-16.11.22" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix index 959a7203df..c9edfd62e0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-apron-${version}"; + pname = "ocaml${ocaml.version}-apron"; version = "0.9.13"; src = fetchFromGitHub { owner = "antoinemine"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix index ba8cd98327..8ecac1c124 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-astring-${param.version}"; + pname = "ocaml${ocaml.version}-astring"; inherit (param) version; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index c1cb7de2d1..6723ad0c1c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -15,7 +15,7 @@ then throw "BAP is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bap-${version}"; + pname = "ocaml${ocaml.version}-bap"; version = "2.2.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/" ''; nativeBuildInputs = [ which makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index d2edb69e1b..69e8289df2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -6,10 +6,9 @@ if !lib.versionAtLeast ocaml.version "4.02" then throw "batteries is not available for OCaml ${ocaml.version}" else -let version = "3.4.0"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-batteries-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-batteries"; + version = "3.4.0"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix index 07432dd7c6..3397821319 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix @@ -1,9 +1,8 @@ { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: -let version = "1.4"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-benchmark-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-benchmark"; + version = "1.4"; src = fetchzip { url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix index 83c35edcc4..fd690cfdd5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { useDune2 = true; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.02"; src = fetchFromGitHub { owner = "mirage"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix index 62438526d7..17a0185829 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix @@ -3,8 +3,9 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bos-${version}"; + pname = "ocaml${ocaml.version}-bos"; version = "0.2.0"; + src = fetchurl { url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz"; sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix index 0a9922f678..1801a0679b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo }: +{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo +, ApplicationServices }: buildDunePackage rec { pname = "cairo2"; @@ -13,7 +14,7 @@ buildDunePackage rec { useDune2 = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo dune-configurator ]; + buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; doCheck = !(stdenv.isDarwin # https://github.com/Chris00/ocaml-cairo/issues/19 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix index 3d79fa377a..42c27f15a5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -6,7 +6,8 @@ else stdenv.mkDerivation rec { version = "2.5"; - name = "ocaml${ocaml.version}-camlpdf-${version}"; + pname = "ocaml${ocaml.version}-camlpdf"; + src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix index d86c0d0932..632430fe4f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix @@ -4,16 +4,15 @@ if !lib.versionAtLeast ocaml.version "4.10" then throw "cpdf is not available for OCaml ${ocaml.version}" else -let version = "2.5"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-cpdf-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-cpdf"; + version = "2.5"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "sha256:0ps6d78i5mp1gcigxfp9rxmjr1k00nkr37vllhr0rdyph97w41s1"; + sha256 = "sha256:1qmx229nij7g6qmiacmyy4mcgx3k9509p4slahivshqm79d6wiwl"; }; buildInputs = [ ocaml findlib ncurses ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix index d8aa1f371f..7bdaf2dfad 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-dum-${version}"; + pname = "ocaml${ocaml.version}-dum"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix index 4eff6c2957..2ddef0f405 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1"; - name = "ocaml${ocaml.version}-elina-${version}"; + pname = "ocaml${ocaml.version}-elina"; src = fetchurl { url = "http://files.sri.inf.ethz.ch/elina-${version}.tar.gz"; sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 9eaad7575e..3447d590ea 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.3+20200317"; - name = "ocaml${ocaml.version}-erm_xmpp-${version}"; + pname = "ocaml${ocaml.version}-erm_xmpp"; src = fetchFromGitHub { owner = "hannesm"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix index 1812473e78..e951acaa71 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-expat-${version}"; + pname = "ocaml${ocaml.version}-expat"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix index 77eef7f29a..79b742da57 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix @@ -7,7 +7,7 @@ then throw "farfadet is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-farfadet-${version}"; + pname = "ocaml${ocaml.version}-farfadet"; version = "0.3"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix index e68f6a28cb..bc74a5b58a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-FrontC-${version}"; + pname = "ocaml${ocaml.version}-FrontC"; version = "3.4.1"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "FrontC"; - rev = "V_3_4_1"; + rev = "V_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix index 2f11001874..959963c475 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix @@ -13,8 +13,8 @@ let param = in stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-functory-${param.version}"; + pname = "ocaml${ocaml.version}-functory"; + inherit (param) version; src = fetchurl { url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix index 8910b720a8..e8289d9296 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3"; - name = "ocaml${ocaml.version}-inotify-${version}"; + pname = "ocaml${ocaml.version}-inotify"; src = fetchFromGitHub { owner = "whitequark"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 679ef4a58e..ee906a7225 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -299,9 +299,9 @@ with self; }; core = janePackage { - version = "0.11.2"; + version = "0.11.3"; pname = "core"; - hash = "0vpsvd75lxb09il2rnzyib9mlr51v1hzqdc9fdxgx353pb5agh8a"; + hash = "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq"; propagatedBuildInputs = [ core_kernel spawn ]; meta.description = "Jane Street's standard library overlay"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix index 78a081619b..c228242fda 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,9 +1,8 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: -let version = "1.0.1"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-jsonm-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-jsonm"; + version = "1.0.1"; src = fetchurl { url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 373e5ded95..d97f2f5bff 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation rec { version = "1.6"; - name = "ocaml${ocaml.version}-lablgtk-extras-${version}"; + pname = "ocaml${ocaml.version}-lablgtk-extras"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index bef06975ac..971668ce0e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { inherit (param) version src; - name = "ocaml${ocaml.version}-labltk-${version}"; + pname = "ocaml${ocaml.version}-labltk"; buildInputs = [ ocaml findlib tcl tk makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix index 5513935133..8b06045445 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "1.0.1"; - name = "ocaml${ocaml.version}-lwt_react-${version}"; + pname = "ocaml${ocaml.version}-lwt_react"; src = fetchzip { - url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; + url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-${version}.tar.gz"; sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix index a0026e3a8c..4e27c8ff3b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-mlgmpidl-${version}"; + pname = "ocaml${ocaml.version}-mlgmpidl"; version = "1.2.12"; src = fetchFromGitHub { owner = "nberth"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix index 9fa302947e..3e4438f6da 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix @@ -16,7 +16,8 @@ let param = in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-mtime-${param.version}"; + pname = "ocaml${ocaml.version}-mtime"; + inherit (param) version; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix index 055e6db3a6..fdd24094c1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -20,7 +20,7 @@ then throw "nocrypto is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-nocrypto-${version}"; + pname = "ocaml${ocaml.version}-nocrypto"; version = "0.5.4"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix index 8e1c5f38cb..94342bb312 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix @@ -12,7 +12,7 @@ let withLwt = lwt != null; in stdenv.mkDerivation rec { version = "0.2.2"; - name = "ocaml${ocaml.version}-notty-${version}"; + pname = "ocaml${ocaml.version}-notty"; src = fetchurl { url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix index e2c7b439c6..b1293a2ab5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1"; - name = "ocaml${ocaml.version}-num-${version}"; + pname = "ocaml${ocaml.version}-num"; src = fetchFromGitHub { owner = "ocaml"; repo = "num"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix index 5c3ca95bb0..d6e8f83968 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -7,7 +7,7 @@ then throw "ocamlnet is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocamlnet-${version}"; + pname = "ocaml${ocaml.version}-ocamlnet"; version = "4.1.9"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index be21781283..7635f3a686 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -5,7 +5,7 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; + pname = "ocaml${ocaml.version}-ocp-ocamlres"; version = "0.4"; src = fetchFromGitHub { owner = "OCamlPro"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 96a66874c7..67ec458a12 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -37,7 +37,7 @@ buildDunePackage rec { ocaml_pcre xml-light ]; - configureFlags = [ "--root $(out)" "--prefix /" ]; + configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ]; dontAddPrefix = true; dontAddStaticConfigureFlags = true; @@ -47,6 +47,10 @@ buildDunePackage rec { make -C src confs ''; + postInstall = '' + make install.files + ''; + postFixup = '' rm -rf $out/var/run diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index 1a23a4d3e1..1cb348a416 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -11,7 +11,7 @@ , lacaml , menhir , menhirLib -, printbox +, printbox-text }: buildDunePackage rec { @@ -25,6 +25,11 @@ buildDunePackage rec { sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9"; }; + # Ensure compatibility with printbox ≥ 0.6 + preConfigure = '' + substituteInPlace lib/dune --replace printbox printbox-text + ''; + minimalOCamlVersion = "4.08"; checkInputs = [ alcotest bppsuite ]; @@ -37,7 +42,7 @@ buildDunePackage rec { lacaml menhirLib ppx_deriving - printbox + printbox-text ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix index 0cdde11470..8e5a8109d6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix @@ -13,8 +13,8 @@ let param = }; in stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-pprint-${param.version}"; + inherit (param) version; + pname = "ocaml${ocaml.version}-pprint"; src = fetchurl { url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix deleted file mode 100644 index 4e135c1b11..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }: - -buildDunePackage (rec { - pname = "ppxfind"; - version = "1.4"; - src = fetchurl { - url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; - sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq"; - }; - - minimumOCamlVersion = "4.03"; - useDune2 = true; - - buildInputs = [ ocaml-migrate-parsetree ]; - - # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = { - homepage = "https://github.com/diml/ppxfind"; - description = "ocamlfind ppx tool"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.vbgl ]; - }; -} // ( -if lib.versions.majorMinor ocaml.version == "4.04" then { - dontStrip = true; -} else {} -)) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix index 04361de722..b42df087a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix @@ -1,21 +1,21 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, uucp, uutf, mdx }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }: buildDunePackage rec { pname = "printbox"; - version = "0.5"; + version = "0.6"; useDune2 = true; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; - rev = version; - sha256 = "099yxpp7d9bms6dwzp9im7dv1qb801hg5rx6awpx3rpfl4cvqfn2"; + rev = "v${version}"; + sha256 = "sha256:0vqp8j1vp8h8par699nnh31hnikzh6pqn07lqyxw65axqy3sc9dp"; }; - checkInputs = [ uucp uutf mdx.bin ]; + checkInputs = [ mdx.bin ]; # mdx is not available for OCaml < 4.07 doCheck = lib.versionAtLeast ocaml.version "4.07"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix new file mode 100644 index 0000000000..cc0aa5691d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, printbox, uucp, uutf, mdx }: + +buildDunePackage { + pname = "printbox-text"; + inherit (printbox) src version useDune2 doCheck; + + propagatedBuildInputs = [ printbox uucp uutf ]; + + checkInputs = [ mdx.bin ]; + + meta = printbox.meta // { + description = "Text renderer for printbox, using unicode edges"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/process/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/process/default.nix index aecf03987a..89faf40c3b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/process/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/process/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-process-${version}"; + pname = "ocaml${ocaml.version}-process"; version = "0.2.1"; src = fetchFromGitHub { 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 d99ec7ed32..7015c6058b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.8.5"; - name = "ocaml${ocaml.version}-ptime-${version}"; + pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix index f29219e30c..9410ab21ea 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix @@ -23,7 +23,8 @@ let param = in stdenv.mkDerivation ({ - name = "ocaml${ocaml.version}-rope-${param.version}"; + pname = "ocaml${ocaml.version}-rope"; + inherit (param) version; src = fetchurl { inherit (param) url sha256; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix index 04631cc3b4..1198ca957f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-rresult-${version}"; + pname = "ocaml${ocaml.version}-rresult"; version = "0.6.0"; src = fetchurl { url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; 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 f244ad550b..1605a15bea 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix @@ -7,7 +7,7 @@ then throw "sosa is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-sosa-${version}"; + pname = "ocaml${ocaml.version}-sosa"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix index df5c1a58b1..2e62669571 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ]; + # build fails otherwise + enableParallelBuilding = false; configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index 97052115da..9e1369a856 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-topkg-${version}"; + pname = "ocaml${ocaml.version}-topkg"; inherit (param) version; src = fetchurl { 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 4befff2721..bf7fcb66fe 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix @@ -5,7 +5,7 @@ then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-wasm-${version}"; + pname = "ocaml${ocaml.version}-wasm"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix index ebc5472ce5..6a21a1e1f7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-webbrowser-${version}"; + pname = "ocaml${ocaml.version}-webbrowser"; version = "0.6.1"; src = fetchurl { url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix index 9beacd65a6..6de9685715 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix @@ -1,46 +1,60 @@ { lib, stdenv, perl, buildPerl, toPerlModule }: -{ buildInputs ? [], nativeBuildInputs ? [], ... } @ attrs: +{ buildInputs ? [] +, nativeBuildInputs ? [] +, outputs ? [ "out" "devdoc" ] +, src ? null + +, doCheck ? true +, checkTarget ? "test" + +# Prevent CPAN downloads. +, PERL_AUTOINSTALL ? "--skipdeps" + +# From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows +# authors to skip certain tests (or include certain tests) when +# the results are not being monitored by a human being." +, AUTOMATED_TESTING ? true + +# current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it +# https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC +, PERL_USE_UNSAFE_INC ? "1" + +, ... +}@attrs: assert attrs?pname -> attrs?version; assert attrs?pname -> !(attrs?name); lib.warnIf (attrs ? name) "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead" -toPerlModule(stdenv.mkDerivation ( - ( - lib.recursiveUpdate - { - outputs = [ "out" "devdoc" ]; +(let + defaultMeta = { + homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name` + platforms = perl.meta.platforms; + }; - doCheck = true; + cleanedAttrs = builtins.removeAttrs attrs [ + "meta" "builder" "version" "pname" "fullperl" + "buildInputs" "nativeBuildInputs" "buildInputs" + "PERL_AUTOINSTALL" "AUTOMATED_TESTING" "PERL_USE_UNSAFE_INC" + ]; - checkTarget = "test"; - - # Prevent CPAN downloads. - PERL_AUTOINSTALL = "--skipdeps"; - - # From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows - # authors to skip certain tests (or include certain tests) when - # the results are not being monitored by a human being." - AUTOMATED_TESTING = true; - - # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it - # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC - PERL_USE_UNSAFE_INC = "1"; - - meta.homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name` - meta.platforms = perl.meta.platforms; - } - attrs - ) - // - { + package = stdenv.mkDerivation ({ pname = "perl${perl.version}-${lib.getName attrs}"; # TODO: phase-out `attrs.name` version = lib.getVersion attrs; # TODO: phase-out `attrs.name` + builder = ./builder.sh; + buildInputs = buildInputs ++ [ perl ]; nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ]; + fullperl = buildPerl; - } -)) + + inherit outputs src doCheck checkTarget; + inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + + meta = defaultMeta // (attrs.meta or { }); + } // cleanedAttrs); + +in toPerlModule package) diff --git a/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix index 852a86a7b1..141d312683 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix @@ -13,8 +13,11 @@ buildPecl { sha256 = "sha256-Dw1+pYJmZ3U2+rgSOEkx4a6HB8FebSr7YZodOjSipjI="; }; + prePatch = '' + cd ext + ''; + buildInputs = [ libmaxminddb ]; - sourceRoot = "source/ext"; meta = with lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix index ab7e6e71fe..8f47a211e7 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pdo_sqlsrv"; - version = "5.9.0"; - sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg"; + version = "5.10.0"; + sha256 = "sha256-BEa7i/8egvz9mT69dl0dxWcVo+dURT9Dzo6f6EdlESo="; internalDeps = [ php.extensions.pdo ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix index 37ff1cb187..b70b6c3f3d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "sqlsrv"; - version = "5.9.0"; - sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; + version = "5.10.0"; + sha256 = "sha256-drPwg6Go8QNYHCG6OkbWyiV76uZyjNFYpkpGq1miJrQ="; buildInputs = [ unixODBC 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 a7a710b319..ba582dbb75 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.1.2"; - sha256 = "sha256-CD9r4RAN95zL3wSdr8OTC6s18OuA+bGawa2E+md5zPM="; + version = "3.1.3"; + sha256 = "sha256-N9CmcBlV9bNAbGwye3cCvXwhRi5lbztMziSgUlgBPU4="; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/audio/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/audio/default.nix index 34d405d6a3..5a19ef0a72 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/audio/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/audio/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }: stdenv.mkDerivation rec { - baseName = "audio"; + pname = "pure-audio"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-audio-${version}.tar.gz"; sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/avahi/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/avahi/default.nix index 7b8cc1b00a..d2f35ffca7 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/avahi/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/avahi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, avahi }: stdenv.mkDerivation rec { - baseName = "avahi"; + pname = "pure-avahi"; version = "0.3"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-avahi-${version}.tar.gz"; sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/csv/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/csv/default.nix index f51739f033..767ac0432e 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/csv/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/csv/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "csv"; + pname = "pure-csv"; version = "1.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-csv-${version}.tar.gz"; sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/doc/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/doc/default.nix index aa678cb21a..2940c58b21 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/doc/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/doc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "doc"; + pname = "pure-doc"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-doc-${version}.tar.gz"; sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix index 04ea1dde58..63b91f9a4f 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/fastcgi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, fcgi }: stdenv.mkDerivation rec { - baseName = "fastcgi"; + pname = "pure-fastcgi"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-fastcgi-${version}.tar.gz"; sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/faust/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/faust/default.nix index 4a3b12ea7f..eef81e59cb 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/faust/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/faust/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }: stdenv.mkDerivation rec { - baseName = "faust"; + pname = "pure-faust"; version = "0.11"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-faust-${version}.tar.gz"; sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/ffi/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/ffi/default.nix index 3b076a4f38..fd119b309b 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/ffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/ffi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libffi }: stdenv.mkDerivation rec { - baseName = "ffi"; + pname = "pure-ffi"; version = "0.14"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-ffi-${version}.tar.gz"; sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/gen/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/gen/default.nix index 278c782da3..9698f0659a 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/gen/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/gen/default.nix @@ -2,12 +2,11 @@ pkg-config, pure, haskellPackages }: stdenv.mkDerivation rec { - baseName = "gen"; + pname = "pure-gen"; version = "0.20"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gen-${version}.tar.gz"; sha256 = "cfadd99a378b296325937d2492347611cc1e1d9f24594f91f3c2293eca01a4a8"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/gl/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/gl/default.nix index 952d583bfd..479835d957 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/gl/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/gl/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }: stdenv.mkDerivation rec { - baseName = "gl"; + pname = "pure-gl"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gl-${version}.tar.gz"; sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/glpk/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/glpk/default.nix index 7b8c46ef47..112d1ef235 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/glpk/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/glpk/default.nix @@ -2,12 +2,11 @@ pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: stdenv.mkDerivation rec { - baseName = "glpk"; + pname = "pure-glpk"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-glpk-${version}.tar.gz"; sha256 = "5d6dc11706985dda02d96d481ea5f164c9e95ee446432fc4fc3d0db61a076346"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/gplot/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/gplot/default.nix index ddae95c43f..54fca97a9c 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/gplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/gplot/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, gnuplot }: stdenv.mkDerivation rec { - baseName = "gplot"; + pname = "pure-gplot"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gplot-${version}.tar.gz"; sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/gsl/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/gsl/default.nix index 204aeb6bb7..7ba60a9ea6 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/gsl/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pure, pkg-config, gsl }: stdenv.mkDerivation rec { - baseName = "gsl"; + pname = "pure-gsl"; version = "0.12"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-${version}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/gtk/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/gtk/default.nix index 8cc3781e82..adbd824abb 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/gtk/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }: stdenv.mkDerivation rec { - baseName = "gtk"; + pname = "pure-gtk"; version = "0.13"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gtk-${version}.tar.gz"; sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/liblo/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/liblo/default.nix index 40502bbc14..d19c7b511c 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/liblo/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/liblo/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, liblo }: stdenv.mkDerivation rec { - baseName = "liblo"; + pname = "pure-liblo"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-liblo-${version}.tar.gz"; sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/lilv/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/lilv/default.nix index 577170118b..bcadeba5ac 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/lilv/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/lilv/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }: stdenv.mkDerivation rec { - baseName = "lilv"; + pname = "pure-lilv"; version = "0.4"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lilv-${version}.tar.gz"; sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/lv2/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/lv2/default.nix index 800c396843..742db4eac4 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/lv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/lv2/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, lv2 }: stdenv.mkDerivation rec { - baseName = "lv2"; + pname = "pure-lv2"; version = "0.2"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lv2-${version}.tar.gz"; sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/midi/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/midi/default.nix index bbca0b0808..f1a463414a 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/midi/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/midi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, portmidi }: stdenv.mkDerivation rec { - baseName = "midi"; + pname = "pure-midi"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-midi-${version}.tar.gz"; sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix index 8afb74027d..3a2ef117b5 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/mpfr/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "mpfr"; + pname = "pure-mpfr"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-mpfr-${version}.tar.gz"; sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/octave/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/octave/default.nix index 591555f39c..ffb622567e 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/octave/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/octave/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, octave }: stdenv.mkDerivation rec { - baseName = "octave"; + pname = "pure-octave"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-octave-${version}.tar.gz"; sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/odbc/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/odbc/default.nix index 272c88a697..e826eae2eb 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/odbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/odbc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libiodbc }: stdenv.mkDerivation rec { - baseName = "odbc"; + pname = "pure-odbc"; version = "0.10"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-odbc-${version}.tar.gz"; sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix index bbf22e9c6f..bf9bd988dd 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/pandoc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }: stdenv.mkDerivation rec { - baseName = "pandoc"; + pname = "pure-pandoc"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-pandoc-${version}.tar.gz"; sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/rational/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/rational/default.nix index 99cefc9682..2dfed34225 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/rational/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/rational/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "rational"; + pname = "pure-rational"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-rational-${version}.tar.gz"; sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/readline/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/readline/default.nix index f3015e2753..283d75323b 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/readline/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/readline/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, readline }: stdenv.mkDerivation rec { - baseName = "readline"; + pname = "pure-readline"; version = "0.3"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-readline-${version}.tar.gz"; sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/sockets/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/sockets/default.nix index 5e1a01bc62..f50d3f3efb 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/sockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/sockets/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "sockets"; + pname = "pure-sockets"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sockets-${version}.tar.gz"; sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/sql3/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/sql3/default.nix index 009b367c69..8db3fa5808 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/sql3/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/sql3/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, sqlite }: stdenv.mkDerivation rec { - baseName = "sql3"; + pname = "pure-sql3"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sql3-${version}.tar.gz"; sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/stldict/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/stldict/default.nix index 46b711d9fa..145617bc83 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/stldict/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/stldict/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "stldict"; + pname = "pure-stldict"; version = "0.8"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stldict-${version}.tar.gz"; sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/stllib/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/stllib/default.nix index 009543ee71..dabdb73fd7 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/stllib/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/stllib/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "stllib"; + pname = "pure-stllib"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stllib-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/tk/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/tk/default.nix index 4a2c86783c..35da57f47c 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/tk/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/tk/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { - baseName = "tk"; + pname = "pure-tk"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-tk-${version}.tar.gz"; sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; diff --git a/third_party/nixpkgs/pkgs/development/pure-modules/xml/default.nix b/third_party/nixpkgs/pkgs/development/pure-modules/xml/default.nix index e9d35c4d1f..92f4b62966 100644 --- a/third_party/nixpkgs/pkgs/development/pure-modules/xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/pure-modules/xml/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }: stdenv.mkDerivation rec { - baseName = "xml"; + pname = "pure-xml"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-xml-${version}.tar.gz"; sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; 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 bb17af144c..af125e1f40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.10.0"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; + sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"; }; propagatedBuildInputs = [ docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix index 30a0e68dea..bda6c950d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81"; + sha256 = "ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea"; }; propagatedBuildInputs = [ 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 c8caf18aa1..52ecac90b1 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 @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.4"; + version = "3.19.5"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-b/uAmrFdAtmXUjaW038mKeZgWHCSIEzCZvCy/9Z3ghw="; + sha256 = "sha256-vbiMD0En11VDJUGnEc5ww0AhQ12vkbTCm/pqF7wnywI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adax-local/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adax-local/default.nix new file mode 100644 index 0000000000..315395522b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/adax-local/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, bleak +, buildPythonPackage +, fetchFromGitHub +, async-timeout +, pythonOlder +}: + +buildPythonPackage rec { + pname = "adax-local"; + version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyAdaxLocal"; + rev = version; + hash = "sha256-pzhaBRCn02asT0ZLt1EmnaX2g5wr/CoiItWJ/ZYe0Ok="; + }; + + propagatedBuildInputs = [ + aiohttp + bleak + async-timeout + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "adax_local" + ]; + + meta = with lib; { + description = "Module for local access to Adax"; + homepage = "https://github.com/Danielhiversen/pyAdaxLocal"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix index dfa576e657..134132f993 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,9 +20,18 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-f8uZF4DXbfiL1nL82shjGNpo6lXSUomRgO1YnNT/GDw="; + sha256 = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" \ + --replace '"0.0.0"' '"${version}"' + + substituteInPlace tests/test_adguardhome.py \ + --replace 0.0.0 ${version} + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -36,10 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "--cov" "" - ''; - pythonImportsCheck = [ "adguardhome" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix index 5ce9d196c4..b720a4e4cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix @@ -1,21 +1,33 @@ -{ aiohttp, buildPythonPackage, fetchPypi, lib, pythonOlder }: +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { - pname = "advantage_air"; - version = "0.2.5"; + pname = "advantage-air"; + version = "0.2.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit version pname; - sha256 = "sha256-38csg1Cvpz4dkRCwlNc8+af7aJ5xDrZO1D8cCaBlePA="; + pname = "advantage_air"; + inherit version; + hash = "sha256-n7Vl5fLEpkAEi4NrsoJlwwdaGcxnXURLdGN0etHgmOE="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; # No tests doCheck = false; - pythonImportsCheck = [ "advantage_air" ]; + + pythonImportsCheck = [ + "advantage_air" + ]; meta = with lib; { description = "API helper for Advantage Air's MyAir and e-zone API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix index abe6bad71d..66f12ffd54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations , ufoprocessor, ufonormalizer, psautohint, tqdm @@ -37,8 +37,15 @@ buildPythonPackage rec { patches = [ # Don't try to install cmake and ninja using pip ./no-pypi-build-tools.patch + # Use antlr4 runtime from nixpkgs and link it dynamically ./use-dynamic-system-antlr4-runtime.patch + + # Fix compatibility with latest fonttools. + (fetchpatch { + url = "https://github.com/adobe-type-tools/afdko/commit/120752c50a562e4f6c12ff4be1e3bd96ed664e82.patch"; + sha256 = "RDGIpNAuCmK+zqZOeOK7ddCjr9BuqPpcnbnxdtoE48M="; + }) ]; # setup.py will always (re-)execute cmake in buildPhase diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix index b37c04a917..4bc3532f5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = version; - hash = "sha256-LBK32CwiYEa+R5VhcpVzMYklPAgombxl05rM/KWRyIU="; + hash = "sha256-C4rxlkylWGsDsnMPuecrC2ELj1PvP6EelZ/kzTn4Brk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 52cc85b48f..94c47ab62a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.1.11611"; + version = "9.1.11752"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-DN4oH3Ajppj3YDDj8O+WxBS2/5qKvmrK0OTLOdhAmww="; + hash = "sha256-UbcPxYEyuX8W0uZXeCu00yBshdcPBAQKzZqhAYXTf+8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix new file mode 100644 index 0000000000..1c31dac5f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioaseko"; + version = "0.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "milanmeu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioaseko" + ]; + + meta = with lib; { + description = "Module to interact with the Aseko Pool Live API"; + homepage = "https://github.com/milanmeu/aioaseko"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 9fbbbac43e..f513ab5573 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.4.2"; + version = "2.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c2f4ef325aaa839e9e2a53346b4c1c203656783a4985ab36fd4c2a9ef2dc1d2b"; + sha256 = "5fd4d7aefa0896fe4dd32815ead8a52ed5ccb8016c7c5743fe8ff71c3c074120"; }; # relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. postPatch = '' - substituteInPlace setup.py --replace 'botocore>=1.20.106,<1.20.107' 'botocore' + sed -i "s/'botocore>=.*'/'botocore'/" setup.py ''; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; 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 14ff06324b..c88f848593 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.3.3"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "v${version}"; - sha256 = "1hjdhj1y9xhq1i36r7g2lccsicbvgm7lzkyrxygs16dw11ah46mx"; + sha256 = "sha256-OCsao4oerHGpzsoqPP3EXJVs6NZeLNsoaC83k7oX688="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 268654ea9b..4e2b0c5897 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -3,6 +3,7 @@ , dnspython , fetchFromGitHub , ifaddr +, netifaces , pyroute2 , pytest-asyncio , pytestCheckHook @@ -11,18 +12,21 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.5"; + version = "1.4.7"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QfeAEFB5WikuriBTcfFIgnJw5H4vEcGIVX47fyDb1Dk="; + sha256 = "sha256-NtiShZpPFl+elYNPLaKAg6uV8pDJv0pyR+NTUiFoMm0="; }; propagatedBuildInputs = [ dnspython + netifaces pyroute2 ifaddr ]; @@ -43,7 +47,9 @@ buildPythonPackage rec { "test_async_discover_hosts" ]; - pythonImportsCheck = ["aiodiscover"]; + pythonImportsCheck = [ + "aiodiscover" + ]; meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; 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 e0f1b1df3c..06389d5067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.8.0"; + version = "10.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "1349b2as6r3m9sxlfss8plzafn31kf3rihwa58b4f7cmc4dhb2s8"; + sha256 = "sha256-zvilMBx9H2VDmu13IiAiCqXEGkbpAJpGnt4Ea7FlGVI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index 664d523f94..08ff1c92dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "22.1.2"; + version = "22.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-n6OkyMh3HxsFY2zXqbpdvbv5NdFC+J30tW/tLEEaSeU="; + sha256 = "sha256-2M0EcDs3WmgG2tusvnXK750+ALE93RktlPyQO36+Ojw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix index 1867567178..be33becb26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + format = "flit"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "aiohttp_remotes"; inherit version; - sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174"; + sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A set of useful tools for aiohttp.web server"; + description = "Set of useful tools for aiohttp.web server"; homepage = "https://github.com/wikibusiness/aiohttp-remotes"; license = licenses.mit; maintainers = with maintainers; [ qyliss ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index 1f479311af..2b0061875b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "3.0.11"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-McC5DX3Cti9eGpPniywNY2DvbAqHSFwhek85TJN/zn0="; + sha256 = "sha256-wPqEubd+vUpdj7tM0CTPkW5kV4qlF19T+djlGrtA5h8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix index a3ec8edd6d..3e7c4c7b85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohwenergy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiohwenergy"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = version; - sha256 = "0pgk9ky4kfb1kp0mpyxdinwql1q85a3bl5w34pr88wqdqdw467ms"; + sha256 = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix index 4349bf4fcc..cae0b10ea6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix @@ -1,20 +1,26 @@ { lib - , buildPythonPackage , fetchpatch , fetchPypi , pythonAtLeast , pythonOlder + +# native +, flit-core + +# propagates , typing-extensions -, coverage + +# tests , python -, toml }: buildPythonPackage rec { pname = "aioitertools"; version = "0.8.0"; - disabled = pythonOlder "3.7"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -30,11 +36,20 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ typing-extensions ]; - checkInputs = [ coverage toml ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + pythonImportsCheck = [ + "aioitertools" + ]; checkPhase = '' - ${python.interpreter} -m coverage run -m aioitertools.tests + ${python.interpreter} -m unittest discover ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix index 0af203d8fb..2de513e6fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.0.4"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs="; + sha256 = "sha256-l3A1fOydAUQ4arR7Zl/PDYksp53C/56fVVcz35q1hjY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix index 6d1116bfef..02d7f565c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { version = "0.14.3"; format = "pyproject"; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -21,6 +20,11 @@ buildPythonPackage rec { hash = "sha256-ELdNxeU9dajWr4VeOyuvNrSi7B+ImVJM/BlZsw3tcKE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionanoleaf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionanoleaf/default.nix index 61b958d844..40686bf7d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aionanoleaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aionanoleaf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aionanoleaf"; - version = "0.1.1"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = "v${version}"; - sha256 = "10gi8fpv3xkdjaqig84723m3j0kxgxvqwqvjxmysq2sw4cjmsvz6"; + sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix new file mode 100644 index 0000000000..3e9cc46b16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiooncue/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiooncue"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = version; + hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module doesn't have tests + doCheck = false; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + pythonImportsCheck = [ + "aiooncue" + ]; + + meta = with lib; { + description = "Module to interact with the Kohler Oncue API"; + homepage = "https://github.com/bdraco/aiooncue"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioredis/default.nix index 807b112772..5ea4822789 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioredis/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "aioredis"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; + sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosenseme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosenseme/default.nix new file mode 100644 index 0000000000..ff90bed8e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosenseme/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ifaddr +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiosenseme"; + version = "0.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ShK4DP1lAtAFI6z2kf5T1ecbNTKUn2kqUjps2ABRegg="; + }; + + propagatedBuildInputs = [ + ifaddr + ]; + + pythonImportsCheck = [ + "aiosenseme" + ]; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Module to interact with SenseME fans and lights by Big Ass Fans"; + homepage = "https://github.com/bdraco/aiosenseme"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index d227f34192..f2bd2f0d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.8"; + version = "1.0.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "0l6qhgpzg082zk9134w2psnzkzf5zr0jyvrkxnhhz5lx9q5k94pc"; + hash = "sha256-XGmhLc64efQ1eIgCYN1Wkp4sPXvYXlR7/9WF5cWZyys="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix index acf106ab3c..1fd619a846 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.2.0"; + version = "1.2.0"; # re-enable tests after 1.2.0 disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -23,6 +23,8 @@ buildPythonPackage rec { frozenlist ]; + # not compatible w ith latest asyncio + doCheck = false; checkInputs = [ pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix new file mode 100644 index 0000000000..aa7edc001d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosteamist/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "aiosteamist"; + version = "0.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = version; + hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=aiosteamist" "" + ''; + + pythonImportsCheck = [ + "aiosteamist" + ]; + + # Modules doesn't have test suite + doCheck = false; + + meta = with lib; { + description = "Module to control Steamist steam systems"; + homepage = "https://github.com/bdraco/aiosteamist"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} 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 1a8bdee922..1294f8dade 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "30"; + version = "31"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "v${version}"; - sha256 = "036yx1g80rc32g9mqx4khn8iqhmwl4kfch35pjslnna9kw3kb9i8"; + sha256 = "sha256-8Hm7sUkIW4rVLCL5+vHfhAvmc8+IKDXaSLtYJTf14XY="; }; propagatedBuildInputs = [ @@ -33,6 +33,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + pythonImportsCheck = [ "aiounifi" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix new file mode 100644 index 0000000000..ab16c2d1e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, websockets +}: + +buildPythonPackage rec { + pname = "aiowebostv"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-YSrttPoU5XQ9tqNxhHBUqZqKaEZdUdYYJ2CsSREVbbg="; + }; + + propagatedBuildInputs = [ + websockets + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "aiowebostv" + ]; + + meta = with lib; { + description = "Module to interact with LG webOS based TV devices"; + homepage = "https://github.com/home-assistant-libs/aiowebostv"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix index d25cdadc89..ca6c6cca96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "aladdin-connect"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "shoejosh"; repo = pname; rev = version; - sha256 = "0nimd1nw1haxn8s2207fcrmpjyfp6nx97n560l6hzqyqqmf2d1d1"; + sha256 = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw="; }; propagatedBuildInputs = [ 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 6e686d9fc9..e4bec8fafa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -6,7 +6,7 @@ , jsonschema , numpy , pandas -, pytest +, pytestCheckHook , pythonOlder , recommonmark , six @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y"; + sha256 = "d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026"; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ipython - pytest + pytestCheckHook recommonmark sphinx vega_datasets @@ -47,11 +47,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "altair" ]; - checkPhase = '' - export LANG=en_US.UTF-8 - # histogram_responsive.py attempt network access, and cannot be disabled through pytest flags - rm altair/examples/histogram_responsive.py - pytest --doctest-modules altair + # avoid examples directory, which fetches web resources + preCheck = '' + cd altair/tests ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix index d050a7563a..697b9bba00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.3"; + version = "1.9.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "0f9l8xbn40xwx2zzssx5qmkpmv82j6syj8ncnmm6z9dc5wpr6sw7"; + sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s="; }; propagatedBuildInputs = [ 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 e49f4ba53f..c9eb73c7f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -3,37 +3,48 @@ , aiofiles , buildPythonPackage , fetchFromGitHub -, isPy3k , mock , pure-python-adb , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "androidtv"; - version = "0.0.60"; + version = "0.0.63"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM="; + hash = "sha256-Peg/agAb1lUBUBK1OkYVovE4pzM8iaQHVaSk/hr1plw="; }; - propagatedBuildInputs = [ adb-shell pure-python-adb ] - ++ lib.optionals (isPy3k) [ aiofiles ]; + propagatedBuildInputs = [ + adb-shell + aiofiles + pure-python-adb + ]; checkInputs = [ mock pytestCheckHook ]; - pythonImportsCheck = [ "androidtv" ]; + disabledTests = [ + # Requires git but fails anyway + "test_no_underscores" + ]; + + pythonImportsCheck = [ + "androidtv" + ]; meta = with lib; { - description = - "Communicate with an Android TV or Fire TV device via ADB over a network"; + description = "Communicate with an Android TV or Fire TV device via ADB over a network"; homepage = "https://github.com/JeffLIrion/python-androidtv/"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; 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 1410d6a5a3..93a4b22f5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.1.11611"; + version = "9.1.11752"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-oPRytvSOjUoBUSQOFu5B/OljqmAk/rcRBl/oU+aSZjw="; + hash = "sha256-4DUM1c3M/naJFqN/gdrX/NnJrY3ElUEOQ34cwcpSC+s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 797b320e42..21eeeb2369 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.1.11611"; + version = "9.1.11752"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-hG/Im+gYBXIs1o7cw6LDS9nb2HPYjnSd7g8bpVG6rkE="; + hash = "sha256-nZGAuWp07VMpOvqw38FGSiUhaFjJOfCzOaam4Ex7qbY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix index 0663fddd6f..96115aaee4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix @@ -1,24 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "anonip"; - version = "1.0.0"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "DigitaleGesellschaft"; repo = "Anonip"; rev = "v${version}"; - sha256 = "0y5xqivcinp6pwx4whc8ca1n2wxrvff7a2lpbz2dhivilfanmljs"; + sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; - propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "python tests.py"; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=anonip --cov-report=term-missing --no-cov-on-fail" "" + ''; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "anonip" + ]; meta = with lib; { + description = "Tool to anonymize IP addresses in log files"; homepage = "https://github.com/DigitaleGesellschaft/Anonip"; - description = "A tool to anonymize IP-addresses in log-files"; license = licenses.bsd3; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } 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 a580719fcf..6b54bd275b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "5.0.1"; - sha256 = "sha256:0xn3lpinmflkxwak7zb36wjs9w2y1k5s295apn3v77xnpc2cfz5l"; + version = "5.2.0"; + sha256 = "sha256:1jwraha3s15s692d47kgcr7jy1ngbg6ipmkb0ak7fjnb57r4im66"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.12.1"; + version = "2.12.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pFCHByYr4Ru03ZigBvGxSBeHmgVea2xGrZ/KiJT7MHM="; + sha256 = "sha256:1hz7j8gsgxbfjdf9562cbyxia3c4crdv50fm0p0wp4js79rf2ydw"; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyjson/default.nix deleted file mode 100644 index 1d0d02988f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyjson/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: - -buildPythonPackage rec { - pname = "anyjson"; - version = "0.3.3"; - - # The tests are written in a python2 syntax but anyjson is python3 valid - doCheck = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba"; - }; - - buildInputs = [ nose ]; - - meta = with lib; { - homepage = "https://bitbucket.org/runeh/anyjson/"; - description = "Wrapper that selects the best available JSON implementation"; - license = licenses.bsd2; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix index 2fe6fe08ef..4ac03a8820 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ , mkYarnPackage }: let - version = "2.1.4"; + version = "2.2.3"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "12nxjaz4afkq30s42x3rbsci8jiw2k5zjngsc8i190fasbacbnbs"; + sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq"; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. 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 44748f2fdb..2eeebaaea7 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 @@ -29,6 +29,7 @@ , pytest-xdist , pytestCheckHook , python +, pythonAtLeast , python-dateutil , pytz , pyyaml @@ -43,6 +44,7 @@ buildPythonPackage rec { pname = "apache-beam"; version = "2.35.0"; + disabled = pythonAtLeast "3.10"; src = fetchFromGitHub { owner = "apache"; @@ -57,6 +59,13 @@ buildPythonPackage rec { ./fix-cython.patch ]; + # See https://github.com/NixOS/nixpkgs/issues/156957. + postPatch = '' + substituteInPlace setup.py \ + --replace "typing-extensions>=3.7.0,<4" "typing-extensions" \ + --replace "pyarrow>=0.15.1,<7.0.0" "pyarrow" + ''; + sourceRoot = "source/sdks/python"; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix index 5e7ae3860a..241ddfaa11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "apipkg"; - version = "1.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; + sha256 = "a4be31cf8081e660d2cdea6edfb8a0f39f385866abdcfcfa45e5a0887345cb70"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 18b8292491..11990e7d39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -1,39 +1,75 @@ -{ lib, buildPythonPackage, fetchPypi, installShellFiles -, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp +{ lib +, Babel +, buildPythonPackage +, click +, cryptography +, fetchPypi +, gntp +, installShellFiles +, markdown +, mock +, paho-mqtt +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, requests_oauthlib +, six +, slixmpp }: buildPythonPackage rec { pname = "apprise"; - version = "0.9.6"; + version = "0.9.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Fe0GIIGXydKP2DzWnnJ7SCgIeaTGEa/Wta6l0N7zl/g="; + hash = "sha256-BOMeSvwmGiZvA95+e2bceCGXRwowU5+zJAl7Sn4wKqM="; }; - nativeBuildInputs = [ Babel installShellFiles ]; + nativeBuildInputs = [ + Babel + installShellFiles + ]; propagatedBuildInputs = [ - cryptography requests requests_oauthlib six click markdown pyyaml + click + cryptography + markdown + pyyaml + requests + requests_oauthlib + six ]; checkInputs = [ - pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp + gntp + mock + paho-mqtt + pytestCheckHook + slixmpp ]; - disabledTests = [ "test_apprise_cli_nux_env" ]; + disabledTests = [ + "test_apprise_cli_nux_env" + "test_plugin_mqtt_general" + ]; postInstall = '' installManPage packaging/man/apprise.1 ''; - pythonImportsCheck = [ "apprise" ]; + pythonImportsCheck = [ + "apprise" + ]; meta = with lib; { + description = "Push Notifications that work with just about every platform"; homepage = "https://github.com/caronc/apprise"; - description = "Push Notifications that work with just about every platform!"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index 35e6c90f21..7d2377938c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -1,21 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pyperclip }: +{ lib, buildPythonPackage, fetchFromGitHub +, beautifulsoup4 +, empty-files +, numpy +, pyperclip +, pytest +}: buildPythonPackage rec { - version = "0.2.6"; + version = "3.5.0"; pname = "approvaltests"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; - rev = version; - sha256 = "1k1bj8q1qm89a8xm4az6qk4qswwmgxw5jpdjcxmf93zh5hrcy9h9"; + rev = "v${version}"; + sha256 = "15blwjzd6nwh0kzxa9xxscxdn0vqwb1bax8d46wk01dcywdyd6ni"; }; - propagatedBuildInputs = [ pyperclip ]; + propagatedBuildInputs = [ + beautifulsoup4 + empty-files + numpy + pyperclip + pytest + ]; postPatch = '' substituteInPlace setup.py \ + --replace bs4 beautifulsoup4 \ --replace "pyperclip==1.5.27" "pyperclip>=1.5.27" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix new file mode 100644 index 0000000000..9fc959126b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, appdirs +, tabulate +, msgpack +, orjson +, semver +, packageurl-python +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "appthreat-vulnerability-db"; + version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "AppThreat"; + repo = "vulnerability-db"; + rev = "v${version}"; + sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI="; + }; + + propagatedBuildInputs = [ + requests + appdirs + tabulate + msgpack + orjson + semver + packageurl-python + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov vdb" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Tests require network access + "test_bulk_search" + "test_download_recent" + ]; + + pythonImportsCheck = [ + "vdb" + ]; + + meta = with lib; { + description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; + homepage = "https://github.com/appthreat/vulnerability-db"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix index 034e3e0df2..46ae3fc34e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.36.0-r1"; + version = "3.37.0-r1"; format = "setuptools"; disabled = isPyPy; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "sha256-kQqJqDikvEC0+PNhQxSNTcjQc+RwvaOSGz9VL3FCetg="; + sha256 = "0p6rlbk7p6hj5mbmk1a8phazw3ym6hf5103zkxzg4p1jgjgi0xpl"; }; buildInputs = [ 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 6d9d33e449..add8e72d8e 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.1.11611"; + version = "9.1.11752"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-yIF9a63p8QnR1FazP/J8j9W8XnYAjWD9AKZHTGc4BfQ="; + hash = "sha256-D1YssHa14q2jxn4HtOYZlTdwGPkiiMhWuOh08fj87ic="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix index f2a7f0f8f2..697b8ebbf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix @@ -2,24 +2,24 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, isPy3k +, pythonOlder , pytest , pytest-asyncio -, pytest-cov , pytestCheckHook }: buildPythonPackage rec { pname = "aresponses"; - version = "2.1.4"; + version = "2.1.5"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CircleUp"; repo = pname; rev = version; - sha256 = "sha256-crMiMZ2IDuYDFt8Bixg3NRhlUa2tqmfzd7ZeHM+2Iu4="; + sha256 = "sha256-9ZzIrj87TwxQi0YMlTHFPAp0V1oxfuL0+RMGXxUxFoE="; }; propagatedBuildInputs = [ @@ -34,19 +34,20 @@ buildPythonPackage rec { checkInputs = [ aiohttp pytest-asyncio - pytest-cov pytestCheckHook ]; - # Disable tests which requires network access disabledTests = [ + # Disable tests which requires network access "test_foo" "test_passthrough" ]; __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "aresponses" ]; + pythonImportsCheck = [ + "aresponses" + ]; meta = with lib; { description = "Asyncio testing server"; @@ -55,3 +56,4 @@ buildPythonPackage rec { maintainers = with maintainers; [ makefu ]; }; } + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index cf2f925572..0aa3e8c1b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.12.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445"; + sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20"; }; doCheck = false; # meant to be ran with interactive interpreter diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix new file mode 100644 index 0000000000..3f1f3f8666 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "argon2-cffi-bindings"; + version = "21.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + cffi + ]; + + # tarball doesn't include tests, but the upstream tests are minimal + doCheck = false; + pythonImportsCheck = [ "_argon2_cffi_bindings" ]; + + meta = with lib; { + description = "Low-level CFFI bindings for Argon2"; + homepage = "https://github.com/hynek/argon2-cffi-bindings"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix index a40fb80684..839429bc94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix @@ -9,21 +9,26 @@ , isPy3k , lib , stdenv +, argon2-cffi-bindings }: buildPythonPackage rec { pname = "argon2_cffi"; - version = "21.1.0"; + version = "21.3.0"; + format = "flit"; src = fetchPypi { pname = "argon2-cffi"; inherit version; - sha256 = "sha256-9xC2EQPRofaSyj7L0Tc+KKpeVFrGJboGf/L+yhsruHA="; + sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; - propagatedNativeBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + argon2-cffi-bindings + cffi + ]; ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix index 5aa1020191..22d545f04f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix @@ -9,11 +9,14 @@ , numpy , pandas , pytest +, cloudpickle , scipy , setuptools -, tensorflow-probability +, typing-extensions +# , tensorflow-probability (incompatible version) , xarray -#, h5py (used by disabled tests) +, zarr +, h5py #, pymc3 (broken) #, pyro-ppl (broken) #, pystan (not packaged) @@ -45,28 +48,36 @@ buildPythonPackage rec { scipy ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3" + ''; + checkInputs = [ bokeh emcee numba pytest - tensorflow-probability - #h5py (used by disabled tests) - #pymc3 (broken) - #pyro-ppl (broken) + cloudpickle + zarr + #tensorflow-probability (used by disabled tests) + h5py + #pymc3 (broken, used by disabled tests) + #pyro-ppl (broken, used by disabled tests) #pystan (not packaged) - #numpyro (not packaged) + #numpyro (not packaged, used by disabled tests) ]; # check requires pymc3 and pyro-ppl, which are currently broken, and pystan - # and numpyro, which are not yet packaged, some checks also need to make + # and numpyro, which are not yet packaged, and an incompatible (old) version + # of tensorflow-probability. some checks also need to make # directories and do not have permission to do so. So we can only check part # of the package # Additionally, there are some failures with the plots test, which revolve # around attempting to output .mp4 files through an interface that only wants # to output .html files. # The following test have been disabled as a result: data_cmdstanpy, - # data_numpyro, data_pyro, data_pystan, and plots. + # data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots. checkPhase = '' cd arviz/tests/ export HOME=$TMPDIR @@ -76,11 +87,13 @@ buildPythonPackage rec { base_tests/test_plot_utils.py \ base_tests/test_rcparams.py \ base_tests/test_stats.py \ + base_tests/test_stats_numba.py \ base_tests/test_stats_utils.py \ base_tests/test_utils.py \ + base_tests/test_utils_numba.py \ + base_tests/test_data_zarr.py \ external_tests/test_data_cmdstan.py \ - external_tests/test_data_emcee.py \ - external_tests/test_data_tfp.py + external_tests/test_data_emcee.py ''; meta = with lib; { 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 363d890016..1a9ba2dd09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.8.1"; + version = "2.8.3"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw="; + sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44"; }; nativeBuildInputs = [ setuptools-scm ]; 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 101f84b4fc..ab62a565ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.9.0"; # Check whether the version is compatible with pylint + version = "2.9.3"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6.2"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sImWiWULZ1HS3JyQHfEhc4ZRZ6anOUTqZZGNIYj2MaY="; + sha256 = "1x77faggk1dgxy48ng31xj9h6p51w312kvk5zqgvd5f19nvznxyi"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix index a3ea5cd4cf..8e5a2fda33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -3,6 +3,7 @@ , fetchPypi , findutils , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + patches = [ ./permissions.patch ]; checkInputs = [ findutils pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix index 889c69d531..78f02e2870 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix @@ -1,49 +1,55 @@ { lib , fetchPypi -, setuptools-scm , buildPythonPackage -, isPy3k +, pythonOlder + +# build time +, astropy-extension-helpers +, astropy-helpers , cython , jinja2 +, setuptools-scm + +# runtime , numpy -, pytest -, pytest-astropy -, astropy-helpers -, astropy-extension-helpers +, packaging , pyerfa +, pyyaml }: -buildPythonPackage rec { +let pname = "astropy"; - version = "4.3.1"; + version = "5.0"; +in +buildPythonPackage { + inherit pname version; format = "pyproject"; - disabled = !isPy3k; # according to setup.py + disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - sha256 = "sha256-LTlRIjtOt/No/K2Mg0DSc3TF2OO2NaY2J1rNs481zVE="; + sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927"; }; - nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ]; - propagatedBuildInputs = [ numpy pyerfa ]; - checkInputs = [ pytest pytest-astropy ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; + nativeBuildInputs = [ + astropy-extension-helpers + astropy-helpers + cython + jinja2 + setuptools-scm + ]; - # Tests must be run from the build directory. astropy/samp tests - # require a network connection, so we ignore them. For some reason - # pytest --ignore does not work, so we delete the tests instead. - checkPhase = '' - cd build/lib.* - rm -f astropy/samp/tests/* - pytest - ''; + propagatedBuildInputs = [ + numpy + packaging + pyerfa + pyyaml + ]; - # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s - # doCheck = false; + # infinite recursion with pytest-astropy (pytest-astropy-header depends on astropy itself) doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix index f7764149a6..8853b1e9e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.1"; + version = "0.4.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0xpqrl9h7sg55mql38xsfpbz9rxsm3mxfha1biqyly1gmxpmd47a"; + sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b"; }; disabled = !isPy3k; 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 3f09521e34..1c818d2724 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 @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.23.1"; - disabled = pythonOlder "3.6"; + version = "0.23.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-m8oTqGbsJ99ImtnSlL4LX1qR0bUhGtVPPWmjsZfV6sE="; + sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc="; }; propagatedBuildInputs = [ @@ -59,7 +61,9 @@ buildPythonPackage rec { "test_deferred_callback_url" ]; - pythonImportsCheck = [ "async_upnp_client" ]; + pythonImportsCheck = [ + "async_upnp_client" + ]; meta = with lib; { description = "Asyncio UPnP Client library for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix index dfbd0dbb99..fb7dec6d6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix @@ -1,25 +1,25 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }: buildPythonPackage rec { - pname = "async_generator"; + pname = "async-generator"; version = "1.10"; disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; + pname = "async_generator"; + inherit version; sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; }; + # no longer compatible with pytest-asyncio + doCheck = false; checkInputs = [ pytest pytest-asyncio ]; checkPhase = '' pytest -W error -ra -v --pyargs async_generator ''; - # disable tests on python3.5 to avoid circular dependency with pytest-asyncio - doCheck = !isPy35; - meta = with lib; { description = "Async generators and context managers for Python 3.5+"; homepage = "https://github.com/python-trio/async_generator"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async_timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async_timeout/default.nix index ae8bacc944..2a67ed1d67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async_timeout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async_timeout/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "4.0.1"; + version = "4.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uTDLFho5BC+SIvbvtzATmch+6rOUcn7FQ3kko21u71E="; + sha256 = "2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix index 324e4ec823..a01e9389f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3K9VpX6JWCgz+Lx+5ZKqXG53B/uJCtI0x4pHy2pJdZg="; + sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix index fd8a52f5a6..c0ae1cea95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.11.0"; + version = "0.12.1"; format = "setuptools"; src = fetchPypi { pname = "asyncio_mqtt"; inherit version; - sha256 = "sha256-uJown3bNA+pLJlorJcCjpMMFosX94gt/2tLAjIkuXLA="; + sha256 = "sha256-bb+FpF+U0m50ZUEWgK2jlHtQVG6YII1dUuegp+16fDg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 7ae4cb1b78..7d28810380 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -1,14 +1,21 @@ -{ lib, isPy3k, fetchPypi, buildPythonPackage -, uvloop, postgresql }: +{ lib +, fetchPypi +, buildPythonPackage +, uvloop +, postgresql +, pythonOlder +}: buildPythonPackage rec { pname = "asyncpg"; version = "0.25.0"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540"; + hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA="; }; checkInputs = [ @@ -16,15 +23,17 @@ buildPythonPackage rec { postgresql ]; - pythonImportsCheck = [ "asyncpg" ]; + pythonImportsCheck = [ + "asyncpg" + ]; meta = with lib; { + description = "Asyncio PosgtreSQL driver"; homepage = "https://github.com/MagicStack/asyncpg"; - description = "An asyncio PosgtreSQL driver"; longDescription = '' Asyncpg is a database interface library designed specifically for PostgreSQL and Python/asyncio. asyncpg is an efficient, clean - implementation of PostgreSQL server binary protocol for use with Python’s + implementation of PostgreSQL server binary protocol for use with Python's asyncio framework. ''; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index 7cdfbb66b2..2db70c162d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -1,31 +1,32 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, cryptography , bcrypt -, gssapi +, buildPythonPackage +, cryptography +, fetchPypi , fido2 +, gssapi , libnacl , libsodium , nettle -, python-pkcs11 -, pyopenssl -, openssl , openssh +, openssl +, pyopenssl , pytestCheckHook +, python-pkcs11 +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "asyncssh"; - version = "2.8.1"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a"; + sha256 = "sha256-PMM32AZhlGVFW/GH6KkeP1dUI3GBhOI4+a6MQcTzOvE="; }; propagatedBuildInputs = [ @@ -36,8 +37,9 @@ buildPythonPackage rec { libnacl libsodium nettle - python-pkcs11 pyopenssl + python-pkcs11 + typing-extensions ]; checkInputs = [ @@ -66,6 +68,8 @@ buildPythonPackage rec { "TestSKAuthCTAP2" # Requires network access "test_connect_timeout_exceeded" + # Fails in the sandbox + "test_forward_remote" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix index 031c696f02..ee261946a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.2"; + version = "3.10.3"; disabled = pythonOlder "3.7"; format = "flit"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vjOhfEsAldTjROFUer1SgEX1KxnNM/WwtLsCB9ZV1WM="; + sha256 = "sha256-Q547XKsn4/U7XbDhZADF4qPpFxAGPmv9bAXSQZnNUIo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix index 16e71a62ff..4ad7130678 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix @@ -1,20 +1,32 @@ { lib +, asn1crypto , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "asysocks"; - version = "0.1.2"; + version = "0.1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1hi9hzih265qlh7x32r5pbaqm9wkhm52yrdiksnd4gl5nrdgwcwv"; + sha256 = "sha256-I9X8+ucadYJsPteHvZsbw7GJ7DdliWG86DyemUVeNUw="; }; + propagatedBuildInputs = [ + asn1crypto + ]; + # Upstream hasn't release the tests yet doCheck = false; - pythonImportsCheck = [ "asysocks" ]; + + pythonImportsCheck = [ + "asysocks" + ]; meta = with lib; { description = "Python Socks4/5 client and server library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index 4186ad210c..399926c5e0 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -7,29 +7,43 @@ , requests_oauthlib , six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.18.1"; + version = "3.19.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "atlassian-api"; repo = pname; rev = version; - sha256 = "09xvkbdfhkrdkn8axb6bhi7p12lm2z1z84rx1wksfw9mffqk90v9"; + sha256 = "sha256-SJsqk8TM+5UztN1ZDyYrOjNIWDLhm5XtLxPflIGPxKQ="; }; + propagatedBuildInputs = [ + deprecated + oauthlib + requests + requests_oauthlib + six + ]; + checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ]; + pythonImportsCheck = [ + "atlassian" + ]; meta = with lib; { description = "Python Atlassian REST API Wrapper"; homepage = "https://github.com/atlassian-api/atlassian-python-api"; license = licenses.asl20; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix index 8bf8155677..16f0f0ddff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix @@ -3,22 +3,27 @@ , fetchPypi , pytestCheckHook , pythonOlder +, pdm-pep517 , sybil , typing-extensions }: buildPythonPackage rec { pname = "atpublic"; - version = "2.3"; - format = "setuptools"; + version = "3.0.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d6b9167fc3e09a2de2d2adcfc9a1b48d84eab70753c97de3800362e1703e3367"; + sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf"; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -29,8 +34,7 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=public" "" + sed -i '/cov=public/d' pyproject.toml ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix new file mode 100644 index 0000000000..17abcf0e9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, future +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aurorapy"; + version = "0.2.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "energievalsabbia"; + repo = pname; + rev = version; + hash = "sha256-DMlzzLe94dbeHjESmLc045v7vQ//IEsngAv7TeVznHE="; + }; + + propagatedBuildInputs = [ + future + pyserial + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aurorapy" + ]; + + meta = with lib; { + description = "Implementation of the communication protocol for Power-One Aurora inverters"; + homepage = "https://gitlab.com/energievalsabbia/aurorapy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} 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 f99407030c..84a3aec05b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.11.0"; + version = "22.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-qxN5AdLlzadG0/raeAyJ/37PLgYLndl1JQSVkgdLv/4="; + sha256 = "sha256-eoY920c8mgunvZd0M/vR7+bMCPFqqCm3F/fq0vo6K/0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 4ca5df1710..ca01e35a3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -1,7 +1,6 @@ { lib , boto3 , buildPythonPackage -, enum34 , fetchFromGitHub , jsonschema , mock @@ -15,6 +14,9 @@ buildPythonPackage rec { pname = "aws-sam-translator"; version = "1.42.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aws"; @@ -27,11 +29,11 @@ buildPythonPackage rec { boto3 jsonschema six - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; postPatch = '' + substituteInPlace requirements/base.txt \ + --replace "jsonschema~=3.2" "jsonschema>=3.2" substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" ''; @@ -43,7 +45,14 @@ buildPythonPackage rec { pyyaml ]; - pythonImportsCheck = [ "samtranslator" ]; + disabledTests = [ + # AssertionError: Expected 7 errors, found 9: + "test_errors_13_error_definitionuri" + ]; + + pythonImportsCheck = [ + "samtranslator" + ]; meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index a8cc3a34f9..edbc289114 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.0"; + version = "0.13.2"; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f8c46335bdf94a5e48d3df2018edbd07c4c903635501c62c1bea4153f407531a"; + sha256 = "sha256-2lkx6fDbPAasiT6G/uSudNt+kRU+xJNNo8oTaLde2rQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix index 9202919ae6..9a39aa70c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73"; + sha256 = "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes="; }; propagatedBuildInputs = [ 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 c9de9f9f47..8e7d1b2030 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 @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "24.0.1"; + version = "25.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "283195339ef6ba1181dbc866ebede8b06ffdfe09eb86c25a04e1c8059d654f6e"; + sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 029a102518..ea5fbd1c10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + sha256 = "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 39f09b2824..dfd8581af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; + sha256 = "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; }; propagatedBuildInputs = [ 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 c3d29d9324..30ca58fed3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; - rev = "v${version}rel"; - sha256 = "13lw1iwa8hadpvqdgb06nh881l8c17awzvvwbfwblvb9q9s0lnzp"; + rev = "v${version}"; + sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3"; }; propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix index 3d3c85eea3..a4430b655c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.11.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "0r8h979rklq7cvl0b449mfrx62dv367s31zgwfqn81kj72i3ndg4"; + sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; 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 9372248fed..743c749a1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.5"; + version = "2.3.6"; src = fetchPypi { inherit pname version; - sha256 = "60285184cb02fdba5e1cc8605ac84e150a50f940e9383ab43564e5258d1f47bb"; + sha256 = "sha256-O/21ne0VyWHm49W38WcVXNoFO+JHXqgBdGHfC02CC30="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index 431edac75d..2190b34410 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.14.0"; + version = "0.14.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b449cc63f769c2d219c67e23ffb9f3a5b5f23eb2d68d05878743dbed83a14360"; + sha256 = "9794685d25f8f71d48fef04e2ca8ce8cc243b070f5b08ed70e70ae98341d24bb"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix index f428dc788b..b56ebbf50a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark, setuptools-scm }: buildPythonPackage rec { pname = "boost-histogram"; @@ -11,7 +11,10 @@ buildPythonPackage rec { sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; }; + nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ boost ]; + propagatedBuildInputs = [ numpy ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; @@ -20,7 +23,6 @@ buildPythonPackage rec { description = "Python bindings for the C++14 Boost::Histogram library"; homepage = "https://github.com/scikit-hep/boost-histogram"; license = licenses.bsd3; - platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix index 27610d7cd9..29a5dd569a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.28"; + version = "0.2.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-CnfJiYUM8A4QZ6VMtekO8nD5tQ2VL9vMeK6OWYcgwmU="; + sha256 = "sha256-x+TXHG7xJWd5t6pKQ/6X48lOuIQWUnEwsySFRh5GJnE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index af358a61f1..c6fdc8c998 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.20.21"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "2fb05cbe81b9ce11d9394fc6c4ffa5fd1cceb114dc1d2887dc61081707e44522"; + sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 43fad71245..6d5c11665c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.23.21"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "d7f8e82cba38aa1e66015cab0a5ca3204503e90afc4695e97228e28329a14c04"; + sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index 7770996f42..9d1324053b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,24 +1,44 @@ -{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, sphinx +}: buildPythonPackage rec { - version = "4.31.0"; pname = "breathe"; - disabled = isPy27; + version = "4.32.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "michaeljones"; + repo = pname; + rev = "v${version}"; + hash = "sha256-U85iLVS6bmA2Ty0AC4z2qODy9u4rWg6Nb42/k2Ix+kk="; }; - propagatedBuildInputs = [ docutils six sphinx ]; + propagatedBuildInputs = [ + docutils + sphinx + ]; - doCheck = !isPy3k; + checkInputs = [ + pytestCheckHook + ]; - meta = { - homepage = "https://github.com/michaeljones/breathe"; - license = lib.licenses.bsd3; + pythonImportsCheck = [ + "breathe" + ]; + + meta = with lib; { description = "Sphinx Doxygen renderer"; + homepage = "https://github.com/michaeljones/breathe"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; inherit (sphinx.meta) platforms; }; } - 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 0556c5b4e2..d4cff163a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1rdp9rx197q467ixp53g4cgc3jbsdaxr62pz0a8ayv2lvm944azh"; + sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; # for some reason, the test data isn't captured in releases, force a git checkout - deepClone = true; + forceFetchGit = true; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix index 0838558e11..ed6f03fa5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.3.0"; + version = "0.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; rev = version; - sha256 = "sha256-ssyHNlrSrG8YHRS131jJtmgl6eMTNdet1Hf0nTxL8sM="; + sha256 = "0sry5kn52hc742400xff99zpij0dxlvbd5m8il7k9ihpywrfvzd5"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix index 1bff572b60..f38eb328e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "cachetools"; - version = "4.2.4"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tkem"; repo = pname; rev = "v${version}"; - sha256 = "sha256-doPLl7Ooc2cKlTiS/dqLTKSkTlSgPFztIumAzciM0bc="; + hash = "sha256-urTkls1S83m7Eo7chPaQc5gxz0omZBToNYa8upQEiOo="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/carrot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/carrot/default.nix deleted file mode 100644 index a772535ad8..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/carrot/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, nose, amqplib, anyjson }: - -buildPythonPackage rec { - pname = "carrot"; - version = "0.10.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0s14rs2fgp1s2qa0avn8gj33lwc3k1hd4y9a2h6mhg487i7kfinb"; - }; - - buildInputs = [ nose ]; - propagatedBuildInputs = [ amqplib anyjson ]; - - doCheck = false; # depends on the network - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/carrot"; - description = "AMQP Messaging Framework for Python"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index d55c1e9b0c..d233cf0316 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, lib, fetchPypi , pytestCheckHook, filelock, mock, pep8 -, cython +, cython, setuptools-scm , six, pyshp, shapely, geos, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , proj, flufl_lock @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.20.1"; + version = "0.20.2"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "91f87b130e2574547a20cd634498df97d797abd12dcfd0235bc0cdbcec8b05e3"; + sha256 = "4d08c198ecaa50a6a6b109d0f14c070e813defc046a83ac5d7ab494f85599e35"; }; postPatch = '' @@ -23,6 +23,13 @@ buildPythonPackage rec { --replace "test_epsg(" "dont_test_epsg(" ''; + nativeBuildInputs = [ + cython + geos # for geos-config + proj + setuptools-scm + ]; + buildInputs = [ geos proj ]; @@ -48,12 +55,6 @@ buildPythonPackage rec { "test_gridliner_labels_bbox_style" ]; - nativeBuildInputs = [ - cython - geos # for geos-config - proj - ]; - meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; license = licenses.lgpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix index 53ee89c5f9..beb6dc3514 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix @@ -4,6 +4,7 @@ , astropy , dask , numpy +, setuptools-scm }: buildPythonPackage rec { @@ -16,6 +17,8 @@ buildPythonPackage rec { sha256 = "16rypj65wdfxxrilxfhbk563lxv86if4vvs9zfq3f8bkzdr8xl9s"; }; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ astropy dask numpy ]; # Tests require a large (800 Mb) dataset @@ -25,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Dask-based reader for CASA data"; - homepage = "http://radio-astro-tools.github.io"; + homepage = "https://casa-formats-io.readthedocs.io/"; license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ smaret ]; }; 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 815bc8ae36..12ea06a5c4 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.15.2"; + version = "1.15.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0mrk6b16f4ds666qa4884kjjbmb55kpfvvqsznfmyg9iii6dir50"; + sha256 = "0vczml14dvvrj401r08d6b0rfn5p5kfm1wr0vrfi8rqk2z5x1w0g"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix index 45379910a6..e3d694d28e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix @@ -11,23 +11,22 @@ , pythonOlder , pyyaml , tomlkit +, typing-extensions , ujson }: buildPythonPackage rec { pname = "cattrs"; - version = "1.8.0"; + version = "1.10.0"; format = "pyproject"; - # https://cattrs.readthedocs.io/en/latest/history.html#id33: - # "Python 2, 3.5 and 3.6 support removal. If you need it, use a version below 1.1.0." disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Tinche"; + owner = "python-attrs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CKAsvRKS8kmLcyPA753mh6d3S04ObzO7xLPpmlmxrxI="; + hash = "sha256-VbfQMMDO03eeUHAACxoX6a3DKmzoF9EfLuTpvaY6bWs="; }; nativeBuildInputs = [ @@ -36,6 +35,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions ]; checkInputs = [ @@ -50,10 +51,10 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" substituteInPlace pyproject.toml \ - --replace 'orjson = "^3.5.2"' "" + --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" \ + --replace 'orjson = "^3.5.2"' "" \ + --replace "[tool.poetry.group.dev.dependencies]" "[tool.poetry.dev-dependencies]" substituteInPlace tests/test_preconf.py \ --replace "from orjson import dumps as orjson_dumps" "" \ --replace "from orjson import loads as orjson_loads" "" @@ -76,11 +77,13 @@ buildPythonPackage rec { "test_orjson" ]; - pythonImportsCheck = [ "cattr" ]; + pythonImportsCheck = [ + "cattr" + ]; meta = with lib; { description = "Python custom class converters for attrs"; - homepage = "https://github.com/Tinche/cattrs"; + homepage = "https://github.com/python-attrs/cattrs"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix index b93ea9c3bd..e1c27d9e4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix @@ -14,9 +14,27 @@ buildPythonPackage rec { sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf"; }; + pythonImportsCheck = [ + "cchardet" + ]; + checkInputs = [ nose ]; + + preCheck = '' + cp -R src/tests $TMPDIR + pushd $TMPDIR + ''; + checkPhase = '' - ${python.interpreter} setup.py nosetests + runHook preCheck + + nosetests + + runHook postCheck + ''; + + postCheck = '' + popd ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix index 9dd8a27239..ec11019cc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "0.1.5"; + version = "0.1.6"; pname = "cdcs"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = "pycdcs"; rev = "v${version}"; - sha256 = "0sd0s0mka2bvpxxiz98cjc2h5ncsb7d03af1q3w9w8pmvfsgj7pc"; + sha256 = "sha256-w9CBNOK9oXTIUa+SsnepRN0wAz7WPZGfUNDSbtVn1L8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix index 8bf70f95c0..4a00155a4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.1"; + version = "2.1.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-S3sxYCGMg/O5ICr9z4NqjmpPCF7e5F8G2q2EX4bRN+8="; + sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix new file mode 100644 index 0000000000..0c7e6849b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fonttools +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "cffsubr"; + version = "0.2.9.post1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "azFBLc9JyPqEZkvahn4u3cVbb+b6aW/yU8TxOp/y/Fw="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "cffsubr" ]; + + meta = with lib; { + description = "Standalone CFF subroutinizer based on AFDKO tx"; + homepage = "https://github.com/adobe-type-tools/cffsubr"; + license = licenses.asl20; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix index bf3eab19d4..105775a454 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix @@ -1,25 +1,25 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib - -# pythonPackages +{ lib +, buildPythonPackage , click -, pytest -, pytest-cov -, pytest-runner +, fetchFromGitHub +, pytestCheckHook +, pythonOlder , pyyaml , six }: buildPythonPackage rec { pname = "cfn-flip"; - version = "1.2.2"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-cfn-template-flip"; rev = version; - sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm"; + hash = "sha256-1cV0mHc6+P0CbnLIMSSwNEzDB+1QzNjioH/EoIo40xU="; }; propagatedBuildInputs = [ @@ -29,27 +29,27 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest - pytest-cov - pytest-runner + pytestCheckHook ]; - checkPhase = '' - py.test \ - --cov=cfn_clean \ - --cov=cfn_flip \ - --cov=cfn_tools \ - --cov-report term-missing \ - --cov-report html + postPatch = '' + sed -i "/--cov/d" tox.ini ''; + disabledTests = [ + # TypeError: load() missing 1 required positional argument: 'Loader' + "test_flip_to_yaml_with_longhand_functions" + "test_yaml_no_ordered_dict" + ]; + + pythonImportsCheck = [ + "cfn_flip" + ]; + meta = with lib; { description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = licenses.asl20; - maintainers = with maintainers; [ - kamadorueda - psyanticy - ]; + maintainers = with maintainers; [ kamadorueda psyanticy ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index 94a4ea5e10..354f90f12b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -3,16 +3,12 @@ , fetchFromGitHub , pythonOlder , aws-sam-translator -, importlib-metadata -, importlib-resources , jschema-to-python , jsonpatch , jsonschema , junit-xml , networkx -, pathlib2 , pyyaml -, requests , sarif-om , setuptools , six @@ -23,18 +19,18 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.56.3"; + version = "0.56.4"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "12r0zxwidf4vdbbpzlhlmgc2as5bn45yf663f00iv6px0glq02zs"; + sha256 = "0li8zkdvmgfxqzqs1rvd48mwim0bhjwmxlywqxjix0a43kvkvh77"; }; postPatch = '' substituteInPlace setup.py \ - --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' + --replace "jsonschema~=3.0" "jsonschema>=3.0" ''; propagatedBuildInputs = [ @@ -44,13 +40,10 @@ buildPythonPackage rec { jsonschema junit-xml networkx - pathlib2 pyyaml - requests sarif-om - setuptools six - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; + ]; checkInputs = [ mock 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 07259d5e59..762846ab34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.2"; + version = "1.26.4"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-zF7wmrJTMX0Cr3wpJECUqhH58G2SLiVoC4Z2XbblQdQ="; + sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU="; }; propagatedBuildInputs = [ 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 6e9256ffac..436669d920 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -1,16 +1,16 @@ { lib , stdenv -, fetchPypi , buildPythonPackage -, isPy3k +, fetchPypi , jaraco_functools , jaraco_text , more-itertools , portend , pyopenssl -, pytestCheckHook -, pytest-cov +, pypytools , pytest-mock +, pytestCheckHook +, pythonOlder , requests , requests-toolbelt , requests-unixsocket @@ -22,21 +22,22 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.5.2"; + version = "8.6.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567"; + hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU="; }; - nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive + ]; propagatedBuildInputs = [ - # install_requires jaraco_functools - more-itertools six ]; @@ -45,9 +46,9 @@ buildPythonPackage rec { jaraco_text portend pyopenssl - pytestCheckHook - pytest-cov + pypytools pytest-mock + pytestCheckHook requests requests-toolbelt requests-unixsocket @@ -79,6 +80,10 @@ buildPythonPackage rec { "cheroot/test/test_wsgi.py" ]; + pythonImportsCheck = [ + "cheroot" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -86,5 +91,6 @@ buildPythonPackage rec { description = "High-performance, pure-Python HTTP"; homepage = "https://github.com/cherrypy/cheroot"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix index f4047c26f5..6024c8a5ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.8"; + version = "1.0.9"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "64529b7f03e9ec0c1b9be7c7c1f30d4498e5d931ff2dbb10a9cc4597029d69f0"; + sha256 = "sha256-emEHIR74RiIDK04etO/6G7tjzTufOVl4rLRWbEsQit0="; }; patches = [ 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 9b4bc575ca..1525c5ac90 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.4"; + version = "1.0.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i6ylxtw1dMtylS4m0mz6rATU1trbMpcmsB2WhD++CeM="; + hash = "sha256-2pC6sFRwgAwIEanZXe99848XMxK/lyLGxiA+UA+q3H0="; }; 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 a019dd6519..c939022a29 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 @@ -1,27 +1,38 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , google-api-core , grpcio +, pythonOlder }: buildPythonPackage rec { pname = "chirpstack-api"; - version = "3.9.4"; + version = "3.12.4"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "08djidy3fyhghyzvndcjas3hb1s9d7719gvmgbl8bzxjm4h2c433"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "brocaar"; + repo = pname; + rev = "v${version}"; + hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU="; }; + sourceRoot = "source/python/src"; + propagatedBuildInputs = [ google-api-core grpcio ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "chirpstack_api" ]; + + pythonImportsCheck = [ + "chirpstack_api" + ]; meta = with lib; { description = "ChirpStack gRPC API message and service wrappers for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/circuit-webhook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/circuit-webhook/default.nix new file mode 100644 index 0000000000..895c680314 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/circuit-webhook/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "circuit-webhook"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-NhePKBfzdkw7iVHmVrOxf8ZcQrb1Sq2xMIfu4P9+Ppw="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "circuit_webhook" + ]; + + meta = with lib; { + description = "Module for Unify Circuit API webhooks"; + homepage = "https://github.com/braam/unify/tree/master/circuit-webhook-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} 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 479063d306..10f5762f0c 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.1.11611"; + version = "9.1.11752"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i2JrV9FEQyAzjdQUJb/b9MnET5h4ISTkcwc3n9poqtI="; + sha256 = "sha256-Z50oKwS0MZVBEUeXfj9cgtPYXFAYf4i7QkgJiXdWrxo="; }; propagatedBuildInputs = [ 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 b6bfc86e24..e1b1b3b0bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.1.11611"; + version = "9.1.11752"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-0yuPY90YEgQvtcmQDPqCpBmKf4ZryJocwMr0O1upiS4="; + hash = "sha256-pnbFnv/te7U2jB6gNRvE9DQssBkFsara1g6Gtqf+WVo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-completion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-completion/default.nix index 19fdac3761..dcfcab597b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-completion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-completion/default.nix @@ -1,18 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, - click, jinja2, shellingham, six +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 + +# propagates +, click +, jinja2 +, shellingham +, six }: buildPythonPackage rec { pname = "click-completion"; version = "0.5.2"; - disabled = (!isPy3k); + disabled = isPy27; src = fetchPypi { inherit pname version; sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86"; }; - propagatedBuildInputs = [ click jinja2 shellingham six ]; + propagatedBuildInputs = [ + click + jinja2 + shellingham + six + ]; + + pythonImportsCheck = [ + "click_completion" + ]; + + # has no tests + doCheck = false; meta = with lib; { description = "Add or enhance bash, fish, zsh and powershell completion in Click"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix index 0d87aa890d..62e0ed2d3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix @@ -4,15 +4,19 @@ , click , six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "click-configfile"; version = "0.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE="; + hash = "sha256-lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE="; }; propagatedBuildInputs = [ @@ -24,6 +28,15 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "install_requires=install_requires," 'install_requires=["click >= 6.6", "six >= 1.10"],' + ''; + + pythonImportsCheck = [ + "click_configfile" + ]; + disabledTests = [ "test_configfile__with_unbound_section" "test_matches_section__with_bad_arg" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix index 68d69023e2..4806f965f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "clickhouse-cli"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fDvUdL6LzgCv6LDmB0R0M7v6BbnbL68p9pHMebP58h8="; + sha256 = "sha256-pa3vkIyNblS1LOwBReTqg8JAR2Ii32a2QIHWjau0uZE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix index ce229665c6..0eebbb449e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix @@ -3,11 +3,14 @@ , fetchPypi , autopage , cmd2 +, installShellFiles +, openstackdocstheme , pbr , prettytable , pyparsing , pyyaml , stevedore +, sphinx , callPackage }: @@ -26,6 +29,12 @@ buildPythonPackage rec { rm test-requirements.txt ''; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + ]; + propagatedBuildInputs = [ autopage cmd2 @@ -36,6 +45,11 @@ buildPythonPackage rec { stevedore ]; + postInstall = '' + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/cliff.1 + ''; + # check in passthru.tests.pytest to escape infinite recursion with stestr doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix index 66e2d5f52f..45733c4ae7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix @@ -22,12 +22,18 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + propagatedBuildInputs = [ pillow blessings args ]; + + # nose-progressive and clint are not actively maintained + # no longer compatible as behavior demand 2to3, which was removed + # in setuptools>=58 + doCheck = false; + checkInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; checkPhase = '' ${python.interpreter} test_clint.py ''; - buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; - propagatedBuildInputs = [ pillow blessings args ]; + pythonImportsCheck = [ "clint" ]; meta = with lib; { homepage = "https://github.com/kennethreitz/clint"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix index f525b6e7f1..0e0debe932 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "1.6.0"; + version = "2.0.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32"; + sha256 = "5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4"; }; buildInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix index 13720f9d88..20d822d8ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.10"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk="; + hash = "sha256-HdZHRK/Q544z9ySbjNIjqiXzel0UTsnb9tuXawbkwZg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix index 7cf357cc4c..d24d3bc798 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.6.1"; + version = "1.6.2"; # - we need to use the tarball from PyPi # or the full git checkout (with .git) @@ -20,7 +20,7 @@ buildPythonPackage rec { # because it does not include required metadata src = fetchPypi { inherit pname version; - sha256 = "b644a15ea1e62c55041176468976541cba30a8a5e99a5e9a2c07ee595c2b4e95"; + sha256 = "sha256-SY+1727DbWMg6CnmHw8k/VP0dwBRYszn+YyyvZXgvUs="; }; nativeBuildInputs = [ setuptools-scm ]; 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 2aefb51d48..c1d3b8916d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, six, lark, pytestCheckHook }: buildPythonPackage rec { pname = "commentjson"; @@ -13,13 +13,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "lark-parser>=0.7.1,<0.8.0" "lark-parser" + --replace "lark-parser>=0.7.1,<0.8.0" "lark" # NixOS is missing test.test_json module rm -r commentjson/tests/test_json ''; - propagatedBuildInputs = [ lark-parser six ]; + propagatedBuildInputs = [ lark six ]; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix new file mode 100644 index 0000000000..9427739025 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, fonttools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "compreffor"; + version = "0.5.1.post1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "Zqia+yP4Dp5VNGeMwv+j04aNm9oVmZ2juehbfEzDfOQ="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Tests cannot seem to open the cpython module. + doCheck = false; + + pythonImportsCheck = [ + "compreffor" + ]; + + meta = with lib; { + description = "CFF table subroutinizer for FontTools"; + homepage = "https://github.com/googlefonts/compreffor"; + license = licenses.asl20; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix index 1bb036b97d..7c1594e9e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = version; - sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; + rev = "v${version}"; + sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix index 9f67aacf2d..2cd66636b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pyparsing +, six +, urwid +}: buildPythonPackage rec { pname = "configshell"; @@ -11,11 +17,28 @@ buildPythonPackage rec { sha256 = "0mjj3c9335sph8rhwww7j4zvhyk896fbmx887vibm89w3jpvjjr9"; }; - propagatedBuildInputs = [ pyparsing six urwid ]; + propagatedBuildInputs = [ + pyparsing + six + urwid + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pyparsing >=2.0.2,<3.0" "pyparsing >=2.0.2" + ''; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "configshell" + ]; meta = with lib; { - description = "A Python library for building configuration shells"; + description = "Python library for building configuration shells"; homepage = "https://github.com/open-iscsi/configshell-fb"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix index 2b350be004..e28621f26a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix @@ -1,24 +1,24 @@ -{ buildPythonPackage -, enum34 +{ lib +, buildPythonPackage , fetchFromGitHub , flit-core -, isPy27 -, lib -, pathlib , pyyaml , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "confuse"; - version = "1.5.0"; + version = "1.7.0"; format = "flit"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "beetbox"; repo = pname; rev = "v${version}"; - sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; + sha256 = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8="; }; nativeBuildInputs = [ @@ -27,16 +27,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml - ] ++ lib.optionals isPy27 [ - enum34 - pathlib - ] ; + ]; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "confuse" ]; + pythonImportsCheck = [ + "confuse" + ]; meta = with lib; { description = "Python configuration library for Python that uses YAML"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix index bfe4fc2214..465bee6664 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.10.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zalando"; repo = pname; rev = version; - sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8="; + sha256 = "sha256-m/r09VNp/AMssOJH9RKMhPcObGHl9uIAoS1PwrjpKaE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix index f93d32d392..f1930b88fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -2,15 +2,18 @@ , buildPythonPackage , fetchPypi , mock +, pythonOlder }: buildPythonPackage rec { pname = "coverage"; - version = "5.5"; + version = "6.2"; + # uses f strings + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; + sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"; }; # No tests in archive 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 d73ee597ad..ed8f127ff2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -4,22 +4,21 @@ , python-dateutil , pytestCheckHook , pytz -, natsort , tzlocal }: buildPythonPackage rec { pname = "croniter"; - version = "1.1.0"; + version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "4023e4d18ced979332369964351e8f4f608c1f7c763e146b1d740002c4245247"; + hash = "sha256-CUQi9q657WRnFDk1A/o4iv5PhG4RDhmX/qV5TiCFwtc="; }; propagatedBuildInputs = [ python-dateutil - natsort ]; checkInputs = [ @@ -28,12 +27,14 @@ buildPythonPackage rec { tzlocal ]; - pythonImportsCheck = [ "croniter" ]; + pythonImportsCheck = [ + "croniter" + ]; meta = with lib; { - description = "croniter provides iteration for datetime object with cron like format"; + description = "Library to iterate over datetime object with cron like format"; homepage = "https://github.com/kiorky/croniter"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix index 67342d9ecc..7ae79f4ec5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , attrs , isodate , python-dateutil , rfc3986 , uritemplate -, mock , pytestCheckHook , pytest-mock }: @@ -15,6 +15,8 @@ buildPythonPackage rec { pname = "csvw"; version = "1.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -24,10 +26,6 @@ buildPythonPackage rec { sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; }; - patchPhase = '' - substituteInPlace setup.cfg --replace "--cov" "" - ''; - propagatedBuildInputs = [ attrs isodate @@ -37,15 +35,28 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook pytest-mock ]; + patchPhase = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + disabledTests = [ # this test is flaky on darwin because it depends on the resolution of filesystem mtimes # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257 "test_write_file_exists" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/cldf/csvw/issues/58 + "test_roundtrip_escapechar" + "test_escapequote_escapecharquotechar_final" + "test_doubleQuote" + ]; + + pythonImportsCheck = [ + "csvw" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix index ede96fc3b4..c3778415e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.4"; + version = "0.1.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8"; + sha256 = "1b31da599c9f0cf41f39ed10c1ceaa01d6024e31c6cd9aea2885b1f2a6d15fba"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index 3fd9d2a41d..5fcdd02aa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -10,17 +10,21 @@ , pytest-mock , mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "dash"; - version = "2.0.0"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0RvA5qkwQJGyy81D5kW+IR6LbaD/KBwMy6kYxTETubg="; + sha256 = "sha256-qEHB90xzettkX/9ojCQ8AZYnTJaL+8n87SmlBOBSDWQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index 39d01559d4..0358083c3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.10.0"; + version = "2022.01.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,19 +32,10 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "07ysrs46x5w8rc2df0j06rsw58ahcysd6lwjk5riqpjlpwdfmg7p"; + sha256 = "sha256-HlVvnhEDzefzv9xchlXl9d4KCumoAqoYUWmIiCXLJyM= +"; }; - patches = [ - # remove with next bump - (fetchpatch { - name = "fix-tests-against-distributed-2021.10.0.patch"; - url = "https://github.com/dask/dask/commit/cd65507841448ad49001cf27564102e2fb964d0a.patch"; - includes = [ "dask/tests/test_distributed.py" ]; - sha256 = "1i4i4k1lzxcydq9l80jyifq21ny0j3i47rviq07ai488pvx1r2al"; - }) - ]; - propagatedBuildInputs = [ cloudpickle fsspec @@ -82,7 +73,7 @@ buildPythonPackage rec { pytestFlagsArray = [ # parallelize - "--numprocesses auto" + "--numprocesses $NIX_BUILD_CORES" # rerun failed tests up to three times "--reruns 3" # don't run tests that require network access 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 2facff6c84..e85bdd7868 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.3"; + version = "0.5.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; + hash = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix index bb8bda9228..25fd928710 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.16.2"; + version = "0.16.4"; src = fetchPypi { inherit pname version; - sha256 = "3e9a65a19a589b795ebbd9b3b16a8e470d612d57d6216ae44a9c7a735e4080e6"; + sha256 = "sha256-GBiQaBg7YY31bJft0W8Iq7WXhX98wPgPFHdNwuZ7WQY="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 19c64fb5c9..9b001f743a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.7"; + version = "9.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2d4712b190c9df3459432af8c16f7b9c33ebc3394c1f9811a70717b530467a41"; + sha256 = "sha256-gSclZatH5r3r6o8K2gXaNlkowQxFT7h0t/0ubr3d0n0="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix index b4b60da17f..ab5e929818 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "sha256-5J2hhy52eZqVSaeJNIOM9RzZatq3aewAulS3OX76+Io="; + sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd"; }; propagatedBuildInputs = [ 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 7908b3c6b4..31c6ba175d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -18,7 +18,6 @@ , httpx # Check Inputs , pytestCheckHook -, pytest-runner , pytest-asyncio , pytest-timeout , aiohttp @@ -31,7 +30,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.59.4"; + version = "0.60.1"; disabled = pythonOlder "3.6"; @@ -39,11 +38,9 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-bH/VREo2f84wloA2jgXnQkGNSRRRYmSvUXmI0wMfmYM="; + sha256 = "sha256-x4bqd8hFPNLkDIsuTTy+WbAjuUl6lXsmIZoiRi7ZOm8="; }; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ aiofiles asgi-csrf @@ -74,6 +71,8 @@ buildPythonPackage rec { ]; postConfigure = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" substituteInPlace setup.py \ --replace "click-default-group~=1.2.2" "click-default-group" \ --replace "hupper~=1.9" "hupper" \ 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 bbfa60f03b..8994e1d28c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix @@ -2,21 +2,29 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "3.0.1"; pname = "dbutils"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "6ec83f4d75d7a7b42a92e86b775f251e2671639b3b2123fe13a5d8d8fe7c5643"; + hash = "sha256-+t65eeFAbcEj4tuZVfMU4NU2DzBOC9bPBHqqX8P99bM="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "dbutils" ]; + pythonImportsCheck = [ + "dbutils" + ]; meta = with lib; { description = "Database connections for multi-threaded environments"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix index f260727b87..5efad06501 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix @@ -9,11 +9,19 @@ buildPythonPackage rec { sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i"; }; + postPatch = '' + sed -i '/use_2to3=True/d' setup.py + ''; + propagatedBuildInputs = [ numpy matplotlib ]; + preBuild = '' + 2to3 -wn deap + ''; + checkInputs = [ nose ]; checkPhase = '' - ${python.interpreter} setup.py nosetests --verbosity=3 + nosetests --verbosity=3 ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix index 7fa3c6465d..92c2c27de2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix @@ -3,31 +3,42 @@ , fetchPypi , makefun , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "decopatch"; - version = "1.4.8"; + version = "1.4.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0i6i811s2j1z0cl6y177dwsbfxib8dvb5c2jpgklvc2xy4ahhsy6"; + hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ makefun ]; + propagatedBuildInputs = [ + makefun + ]; postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner', " "" + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" ''; + pythonImportsCheck = [ + "decopatch" + ]; + # Tests would introduce multiple cirucular dependencies # Affected: makefun, pytest-cases doCheck = false; - pythonImportsCheck = [ "decopatch" ]; - meta = with lib; { description = "Python helper for decorators"; homepage = "https://github.com/smarie/python-decopatch"; 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 0c18899631..e26c1a1081 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "5.1.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7"; + sha256 = "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix index cdc18f159f..0f67b2ae35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2611c54209b234730f3e5e6481cb875e120e49d9ec1a27a1fa89850150485975"; + sha256 = "sha256-k4RhUZN/aC9D1NKkmCGZGZNU9In577RobBnDagMYHbo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index 9c6663d278..0f01ebab4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.0.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "1vygyjmmin34iqmhq2l4qb9x2zgc41y6x50xavqzrkfkdd7vhwg6"; + sha256 = "sha256-jaF5vQx8/qP9pGLfilx86v1GxHbjxaRghjjI5Me0pU0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix deleted file mode 100644 index a25ecd74b5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/demjson/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, python -, buildPythonPackage -, fetchPypi -, isPy3k -}: - -buildPythonPackage rec { - pname = "demjson"; - version = "2.2.4"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; - }; - - doCheck = !(isPy3k); - - checkPhase = '' - ${python.interpreter} test/test_demjson.py - ''; - - pythonImportsCheck = [ - "demjson" - ]; - - meta = with lib; { - description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; - homepage = "https://github.com/dmeranda/demjson"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix index b71ce7c6c2..badbd3afbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , requests +, setuptools-scm , websocket-client , zeroconf }: @@ -21,6 +22,12 @@ buildPythonPackage rec { sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ requests zeroconf @@ -32,13 +39,6 @@ buildPythonPackage rec { pytest-mock ]; - postPatch = '' - # setup.py is not able to detect the version with setuptools_scm - substituteInPlace setup.py \ - --replace "setuptools_scm" "" \ - --replace 'use_scm_version=True' 'use_scm_version="${version}"' - ''; - # Disable test that requires network access disabledTests = [ "test__on_pong" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix index d6173494e8..84d98d0913 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.21.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mingrammer"; repo = pname; rev = "v${version}"; - sha256 = "1vj14kqffpafykyr9x5dcfhmqqvxq08lrp94lhqpdzikh6a0a0jx"; + sha256 = "sha256-YoXV5ikkBCSVyGmzEqp+7JLy82d7z9sbwS+U/EN3BFk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix index 1751271a22..5414f7522d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix @@ -2,51 +2,61 @@ , buildPythonPackage , chardet , fetchPypi -, inflect , jinja2 , jinja2_pluralize +, pluggy , pycodestyle , pyflakes , pygments , pylint +, pytest-datadir , pytest-mock , pytestCheckHook , pythonOlder +, tomli }: buildPythonPackage rec { pname = "diff-cover"; - version = "5.5.0"; + version = "6.4.4"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "diff_cover"; inherit version; - sha256 = "e2d36131c13f571d9f5c4109b9e08b71ed00757eabec0156de74e33f6ef5627f"; + sha256 = "b1d782c1ce53ad4b2c5545f8b7aa799eb61a0b12a62b376a18e2313c6f2d77f1"; }; propagatedBuildInputs = [ chardet - inflect jinja2 jinja2_pluralize + pluggy pygments + tomli ]; checkInputs = [ pycodestyle pyflakes pylint + pytest-datadir pytest-mock pytestCheckHook ]; disabledTests = [ - "added_file_pylint_console" + # Tests check for flake8 "file_does_not_exist" + # AssertionError: assert '.c { color:... + "test_style_defs" ]; - pythonImportsCheck = [ "diff_cover" ]; + pythonImportsCheck = [ + "diff_cover" + ]; meta = with lib; { description = "Automatically find diff lines that need test coverage"; 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 e47922f957..f4940cf7c6 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 @@ -5,18 +5,21 @@ , oauthlib , python-dateutil , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "discogs-client"; - version = "2.3.12"; + version = "2.3.13"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "joalla"; repo = "discogs_client"; rev = "v${version}"; - sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc"; + sha256 = "sha256-TOja0pCJv8TAI0ns8M/tamZ5Pp8k5sSKDnvN4SeKtW8="; }; propagatedBuildInputs = [ @@ -29,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "discogs_client" ]; + pythonImportsCheck = [ + "discogs_client" + ]; meta = with lib; { description = "Unofficial Python API client for Discogs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix new file mode 100644 index 0000000000..49de32439d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "discovery30303"; + version = "0.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + # Commit points to 0.2.1, https://github.com/bdraco/discovery30303/issues/1 + rev = "0d0b0fdca1a98662dd2e6174d25853703bd6bf07"; + hash = "sha256-WSVMhiJxASxAkxs6RGuAVvEFS8TPxDKE9M99Rp8HKGM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=discovery30303" "" + ''; + + pythonImportsCheck = [ + "discovery30303" + ]; + + meta = with lib; { + description = "Module to discover devices that respond on port 30303"; + homepage = "https://github.com/bdraco/discovery30303"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix index 1c565b3f15..ec4e8ecdc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05"; + sha256 = "e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"; extension = "zip"; }; 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 6dfb531a78..08e38f2a14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.11.2"; + version = "2021.12.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302"; + sha256 = "c6119a2cf1fb2d8ac60337915bb9a790af6530afcb5d7a809a3308323b874714"; }; postPatch = '' 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 c8d427900c..b10b8ec931 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 @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.0.4"; + version = "1.0.5"; pname = "dj-email-url"; src = fetchPypi { inherit pname version; - sha256 = "7ee35df51065d17ac7b55e98ad8eda3a1f6c5d65fc89cdc5de7a96e534942553"; + sha256 = "sha256-7zb4oyTsV8875cen70TtaQDKAghiSpGKszrcHPZCezk="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index ab329cd37a..2a858d8383 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage -, fetchPypi, isPy27 -, ldap , django +, fetchPypi +, isPy27 +, ldap +, django , mock +, setuptools-scm }: buildPythonPackage rec { pname = "django-auth-ldap"; - version = "3.0.0"; + version = "4.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa"; + sha256 = "276f79e624ce083ce13f161387f65ff1c0efe83ef8a42f2b9830d43317b15239"; }; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ ldap django ]; + checkInputs = [ mock ]; # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix index 0bbdac356c..5d43afc779 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-timezone-field"; - version = "4.2.1"; + version = "4.2.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mfogel"; repo = pname; rev = version; - sha256 = "0swld4168pfhppr9q3i9r062l832cmmx792kkvlcvxfbdhk6qz9h"; + sha256 = "sha256-purzXzPvnYNVsASsK6s9m4XieUL80FOjeSbUP4bpRj8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix index 853e12327d..63e575b634 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "django-widget-tweaks"; - version = "1.4.8"; + version = "1.4.12"; src = fetchFromGitHub { # package from Pypi missing runtests.py owner = "jazzband"; repo = pname; rev = version; - sha256 = "00w1ja56dc7cyw7a3mph69ax6mkch1lsh4p98ijdhzfpjdy36rbg"; + sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h"; }; checkPhase = "${python.interpreter} runtests.py"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix index f20eb49c02..c4df27beaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.26"; + version = "2.2.27"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-36U3Jn1SxiQ6YrMoVadEyoPDfHBgCqz/v9mLxdbYUY8="; + sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; }; patches = lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix index a7bafcfb27..3ed7024c34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.11"; + version = "3.2.12"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aclKvl1rGwiL9HXgm3t0QD+UPjTaEH55hGXSBF2ifnU="; + sha256 = "sha256-l3Lmk1cD5Z6ZOWCDLWamFM8CM6HFEjvGIk7MataeQeI="; }; patches = lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix new file mode 100644 index 0000000000..eb24edb4bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -0,0 +1,107 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, substituteAll + +# patched in +, geos +, gdal +, withGdal ? false + +# propagated +, asgiref +, backports-zoneinfo +, sqlparse + +# tests +, aiosmtpd +, argon2_cffi +, bcrypt +, docutils +, geoip2 +, jinja2 +, memcached +, numpy +, pillow +, pylibmc +, pymemcache +, python +, pytz +, pywatchman +, pyyaml +, redis +, selenium +, tblib +, tzdata +}: + +buildPythonPackage rec { + pname = "Django"; + version = "4.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo="; + }; + + patches = lib.optional withGdal + (substituteAll { + src = ./django_4_set_geos_gdal_lib.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }); + + propagatedBuildInputs = [ + asgiref + sqlparse + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + # Fails to import asgiref in ~200 tests + # ModuleNotFoundError: No module named 'asgiref' + doCheck = false; + + checkInputs = [ + aiosmtpd + argon2_cffi + asgiref + bcrypt + docutils + geoip2 + jinja2 + memcached + numpy + pillow + pylibmc + pymemcache + pytz + pywatchman + pyyaml + redis + selenium + tblib + tzdata + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} tests/runtests.py + + runHook postCheck + ''; + + meta = with lib; { + description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."; + homepage = "https://www.djangoproject.com"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch b/third_party/nixpkgs/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch new file mode 100644 index 0000000000..da73a93e8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch @@ -0,0 +1,26 @@ +diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +index 05b5732..91fafee 100644 +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -14,7 +14,7 @@ try: + from django.conf import settings + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = ""@gdal@/lib/libgdal@extension@" + + if lib_path: + lib_names = None +diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +index 2cdb5d3..fac2d04 100644 +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -24,7 +24,7 @@ def load_geos(): + from django.conf import settings + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c@extension@" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix index d4d67ba582..d7d2e8789a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-classy-tags"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "2ef8b82b4f7d77d4fd152b25c45128d926e7a5840d862f2ecd3e5faf6acbe343"; + sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg="; }; propagatedBuildInputs = [ django six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix index 97836b247a..1bf4d6b4da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.1"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339"; + sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w="; }; # tests assume the availability of a mysql/postgresql database diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix index facfc2fafc..f0550a296a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.16.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "23cea52eca76e605fa2f34b13ae8d2bf60240737ee9ed3f60c667a4f64d28adf"; + sha256 = "sha256-TwU9ASjij0EpJuLakCc19L3Lq1wI1Dvk3+/XR/yi6W4="; }; propagatedBuildInputs = [ ply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix index 5468776c72..14ceebf0a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix @@ -4,6 +4,7 @@ , dill , dm-tree , fetchFromGitHub +, jaxlib , jmp , lib , pytestCheckHook @@ -31,6 +32,7 @@ buildPythonPackage rec { chex cloudpickle dm-tree + jaxlib pytestCheckHook tensorflow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix index f465ac200d..3820fdd1e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix @@ -86,5 +86,6 @@ in buildPythonPackage { license = licenses.asl20; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; + broken = true; # depends on older TensorFlow version than is currently packaged }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix index e4a319b31a..40b3d7a36d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix @@ -2,26 +2,40 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools-scm +, pytestCheckHook }: buildPythonPackage rec { pname = "dnspython"; - version = "2.1.0"; + version = "2.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"; + extension = "tar.gz"; + sha256 = "1mi6l2n766y1gic3x1swp2jk2nr7wbkb191qinwhddnh6bh534z7"; }; - # needs networking for some tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # dns.exception.SyntaxError: protocol not found + "test_misc_good_WKS_text" + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + pythonImportsCheck = [ "dns" ]; meta = with lib; { description = "A DNS toolkit for Python"; homepage = "https://www.dnspython.org"; license = with licenses; [ isc ]; + maintainers = with maintainers; [ gador ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix index dbfb857614..61c4ca6890 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pythonOlder , restructuredtext_lint +, setuptools-scm , stevedore }: @@ -23,6 +24,10 @@ buildPythonPackage rec { sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + buildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix index c9f3d5be6d..b6f0176dd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.0.5"; + version = "2.0.6"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "0kk7wl15r305496q13ka4r6n2r13j99rrrpy2b4575j704dk4x7g"; + sha256 = "sha256-Wh3a5SIz+8jvgbFfuFBzqBEmu0NpjT86G2qvVhpGzcA="; }; # use pytest as nosetests hangs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix index fb3feaae63..82e1a645c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix @@ -5,7 +5,7 @@ , packaging , pynput , regex -, lark-parser +, lark , enum34 , pyperclip , six @@ -34,7 +34,7 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser' + substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark' substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \ --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' substituteInPlace dragonfly/windows/x11_window.py \ @@ -48,7 +48,7 @@ buildPythonPackage rec { packaging pynput regex - lark-parser + lark enum34 pyperclip six 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 1bc5d380b0..a081a7445c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pytest-doctestplus , pythonOlder +, setuptools-scm }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ numpy pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index a7ee6597b3..8f53ff4ebb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.26.0"; + version = "11.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "0ncx41jg2wbsklqkrh0zjwjs3kfkscz8d6gcbsxqa1qpa3pa5519"; + sha256 = "sha256-atIrrK4BgTfu0UaHTqJ66AxEeSJLanrmYx8myrOCOfo="; }; propagatedBuildInputs = [ 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 b666e4c210..e8a94fb5e8 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 @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.31"; + version = "0.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "v${version}"; - sha256 = "sha256-A+fyAAV62Dg28RDiivKEjrC1bCXzkuIvpATR+oUytRU="; + sha256 = "0hi69gdcmsp5yaspsfbpc3x76iybg20cylxyaxm131fpd5wwan9l"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix index 0062803768..92081e0806 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = version; - sha256 = "0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; + rev = "v${version}"; + hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eebrightbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eebrightbox/default.nix deleted file mode 100644 index d8050b9bf5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/eebrightbox/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pbr -, calmjs-parse -, certifi -, chardet -, idna -, ply -, requests -, urllib3 -, httpretty -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "eebrightbox"; - version = "0.0.6"; - - src = fetchFromGitHub { - owner = "krygal"; - repo = "eebrightbox"; - rev = version; - sha256 = "1kms240g01871qbvyc5rzf86yxsrlnfvp323jh4k35fpf45z44rr"; - }; - - postPatch = '' - substituteInPlace requirements.txt --replace "==" ">=" - ''; - - nativeBuildInputs = [ - pbr - ]; - - PBR_VERSION = version; - - propagatedBuildInputs = [ - calmjs-parse - certifi - chardet - idna - ply - requests - urllib3 - ]; - - checkInputs = [ - httpretty - pytestCheckHook - ]; - - meta = with lib; { - description = "Connector for EE BrightBox routers"; - homepage = "https://github.com/krygal/eebrightbox"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 601c5b6886..73a3882927 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,11 +12,11 @@ buildPythonPackage (rec { # there's a clear path forward. See # https://github.com/elastic/elasticsearch-py/issues/1639 for more # info. - version = "7.16.2"; + version = "7.16.3"; src = fetchPypi { inherit pname version; - sha256 = "23ac0afb4398c48990e359ac73ab6963741bd05321345299c62d9d23e209eee2"; + sha256 = "8adf8bc351ed55df7296be1009d38a1c999c0abc7d8700fa88533f1ad6087c5e"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix index ec968dce8e..5b0cb293c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix @@ -4,6 +4,7 @@ , deepmerge , dm-haiku , fetchFromGitHub +, jaxlib , lib , poetry , pytestCheckHook @@ -35,6 +36,8 @@ buildPythonPackage rec { poetry ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ cloudpickle deepdish diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 1497b412d7..76579e4dd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "1g927w9l3j5mycg6pqa4vjk2lyy35sppfp8pbzb6mvca500001rk"; + sha256 = "sha256-0QOtsHGhqbjaEDpSbUXdE8+u6xzWbrTexx+BAeYwKa8="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix new file mode 100644 index 0000000000..b6c31519ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "empty-files"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "approvals"; + repo = "EmptyFiles.Python"; + rev = "v${version}"; + sha256 = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # cyclic dependency with approvaltests + doCheck = false; + + pythonImportsCheck = [ "empty_files" ]; + + meta = with lib; { + description = "Null Object pattern for files"; + homepage = "https://github.com/approvals/EmptyFiles.Python"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix index 8f58720bd2..3c786d8691 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984"; + sha256 = "7a5b83cd0f4d095e59d80c648ebb5f7ffca0cd8bcf7ae6639828ee1ad000632a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix index a0a4fb88e0..4a8987b163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "environs"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw="; + sha256 = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc="; }; propagatedBuildInputs = [ 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 66ff1ddc10..c98a0fc515 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 @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "2.2.2"; + version = "3.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0rkvkacxla4y2blkkfdsq1ywnyqsvg8pwhvadznbag1bfzja4xhv"; + sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY="; }; # setuptools-markdown uses pypandoc which is broken at the moment 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 172647f0da..9b26fb7024 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 @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.10.0"; + version = "2.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sq3H4HmUFUipqVYleZxWLG1gBsQEoNwcZAXiKckacek="; + sha256 = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; }; checkInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index 154742638b..3550f1e173 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.7.1"; + version = "4.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1kwb5ixlmxg0xxm4wms5r4kym220vbncr9afi9qc25g8npkbs860"; + sha256 = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix index 28caec986d..048edf64d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "9.9.0"; + version = "11.3.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-cidwOj2zbtgkEQhUdUREX0WqRdsvP2PohcubVpk4Pw4="; + hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc="; }; propagatedBuildInputs = [ 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 451a993c22..3127ac0dcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -2,7 +2,7 @@ , aioredis , async_generator , buildPythonPackage -, fetchFromGitHub +, fetchPypi , fetchpatch , hypothesis , lupa @@ -18,17 +18,28 @@ buildPythonPackage rec { pname = "fakeredis"; version = "1.7.0"; - format = "setuptools"; + + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "jamesls"; - repo = pname; - rev = version; - hash = "sha256-P6PUg9SY0Qshlvj+iV1xdrzVLJ9JXUV4cGHUynKO3m0="; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE="; }; + patches = [ + (fetchpatch { + # redis 4.1.0 compatibility + # https://github.com/jamesls/fakeredis/pull/324 + url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch"; + sha256 = "sha256:03xlqmwq8nkzisrjk7y51j2jd6qdin8nbj5n9hc4wjabbvlgx4qr"; + excludes = [ + "setup.cfg" + ]; + }) + ]; + propagatedBuildInputs = [ aioredis lupa @@ -45,24 +56,15 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Support for redis <= 4.1.0, https://github.com/jamesls/fakeredis/pull/324 - (fetchpatch { - name = "support-redis-4.1.0.patch"; - url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch"; - sha256 = "sha256-4DrF/5WEWQWlJZtAi4qobMDyRAAcO/weHIaK9waN00k="; - }) - ]; - - disabledTestPaths = [ - # AttributeError: 'AsyncGenerator' object has no attribute XXXX - "test/test_aioredis2.py" - ]; - pythonImportsCheck = [ "fakeredis" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "redis<4.1.0" "redis" + ''; + meta = with lib; { description = "Fake implementation of Redis API"; homepage = "https://github.com/jamesls/fakeredis"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index ca0969b951..01857660a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.5.10"; + version = "1.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "v${version}"; - sha256 = "sha256-Xj1Ibl+xDN3uCww54StUBCc+w/iPMdbWucRqdb+GHVI="; + sha256 = "sha256-mvYbX8puqcT9kl1Abi785ptmmg9CxKZVTO6gPpk4sKU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix index 12c3175424..779949b38f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fastnumbers , fetchFromGitHub @@ -26,6 +27,10 @@ buildPythonPackage rec { typing-extensions ]; + # Tests fail due to numeric precision differences on ARM + # See https://github.com/SethMMorton/fastnumbers/issues/28 + doCheck = !(stdenv.isAarch64 || stdenv.isAarch32); + checkInputs = [ hypothesis pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix index c1e988ca76..53f2c15401 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix @@ -10,14 +10,18 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9.2"; + version = "2.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s="; + sha256 = "6836d456b8b0edbc5b6d3a42d1be852cebd43d2f28af4ff51789eb295f1860e2"; }; + postPatch = '' + sed -i '/cov/d' setup.cfg + ''; + buildInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix index d5ccc117be..8eaed65ca7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.3.0"; + version = "3.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8c7eab13dc442dc249e95158bcc12dec724465919bdc9831fdbf0660f03d1785"; + sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix index f89b4e6909..3c777d828b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.9"; + version = "1.0.10"; src = fetchPypi { inherit pname version; - sha256 = "7124e1bc6a97ffc7c6bead5b8fb2e129baf312a9e60db5772bc27c741799d475"; + sha256 = "sha256-MjoTUAcxtsZaJTvDkwu86aVt+6cekLYP/ZaKtp2a6Tc="; }; checkPhase = '' 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 0c1a3bd2c6..f8fc454e05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.8.20"; + version = "1.8.21"; src = fetchPypi { pname = "Fiona"; inherit version; - sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; + sha256 = "sha256-Og7coqegcNtAXXEYchSkPSMzpXtAl1RKP8woIGali/w="; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix new file mode 100644 index 0000000000..083abcaf6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, attrs +, flake8 +, pytestCheckHook +, hypothesis +, hypothesmith +}: + +buildPythonPackage rec { + pname = "flake8-bugbear"; + version = "22.1.11"; + + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = version; + sha256 = "sha256-sTg69Hgvi77wtLWEH4JtcIAMFk7exr5CBXmyS0nE5Vc="; + }; + + propagatedBuildInputs = [ + attrs + flake8 + ]; + + checkInputs = [ + flake8 + pytestCheckHook + hypothesis + hypothesmith + ]; + + meta = with lib; { + homepage = "https://github.com/PyCQA/flake8-bugbear"; + changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log"; + description = '' + A plugin for flake8 finding likely bugs and design problems in your + program. + ''; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} 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 bfdf0e46ea..7187e87905 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 @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "flask-admin"; - version = "1.5.8"; + version = "1.6.0"; format = "setuptools"; src = fetchPypi { pname = "Flask-Admin"; inherit version; - sha256 = "sha256-6wah8xuYiB3uU6VcZPrr0ZkNaqw4gmNksoDfCyZ5/3Q="; + sha256 = "1209qhm51d4z66mbw55cmkzqvr465shnws2m2l2zzpxhnxwzqks2"; }; propagatedBuildInputs = [ @@ -69,6 +69,7 @@ buildPythonPackage rec { "flask_admin/tests/pymongo/test_basic.py" "flask_admin/tests/sqla/test_basic.py" "flask_admin/tests/sqla/test_form_rules.py" + "flask_admin/tests/sqla/test_inlineform.py" "flask_admin/tests/sqla/test_postgres.py" "flask_admin/tests/sqla/test_translation.py" ]; 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 afb81cc103..e4f88e176b 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 @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , apispec , colorama , click @@ -25,18 +26,31 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.4.1"; + version = "3.4.3"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "c0830935077c4d06d57237ca4791fcabfc682fe3e315c1c9444a2bd6f94e7514"; + sha256 = "be1e2271cdd7c879d343f57060b50ac411346730df55b35ce242faadcab81c12"; }; # See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch # https://github.com/dpgaspar/Flask-AppBuilder/pull/1610 # The patch from the PR doesn't apply cleanly so I edited it manually. - patches = [ ./upgrade-to-flask_jwt_extended-4.patch ]; + patches = [ + ./upgrade-to-flask_jwt_extended-4.patch + (fetchpatch { + # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 + name = "flask-appbuilder-wtf3.patch"; + url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; + sha256 = "1rsci0ynb7y6k53j164faggjr2g6l5v78w7953qbxcy8f55sb2fv"; + excludes = [ + "requirements.txt" + "setup.py" + "examples/employees/app/views.py" + ]; + }) + ]; propagatedBuildInputs = [ apispec @@ -68,6 +82,7 @@ buildPythonPackage rec { --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \ --replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \ --replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \ + --replace "WTForms<3.0.0" "WTForms" \ --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \ --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended>=4.1.0" \ --replace "PyJWT>=1.7.1, <2.0.0" "PyJWT>=2.0.1" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix index d23306be62..d73ad8d35c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "2021.12.28"; + version = "2022.1.8"; src = fetchPypi { inherit pname version; - sha256 = "c722a25067d722483e24cde16ed987a822292ca758a213299e445694d2b5b587"; + sha256 = "a32996ec07ca004c45b768b0d50829728ab8f3986c0650ef538e42852c7aeba2"; }; propagatedBuildInputs = [ flask ]; 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 2fe71c2d6d..cf1079166b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -7,6 +7,7 @@ , jinja2 , python-dotenv , werkzeug +, setuptools , pytestCheckHook }: @@ -26,6 +27,10 @@ buildPythonPackage rec { itsdangerous jinja2 werkzeug + + # required for CLI subcommand autodiscovery + # see: https://github.com/pallets/flask/blob/fdac8a5404e3e3a316568107a293f134707c75bb/src/flask/cli.py#L498 + setuptools ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index b8479c0f73..3ac8166bbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, jaxlib , keras , lib , matplotlib @@ -12,15 +13,17 @@ buildPythonPackage rec { pname = "flax"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0zvq0vl88hiwmss49bnm7gdmndr1dfza2bcs1fj88a9r7w9dmlsr"; + sha256 = "0rvdaxyf68qmm5d77gbizpcibyz2ic2pb2x7rgf7p8qwijyc39ws"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ matplotlib msgpack diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix index ae52c31b57..11f3ad694f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook +, pythonOlder +, teamcity-messages +, testtools }: buildPythonPackage rec { pname = "flexmock"; - version = "0.11.1"; + version = "0.11.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1c51371767f968e1d2f505138de72b07704ecebc9b34e0b52ffdeeb510685c3f"; + hash = "sha256-RPcCwNCt3nCFtMev6a2rULAbckrO635Jsp9WMuYyXOg="; }; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + teamcity-messages + testtools + ]; + + disabledTests = [ + "test_failed_test_case" + ]; + + pythonImportsCheck = [ + "flexmock" + ]; meta = with lib; { - description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes."; + description = "Testing library that makes it easy to create mocks,stubs and fakes"; homepage = "https://flexmock.readthedocs.org"; license = licenses.bsdOriginal; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix index 885c688225..7045841245 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,32 +1,48 @@ { lib -, buildPythonPackage -, fetchPypi -, isPy27 -, botocore , boto3 -, docutils -, unittest2 -, mock +, botocore +, buildPythonPackage +, fetchFromGitHub +, parquet +, pytestCheckHook +, python-dateutil +, pythonOlder }: buildPythonPackage rec { - pname = "flowlogs_reader"; - version = "3.1.0"; - disabled = isPy27; + pname = "flowlogs-reader"; + version = "3.2.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "d99636423abc83bb4042d63edd56852ede9e2949cadcc3339eda8f3367826dd4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "obsrvbl"; + repo = pname; + # https://github.com/obsrvbl/flowlogs-reader/issues/57 + rev = "fac4c6c63348ff67fd0a8f51d391ba7c9f59e5ed"; + hash = "sha256-bGb2CLp33aIr0R/lBPWAF3CbtVTWpqmcvYgZ6bcARTc="; }; - propagatedBuildInputs = [ botocore boto3 docutils ]; - buildInputs = [ unittest2 mock ]; + propagatedBuildInputs = [ + botocore + boto3 + parquet + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flowlogs_reader" + ]; meta = with lib; { description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier"; homepage = "https://github.com/obsrvbl/flowlogs-reader"; - maintainers = with maintainers; [ cransom ]; license = licenses.asl20; + maintainers = with maintainers; [ cransom ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix index 70b97a083d..a670b4a9ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix @@ -1,9 +1,14 @@ -{ buildPythonPackage, fetchPypi, atpublic }: +{ buildPythonPackage, fetchPypi +, atpublic +, pdm-pep517 +}: buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.2"; + version = "4.0"; + format = "pyproject"; + nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic ]; doCheck = false; @@ -12,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-w1yPjqtmrbf9ZKFCCGAQUGbSs2y2VbM/+xSv6OIj7WI="; + sha256 = "sha256-MTq0djhFp/cEx0Ezt5EaMz3MzrAWjxZ0HQSkfFuasWY="; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix index c0f3ec60cf..c2cc5723e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix @@ -1,16 +1,19 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook , atpublic, psutil, pytest-cov, sybil +, pdm-pep517 }: buildPythonPackage rec { pname = "flufl.lock"; - version = "6.0"; + version = "7.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/HSO5gnshktIOO9knb0RcPp53rDCE8L9URUb7mp/wkI="; + sha256 = "sha256-FBX30Z2N2WpYJC4O+5DOPLGHf7VFB0rYwcrky3GR/gE="; }; + nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic psutil ]; checkInputs = [ pytestCheckHook pytest-cov sybil ]; 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 d49c965c86..46e47b497a 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 @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.17"; + version = "0.28.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "1brh2wmv29vsvnndsjf1nbh2brwrkxicwcyj9brs9kgsrhvlv71s"; + sha256 = "sha256-GNuc8WAiC0S4WFFUYgayU6c0treWCPfPhbyteZ68eWs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix index ff8c097d6f..48b98a8e10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix @@ -1,37 +1,60 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder -, pytest -, numpy -, nbconvert -, pandas -, mock -, jinja2 +, pytestCheckHook , branca +, jinja2 +, nbconvert +, numpy +, pandas +, pillow , requests +, selenium +, setuptools-scm }: buildPythonPackage rec { pname = "folium"; version = "0.12.1.post1"; - src = fetchPypi { - inherit pname version; - sha256 = "e91e57d8298f3ccf4cce3c5e065bea6eb17033e3c5432b8a22214009c266b2ab"; - }; - disabled = pythonOlder "3.5"; - checkInputs = [ pytest nbconvert pandas mock ]; - propagatedBuildInputs = [ jinja2 branca requests numpy ]; + src = fetchFromGitHub { + owner = "python-visualization"; + repo = "folium"; + rev = "v${version}"; + sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA="; + }; - # No tests in archive - doCheck = false; + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - checkPhase = '' - py.test - ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + branca + jinja2 + numpy + requests + ]; + + checkInputs = [ + nbconvert + pytestCheckHook + pandas + pillow + selenium + ]; + + disabledTests = [ + # requires internet connection + "test_geojson" + "test_heat_map_with_weights" + "test_json_request" + "test_notebook" + ]; meta = { description = "Make beautiful maps with Leaflet.js & Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index ec3acfc775..50f5e87a29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.26.2"; + version = "4.29.0"; # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1zp9idjkn4bn1a4pn8x64vi8j1ijdsd4qvgf1f70dfwqvw6ak1i6"; + sha256 = "LnkpTEpZbbRAyqGPJXdfpHjh4t7n6LkjZGLhirVNl7E="; }; # all dependencies are optional, but diff --git a/third_party/nixpkgs/pkgs/development/python-modules/forecast-solar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/forecast-solar/default.nix index 3f776c9706..6a77f57acf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/forecast-solar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/forecast-solar/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0="; }; + PACKAGE_VERSION = version; + propagatedBuildInputs = [ aiodns aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix index da246966c9..1bff69e460 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pkgconfig , gmp @@ -15,29 +14,15 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.5.1dev"; + version = "0.5.6"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "15vdfgx448mr1nf054h7lr2j3dd35fsfhikqzrh9zsng8n12hxa5"; + sha256 = "sha256-Bxcc0941+pl2Uzam48qe+PFlcBWsJ0rDYZxrxIYQpEA="; }; - patches = [ - # two patches to fix the testsuite on aarch64 (https://github.com/fplll/fpylll/issues/162) - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/d5809a8fdb86b2693b1fa94e655bbbe4ad80e286.patch"; - name = "less-precision-in-tests.patch"; - sha256 = "0vkvi25nwwvk5r4a4xmkbf060di4hjq32bys75l2hsaysxmk93nz"; - }) - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/b5b146a010d50da219a313adc4b6f7deddcc146b.patch"; - name = "dont-hardcode-precision.patch"; - sha256 = "1rsbwh90i1j5p2rp6jd5n25v1jzw1n8728fzz1lhb91zmk0hlxc9"; - }) - ]; - buildInputs = [ gmp pari 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 0797d39c31..092b00f6b0 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.7.2"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = version; - sha256 = "sha256-TT0mc3ID+R5Dhm0xSMpyg68wZR70xJfRfgPkHkvLstA="; + sha256 = "sha256-wapZ4lCG0tfE+LbFVeIxVlbMJN/sSwIeYK5GLCqoWLs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix index 139a4c562b..95c946a775 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "655b879217dd445a2023e16154cc231febef802b5c812d5c2e822280ad69e1dc"; + sha256 = "sha256-jj1HNfmhPRB3Vn5WhHFmPzJE+FrImyP4yzHPIx2+Rbk="; }; - postPatch = '' - # fixes build on non-x86_64 architectures - rm frozendict/src/3_9/cpython_src/Include/pyconfig.h - ''; - pythonImportsCheck = [ "frozendict" ]; @@ -32,24 +27,12 @@ buildPythonPackage rec { ]; preCheck = '' - rm -r frozendict - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + pushd test ''; - disabledTests = [ - # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' - "test_union" - # non-standard assertions - "test_repr" - "test_format" - "test_str" - ]; - - disabledTestPaths = [ - # unpackaged test dependency: coold - "test/test_coold.py" - "test/test_coold_subclass.py" - ]; + postCheck = '' + popd + ''; meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix index 8a7335accd..115d358cb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPyPy, isPy3k, unittest2 +, isPyPy, isPy3k }: buildPythonPackage rec { @@ -11,11 +11,14 @@ buildPythonPackage rec { sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"; }; - buildInputs = [ unittest2 ]; - # https://github.com/testing-cabal/funcsigs/issues/10 patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ]; + # requires, unittest2 and package hasn't been maintained since 2013 + doCheck = false; + + pythonImportsCheck = [ "funcsigs" ]; + meta = with lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; homepage = "https://github.com/aliles/funcsigs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix index 956c7da935..9dc336e17f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "furo"; - version = "2021.10.9"; + version = "2022.1.2"; format = "flit"; disable = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K6pCoi7ePm6Vxhgqs2S6wuwVt5vH+cp/sJ/ZrsSzVAw="; + sha256 = "b217f218cbcd423ffbfe69baa79389d4ecebf2d86f0d593c44ef31da7b5aed30"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gaphas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gaphas/default.nix index a6351aeead..c3541bcc30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gaphas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.1.9"; + version = "3.5.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S6cRsfqXYM4mSVSs2M8fET5ShFClKkGkod2w2y6F2gc="; + sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix index 08a687d706..01ff36e637 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -2,21 +2,32 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core , aiohttp }: buildPythonPackage rec { pname = "garages-amsterdam"; - version = "2.1.1"; + version = "3.2.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; - rev = version; - sha256 = "1m0bc3bzb83apprk412s7k5r2g6p5br2hrak2a976lh9ifk1d8hj"; + rev = "v${version}"; + sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -28,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; - homepage = "https://github.com/klaasnicolaas/garages_amsterdam"; + homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect-aio/default.nix index bb754118e0..abdd1f9f2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect-aio/default.nix @@ -3,18 +3,22 @@ , brotlipy , buildPythonPackage , fetchFromGitHub +, pythonOlder , yarl }: buildPythonPackage rec { pname = "garminconnect-aio"; version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect-aio"; rev = version; - sha256 = "0s2gpy5hciv9akqqhxy0d2ywp6jp9mmdngx34q7fq3xn668kcrhr"; + hash = "sha256-GWY2kTG2D+wOJqM/22pNV5rLvWjAd4jxVGlHBou/T2g="; }; propagatedBuildInputs = [ @@ -26,7 +30,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "garminconnect_aio" ]; + pythonImportsCheck = [ + "garminconnect_aio" + ]; meta = with lib; { description = "Python module to interact with Garmin Connect"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect-ha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix similarity index 54% rename from third_party/nixpkgs/pkgs/development/python-modules/garminconnect-ha/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index c88af9b230..62a85ea8bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect-ha/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , cloudscraper , fetchFromGitHub +, pythonOlder , requests }: buildPythonPackage rec { - pname = "garminconnect-ha"; - version = "0.1.13"; + pname = "garminconnect"; + version = "0.1.44"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cyberjunky"; - repo = "python-garminconnect-ha"; + repo = "python-garminconnect"; rev = version; - sha256 = "sha256-1O1EcG5FvpwUvI8rwcdlQLzEEStyFAwvmkaL97u6hZ4="; + hash = "sha256-CUjMbh3eGPwoHW+oOjaVyr0g/txWmzGuP1usq2WCwZg="; }; propagatedBuildInputs = [ @@ -21,14 +25,16 @@ buildPythonPackage rec { requests ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "garminconnect_ha" ]; + pythonImportsCheck = [ + "garminconnect" + ]; meta = with lib; { - description = "Minimal Garmin Connect Python 3 API wrapper for Home Assistant"; - homepage = "https://github.com/cyberjunky/python-garminconnect-ha"; + description = "Garmin Connect Python API wrapper"; + homepage = "https://github.com/cyberjunky/python-garminconnect"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix index f374378d98..110363b383 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix @@ -1,24 +1,36 @@ { lib -, fetchFromGitHub -, buildPythonPackage , astunparse +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gast"; - version = "0.5.1"; + version = "0.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "serge-sans-paille"; - repo = "gast"; + repo = pname; rev = version; - sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa"; + sha256 = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; }; - checkInputs = [ astunparse ]; + checkInputs = [ + astunparse + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gast" + ]; meta = with lib; { - description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module."; + description = "Compatibility layer between the AST of various Python versions"; homepage = "https://github.com/serge-sans-paille/gast/"; license = licenses.bsd3; maintainers = with maintainers; [ jyp cpcloud ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix index 195a7e822d..37cd3629db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.2.0"; + version = "4.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc"; + sha256 = "sha256-X3onSr8PN3D24lMtKG2Y/RiKbD1qSq2n0YVO8Y5H5K4="; }; propagatedBuildInputs = [ 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 855b671d2b..b74ef29e54 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.4.22"; + version = "0.4.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3HErbW9/YD8Jd6zr5O2hjoLZ9x5P/vzZLjqPmSm09EM="; + sha256 = "sha256-y8L0krMSAOFP97j5QQGiJJMhzRidhMgoHGsMYMyUdd8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix new file mode 100644 index 0000000000..89f1e73ed9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, lib, fetchFromGitHub +, networkx, numpy, scipy, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "geometric"; + version = "0.9.7.2"; + + src = fetchFromGitHub { + owner = "leeping"; + repo = "geomeTRIC"; + rev = version; + hash = "sha256-QFpfY6tWqcda6AJT17YBEuwu/4DYPbIMJU1c9/gHjaA="; + }; + + propagatedBuildInputs = [ + networkx + numpy + scipy + six + ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Geometry optimization code for molecular structures"; + homepage = "https://github.com/leeping/geomeTRIC"; + license = [ licenses.bsd3 ]; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix index 4a25e0d7e1..3383987144 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix @@ -1,29 +1,48 @@ { lib , buildPythonPackage , fetchPypi -, versiontools +, gevent , gevent-websocket , mock -, pytest -, gevent +, versiontools +, pythonOlder }: buildPythonPackage rec { pname = "gevent-socketio"; version = "0.3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak"; + hash = "sha256-UzlKuT+9hNnbuyvvhTSfalA7/FPYapvoZTJQ8aBBKv8="; }; - buildInputs = [ versiontools gevent-websocket mock pytest ]; - propagatedBuildInputs = [ gevent ]; + nativeBuildInputs = [ + versiontools + ]; + + buildInputs = [ + gevent-websocket + ]; + + propagatedBuildInputs = [ + gevent + ]; + + # Tests are not ported to Python 3 + doCheck = false; + + pythonImportsCheck = [ + "socketio" + ]; meta = with lib; { + description = "SocketIO server based on the Gevent pywsgi server"; homepage = "https://github.com/abourget/gevent-socketio"; - description = "SocketIO server based on the Gevent pywsgi server, a Python network library"; license = licenses.bsd0; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix index 5e93fb32b9..66709d8faf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix @@ -3,29 +3,37 @@ , fetchPypi , gevent , gunicorn +, pythonOlder }: buildPythonPackage rec { pname = "gevent-websocket"; version = "0.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky"; + hash = "sha256-fq7zKWgpDJEh98Nblz4swwL/sHbQGMkGjS9cqLLYX7A="; }; - propagatedBuildInputs = [ gevent gunicorn ]; + propagatedBuildInputs = [ + gevent + gunicorn + ]; - # zero tests run + # Module has no test doCheck = false; - pythonImportsCheck = [ "geventwebsocket" ]; + pythonImportsCheck = [ + "geventwebsocket" + ]; meta = with lib; { + description = "Websocket handler for the gevent pywsgi server"; homepage = "https://www.gitlab.com/noppo/gevent-websocket"; - description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix index 3fe9e648ce..e2b1e11278 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix @@ -1,35 +1,50 @@ -{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +{ lib +, fetchPypi +, buildPythonPackage +, isPyPy +, python +, libev +, greenlet +, zope_event , zope_interface +, pythonOlder }: buildPythonPackage rec { pname = "gevent"; - version = "20.9.0"; + version = "21.12.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz"; + hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; }; - buildInputs = [ libev ]; - propagatedBuildInputs = [ - zope_interface - ] ++ lib.optionals (!isPyPy) [ greenlet ]; + buildInputs = [ + libev + ]; - checkPhase = '' - cd greentest - ${python.interpreter} testrunner.py - ''; + propagatedBuildInputs = [ + zope_event + zope_interface + ] ++ lib.optionals (!isPyPy) [ + greenlet + ]; # Bunch of failures. doCheck = false; + pythonImportsCheck = [ + "gevent" + ]; + meta = with lib; { description = "Coroutine-based networking library"; homepage = "http://www.gevent.org/"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix index 7e30b8e83f..4a349106ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,23 +1,25 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, backports_ssl_match_hostname , brotli +, buildPythonPackage , certifi -, gevent -, six , dpkt +, fetchPypi +, gevent , pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "geventhttpclient"; version = "1.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780"; + hash = "sha256-2A7J/0K3IZ8zVYGFSZ0LQ2VZf8Vf+IYge0X1Yy4Jl4A="; }; propagatedBuildInputs = [ @@ -25,8 +27,6 @@ buildPythonPackage rec { certifi gevent six - ] ++ lib.optionals (pythonOlder "3.7") [ - backports_ssl_match_hostname ]; checkInputs = [ @@ -45,11 +45,14 @@ buildPythonPackage rec { "test_multi_queries_greenlet_safe" ]; + pythonImportsCheck = [ + "geventhttpclient" + ]; + meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; description = "HTTP client library for gevent"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix index aa5512d991..99a878700d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix @@ -16,11 +16,11 @@ buildPythonApplication rec { pname = "gigalixir"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "894b7e5bef30abc2c003e6df47f7758de5649b6f593e33926fcd398cc88d9ce2"; + sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix index a059495d00..2bab62fbcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1"; + sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo="; }; propagatedBuildInputs = [ gevent ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix index bdd2e63e07..2c52db8ab5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "sha256-F3jmYBZNzI4hRmH1J+S5RwxjouZNcUJOnD3QpX1J39s="; + sha256 = "sha256-mV67mppzx3lka04bxQ5CdufknZTTqWqGJzqPaHb4C2o="; }; nativeBuildInputs = [ @@ -37,11 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'httpx = ">=0.20,<1"' 'httpx = ">=0.19,<1"' - ''; - pythonImportsCheck = [ "glances_api" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 469c0d613b..52fdf6745c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "glean_parser"; - version = "4.4.0"; + version = "5.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5"; + sha256 = "sha256-MJ827VXy8e2CRyq4sY4d0B7etxBgRk4/hZybYOOLh9Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix index e729d927cd..f2c2f92c9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix @@ -12,23 +12,17 @@ buildPythonPackage rec { pname = "glean-sdk"; - version = "42.2.0"; + version = "44.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74="; + sha256 = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; }; - patches = [ - # Fix the environment for spawned process - # https://github.com/mozilla/glean/pull/1542 - ./fix-spawned-process-environment.patch - ]; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-/+rKGPYTLovgjTGL2F/pWzlUy1tY207yuJz3Xdhm1hg="; + sha256 = "sha256-lWFv8eiA3QHp5bhcg4qon/dvKUbFbtH1Q2oXGkk0Me0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch deleted file mode 100644 index f9a7b2723e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/glean-core/python/glean/_process_dispatcher.py b/glean-core/python/glean/_process_dispatcher.py -index 33a8b12796..a39b54a917 100644 ---- a/glean-core/python/glean/_process_dispatcher.py -+++ b/glean-core/python/glean/_process_dispatcher.py -@@ -120,8 +120,14 @@ def dispatch(cls, func, args) -> Union[_SyncWorkWrapper, subprocess.Popen]: - Path(".coveragerc").absolute() - ) - -+ # Explicitly pass the contents of `sys.path` as `PYTHONPATH` to the -+ # subprocess so that there aren't any module search path -+ # differences. -+ python_path = ":".join(sys.path)[1:] -+ - p = subprocess.Popen( -- [sys.executable, _process_dispatcher_helper.__file__, payload] -+ [sys.executable, _process_dispatcher_helper.__file__, payload], -+ env={"PYTHONPATH": python_path}, - ) - - cls._last_process = p diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index d251ec75ff..91c959e87c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "2.0.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "globus"; repo = "globus-sdk-python"; rev = version; - sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9"; + sha256 = "12zza78qydkgzqg3j9428g92v7bb55nrwvl5m2il96z39darh7v8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index e5bbbc8cbc..772f45411d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.32.0"; + version = "2.35.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "619fe50155e73342c17aba4bbb2a08be8ce6ae00b795af383de7d6616b485c94"; + sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2"; }; propagatedBuildInputs = [ 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 b51a5569a5..9249b949b6 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 @@ -25,6 +25,11 @@ buildPythonPackage rec { sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "cachetools>=2.0.0,<5.0" "cachetools" + ''; + propagatedBuildInputs = [ cachetools pyasn1-modules 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 747fdd07b0..555017bd48 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 @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b8472c91b05159f20121fcca6ebdc2a3b5648d68158ec747860914279b6b983b"; + sha256 = "sha256-R7HGbURhqOxPXUlKN3+mk5+qP6Em5HmxBAa7LHsjJJk="; }; propagatedBuildInputs = [ 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 8f64e9950e..1efbcf02de 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 @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.10.1"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "6a1cedc549ee0886d8603f519cc8631de3112be6f84c0bbbaedab4ee3f9b58fc"; + sha256 = "sha256-8JOa8HzYGJq1lrPXCWRvspXpopEK+qf5av7kmKbFIrQ="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; 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 467fe95424..dc60abddb6 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 @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.7.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5a4ad2832be3b86c8f0fb57b2d382a1f67218137c6f6051372647ac5147d6421"; + sha256 = "sha256-RS42Hh3Lwo8iCMCAXBp8usAwdkVWcD2XZW0FIYuTNwg="; }; postPatch = '' 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 62bba68541..d787669071 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 @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.12.1"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "98e53298a7c79f0af351c80e6fc0b57bc735afdec764424e459179ef04f5a40f"; + sha256 = "sha256-Y+MA7Nlx3+8eaBptI6eZgSPGc4MvxSrA9YA+K+VSblw="; }; propagatedBuildInputs = [ 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 a90f9c73cc..f77c718ed8 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 @@ -40,6 +40,7 @@ buildPythonPackage rec { "download" "get" "post" + "upload" "test_build_api_url" "test_ctor_mtls" "test_hmac_key_crud" 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 05ac66c087..c2ab6afafa 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 @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.9.1"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0a76bed3cf48cf72d4aa50329d5da2bbc008c5c7dd57326854fc038536e107f1"; + sha256 = "sha256-j2MSeQLw7udQrEqj9LtMqvaGSgTLiItdpN8dUTedYdI="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index 02a0f6f08d..227d49d57d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -8,6 +8,7 @@ , google-auth-oauthlib , google-cloud-pubsub , pytest-aiohttp +, pytest-asyncio , pytestCheckHook , pythonOlder , requests_oauthlib @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.5.1"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-8Y3ixkDl/AmXQMOY+29og5njMh9M2qjwWBGCsiqX5PU="; + sha256 = "sha256-SDxYPncC/VVTbI4Ka/mgcVfU1KUNRXVvQl78LCoD/RQ="; }; propagatedBuildInputs = [ @@ -39,20 +40,21 @@ buildPythonPackage rec { asynctest coreutils pytest-aiohttp + pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace tests/event_media_test.py \ - --replace "/bin/echo" "${coreutils}/bin/echo" - ''; - pythonImportsCheck = [ "google_nest_sdm" ]; + disabledTests = [ + "test_clip_preview_transcode" + "test_event_manager_event_expiration_with_transcode" + ]; + meta = with lib; { - description = "Python module for Google Nest Device Access using the Smart Device Management API"; + description = "Module for Google Nest Device Access using the Smart Device Management API"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-re2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-re2/default.nix index f61599d827..b04459bfa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-re2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-re2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "google-re2"; - version = "0.2.20211101"; + version = "0.2.20220201"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "305dc0f749c1abad51f8dc59b49b98a58dc06b976727f6b711c87c01944046d9"; + sha256 = "sha256-H8eMC1dM+9ukuRIN4uWWs7oRuQ0tpGaCwaCl0tp+lE8="; }; propagatedBuildInputs = [ 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 0b10fbab29..5d5d2fda18 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 @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "725b989e0dd387ef2703d1cc8e86217474217f4549593c477fd94f4024a0f911"; + sha256 = "sha256-se37mIZ8n6Jap68S1kaGZbg8UytzSe/6uAWgJ+qLvuU="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix index 58b50f5f84..f00a694dfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.5.3"; + version = "4.6.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "v${version}"; - sha256 = "1yfsfspvjngrb1lwaq04ahm94j9y2dwzdf4dsg3yl1c8w0vgf9yw"; + sha256 = "sha256-pzCM1uZupqJgoogwacuuy1P8I9LF65w7ZS6vY10VgeU="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grapheme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grapheme/default.nix new file mode 100644 index 0000000000..965b1a1d21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/grapheme/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "grapheme"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jiwc3w05c8kh22s3zk7a8km8na3plqc5zimb2qcyxxy3grbkhj4"; + }; + + # Tests are no available on PyPI + # https://github.com/alvinlindstam/grapheme/issues/18 + doCheck = false; + + pythonImportsCheck = [ + "grapheme" + ]; + + meta = with lib; { + description = "Python package for grapheme aware string handling"; + homepage = "https://github.com/alvinlindstam/grapheme"; + license = licenses.mit; + maintainers = with maintainers; [ creator54 ]; + }; +} 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 7a28bc08cd..e975bff8fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -1,14 +1,16 @@ { lib +, aniso8601 , buildPythonPackage , fetchFromGitHub -, aniso8601 , graphql-core , graphql-relay , promise -, pytestCheckHook , pytest-asyncio , pytest-benchmark , pytest-mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder , pytz , snapshottest }: @@ -16,6 +18,9 @@ buildPythonPackage rec { pname = "graphene"; version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "graphql-python"; @@ -40,15 +45,22 @@ buildPythonPackage rec { snapshottest ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; disabledTests = [ # Expects different Exeception classes, but receives none of them # https://github.com/graphql-python/graphene/issues/1346 "test_unexpected_error" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_objecttype_as_container_extra_args" + "test_objecttype_as_container_invalid_kwargs" ]; - pythonImportsCheck = [ "graphene" ]; + pythonImportsCheck = [ + "graphene" + ]; meta = with lib; { description = "GraphQL Framework for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index 6a33cfd7b3..75583cdbfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.7"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "1mwwh55qd5bcpvgy6pyliwn8jkmj4yk4d2pqb6mdkgqhdic2081l"; + sha256 = "sha256-71Z+5nVvg+aozJAKmBGJg5Gqq1OIVH7Xv33Q82IHhXg="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 5a17b4679e..408fd93f1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { hash = "sha256-Y8IgqrU8zzV020qwyyb57Tp2j7laQ3JsCOCYBuf8vsQ="; }; + postPatch = '' + # upstream issue for proper solution https://github.com/cmroche/greeclimate/issues/46 + substituteInPlace setup.py \ + --replace 'name="greeclimate",' 'name="greeclimate",version="${version}",' + ''; + propagatedBuildInputs = [ netifaces pycryptodome diff --git a/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix index 18d6cd4dab..6347d9f55b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/growattserver/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = version; - sha256 = "sha256-Vooy+czqhrsWVw35zJb5paC5G0WwOlI5hF8PXxJG0cY="; + sha256 = "0v9clmz4qg6krmbsbfsrhsan824y2mqvwxsxb0fzfgaszxwkpm30"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix index 4718d8244d..f1e490a65c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix @@ -18,12 +18,15 @@ let langPkgs = [ + "ar" "cs" "de" - "es" "en" + "es" + "fa" "fr" "it" + "lb" "nl" "pt" "ru" @@ -45,9 +48,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "Babel~=2.8.0" "Babel" \ --replace "dateparser~=1.0.0" "dateparser" \ - --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" + --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" \ + --replace "jsonlines~=1.2.0" "jsonlines" ''; propagatedBuildInputs = [ 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 330172f56c..d500c64532 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*' + nosetests -e 'ext_test_\d.*' ''; pythonImportsCheck = [ "gssapi" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index a391d993cf..c02e3b593b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.18.4"; + version = "1.20.0"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - sha256 = "13h9qzfz8s1gyj2ar9q2gf5346sgdv6jv8hj7aw0hpl2gs5f0s6b"; + sha256 = "j2e9xWBrozYGxryJbonefc2M9PykWfcTibG2/gdbXlQ="; }; # Python 2.x is not supported. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix index 5bcfb64a18..1616343f8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "gym"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = version; - sha256 = "sha256-0O/s9OVNGQmeX9j8B1x63RxdI6dhqfTEJcgDH2jtCv4="; + rev = "v${version}"; + sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c"; }; propagatedBuildInputs = [ 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 fcd2836214..13d38a14b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , hpack , hyperframe , pytestCheckHook @@ -11,24 +10,16 @@ buildPythonPackage rec { pname = "h2"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"; + sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs="; }; - patches = [ - # Workaround issues with hypothesis 6.6 - # https://github.com/python-hyper/h2/pull/1248 - (fetchpatch { - url = "https://github.com/python-hyper/h2/commit/0646279dab694a89562846c810202ce2c0b49be3.patch"; - sha256 = "1k0fsxwq9wbv15sc9ixls4qmxxghlzpflf3awm66ar9m2ikahiak"; - }) - ]; - propagatedBuildInputs = [ hpack hyperframe @@ -48,5 +39,6 @@ buildPythonPackage rec { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "http://hyper.rtfd.org/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix index 701b8f78f8..36b1322a88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -20,7 +20,8 @@ in buildPythonPackage rec { # avoid strict pinning of numpy postPatch = '' substituteInPlace setup.py \ - --replace "numpy ==" "numpy >=" + --replace "numpy ==" "numpy >=" \ + --replace "mpi4py ==" "mpi4py >=" ''; HDF5_DIR = "${hdf5}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ha-av/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ha-av/default.nix index af5f5f31ab..78735b67d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ha-av/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ha-av/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , pkg-config -, ffmpeg +, ffmpeg_4 }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; buildInputs = [ - ffmpeg + ffmpeg_4 ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix index e24f2fc096..9dc3193957 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix @@ -1,24 +1,32 @@ { buildPythonPackage, lib, fetchFromGitHub , requests, tqdm , nose, vcrpy +, pytestCheckHook }: buildPythonPackage rec { pname = "habanero"; - version = "0.7.4"; + version = "1.0.0"; # Install from Pypi is failing because of a missing file (Changelog.rst) src = fetchFromGitHub { owner = "sckott"; repo = pname; rev = "v${version}"; - sha256 = "1d8yj9xz5qabcj57rpjzvg0jcscvzrpb0739mll29nijbsaimfr1"; + sha256 = "0lhbd5c4sypcd65nh4cgxddsqrxwg89nn1qiii6m5l4fzsvblggv"; }; propagatedBuildInputs = [ requests tqdm ]; - checkInputs = [ nose vcrpy ]; - checkPhase = "make test"; + # almost the entirety of the test suite makes network calls + pytestFlagsArray = [ + "test/test-filters.py" + ]; + + checkInputs = [ + pytestCheckHook + vcrpy + ]; meta = { description = "Python interface to Library Genesis"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 3f8b2c1f81..249f0b2f30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.27.2"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-XBGA3wRZdl8rJ1hLLPPLK7E87Ggoly+kePbLY4x9/ZE="; + sha256 = "sha256-zYSJMP/uwgyIHdI8E7NHLaHrpAQeLpaEcXXXlzIO5ns="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index d1228fc0c5..2e3be091ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-qN7AXs4hJpuP+GaxjOPR2CqKMYyDJxTrCuE5HreZnhU="; + sha256 = "sha256-mTbNuER26BPQIjcmlpkdFNeBcNF1vTldaNpoEla0XbM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdlparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdlparse/default.nix deleted file mode 100644 index 4257f9b2e9..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdlparse/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "hdlparse"; - version = "1.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "fb6230ed1e7a04a8f82f8d3fb59791d0751ae35e5b8e58dbbf2cbcf100d0d0f2"; - }; - - #This module does not contain any tests. - doCheck = false; - - meta = with lib; { - homepage = "https://kevinpt.github.io/hdlparse/"; - description = "Rudimentary parser for VHDL and Verilog"; - license = licenses.mit; - maintainers = with maintainers; [ elliottvillars ]; - }; -} - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix index 39d970272b..08a5c8f08f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = pname; rev = version; - sha256 = "sha256-PnDsgTfr2F/fgbONP2qvuPhbw3X50AqriEmsFFjll2Y="; + sha256 = "sha256-VdvgrTZLFTtOu34lWxoPkHAI6Z2Me1/3xauQxzIBJNs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index 2a1cb87903..71752fede5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -5,7 +5,6 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonAtLeast , pythonOlder @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,18 +26,9 @@ buildPythonPackage rec { owner = "coreGreenberet"; repo = "homematicip-rest-api"; rev = version; - sha256 = "008snxx9ijpi1zr1pi1v4a6g74j821hyw0khs9lmi08v2mcabm36"; + sha256 = "sha256-j2ansly05auevlcDY5TFz6PZR/pNIGIbtkJuU8L5b0o="; }; - patches = [ - (fetchpatch { - # Drop loop kwarg from async_timeout.timeout - # https://github.com/coreGreenberet/homematicip-rest-api/pull/424 - url = "https://github.com/coreGreenberet/homematicip-rest-api/commit/90efb335667e3d462b7f9ef113d2e0b8bb4e96b4.patch"; - sha256 = "0f2bbs0666mf6sc7p4n8fwh29yjilkq36qf5pn0waf6iqdzxqwih"; - }) - ]; - propagatedBuildInputs = [ aenum aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix index ef029586be..111d7e00d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "html-sanitizer"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; rev = version; - sha256 = "sha256-ZPyGF7N+EZHfgqZfRQx4x1r83BMur+Zg2kdtVISn3I8="; + sha256 = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpagentparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpagentparser/default.nix index e0c9dd09bc..44c521ff33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpagentparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpagentparser/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "httpagentparser"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY="; + sha256 = "a190dfdc5e63b2f1c87729424b19cbc49263d6a1fb585a16ac1c9d9ce127a4bf"; }; # PyPi version does not include test directory diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix index ace9a7041e..8359fcf0a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix @@ -1,33 +1,65 @@ { lib +, brotlipy , buildPythonPackage +, decorator , fetchPypi , flask , flask-limiter -, markupsafe -, decorator , itsdangerous +, markupsafe , raven , six -, brotlipy +, pytestCheckHook }: buildPythonPackage rec { pname = "httpbin"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1yldvf3585zcwj4vxvfm4yr9wwlz3pa2mx2pazqz8x8mr687gcyb"; + hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; }; - propagatedBuildInputs = [ brotlipy flask flask-limiter markupsafe decorator itsdangerous raven six ]; + propagatedBuildInputs = [ + brotlipy + flask + flask-limiter + markupsafe + decorator + itsdangerous + raven + six + ]; - # No tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test_httpbin.py" + ]; + + disabledTests = [ + # Tests seems to be outdated + "test_anything" + "test_get" + "test_redirect_n_equals_to_1" + "test_redirect_n_higher_than_1" + "test_redirect_to_post" + "test_relative_redirect_n_equals_to_1" + "test_relative_redirect_n_higher_than_1" + ]; + + pythonImportsCheck = [ + "httpbin" + ]; meta = with lib; { + description = "HTTP Request and Response Service"; homepage = "https://github.com/kennethreitz/httpbin"; - description = "HTTP Request & Response Service"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index 99eb08a35a..79d979b10a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.14.3"; + version = "0.14.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo="; + sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix index b3ac17cf7f..40ef250401 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -3,29 +3,35 @@ , cryptography , fetchPypi , httpx -, ntlm-auth +, pyspnego +, pythonOlder }: buildPythonPackage rec { pname = "httpx-ntlm"; - version = "0.0.10"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "httpx_ntlm"; inherit version; - sha256 = "1rar6smz56y8k5qbgrpabpr639nwvf6whdi093hyakf0m3h9cpfz"; + sha256 = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ="; }; propagatedBuildInputs = [ cryptography httpx - ntlm-auth + pyspnego ]; # https://github.com/ulodciv/httpx-ntlm/issues/5 doCheck = false; - pythonImportsCheck = [ "httpx_ntlm" ]; + pythonImportsCheck = [ + "httpx_ntlm" + ]; meta = with lib; { description = "NTLM authentication support for HTTPX"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix index fac9ecba6c..3600e173f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "1wigmkhn4ymfr12z9vhdaimjcma9llicwrr29q0cc8xmy23f3445"; + sha256 = "11wnhx9nfsg5lsnlgh33zngyhc2klichpfrkwajbbyq95fdqj8ri"; }; propagatedBuildInputs = [ 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 543308a3fd..d479cc1f13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -1,11 +1,11 @@ { lib +, async_generator , buildPythonPackage , pythonOlder , fetchFromGitHub , brotlicffi , certifi , charset-normalizer -, h2 , httpcore , rfc3986 , sniffio @@ -20,24 +20,27 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.21.1"; + version = "0.21.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc="; + sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9"; }; propagatedBuildInputs = [ brotlicffi certifi charset-normalizer - h2 httpcore rfc3986 sniffio + ] ++ lib.optionals (pythonOlder "3.7") [ + async_generator ]; checkInputs = [ @@ -49,13 +52,21 @@ buildPythonPackage rec { uvicorn ]; - pythonImportsCheck = [ "httpx" ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "rfc3986[idna2008]>=1.3,<2" "rfc3986>=1.3" + ''; # testsuite wants to find installed packages for testing entrypoint preCheck = '' export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = [ # httpcore.ConnectError: [Errno 101] Network is unreachable "test_connect_timeout" @@ -71,6 +82,10 @@ buildPythonPackage rec { "tests/test_main.py" ]; + pythonImportsCheck = [ + "httpx" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix index 28a801de71..38c25fa1b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "huey"; - version = "2.2.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh"; + sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg"; }; propagatedBuildInputs = [ redis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix index 1bd1e6650c..332521d070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix @@ -39,7 +39,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \ - --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," + --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," \ + --replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7' ''; # tests require to clone quite a few firmwares diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix index 5f38428353..dc165f2b2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix @@ -8,6 +8,7 @@ , h2 , priority , mock +, poetry-core , pytest-asyncio , pytest-cov , pytest-sugar @@ -17,16 +18,21 @@ buildPythonPackage rec { pname = "Hypercorn"; - version = "0.11.2"; + version = "0.13.2"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchFromGitLab { owner = "pgjones"; repo = pname; rev = version; - sha256 = "0v80v6l2xqac5mgrmh2im7y23wpvz4yc2v4h9ryhvl88c2jk9mvh"; + sha256 = "sha256-fIjw5A6SvFUv8cU7xunVlPYphv+glypY4pzvHNifYLQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ wsproto toml h2 priority ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix index c282be29c6..719efb92d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix @@ -36,6 +36,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest-asyncio 0.17.0 compat + "--asyncio-mode=auto" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --timeout=9 --cov=hyperion" "" 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 9d9c6b6c91..89aac15317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -9,6 +9,7 @@ , pytest-xdist , sortedcontainers , tzdata +, pythonOlder }: buildPythonPackage rec { # https://hypothesis.readthedocs.org/en/latest/packaging.html @@ -18,14 +19,16 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.30.1"; + version = "6.35.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0nk57v03q7ss7dbsfd9gi3lzl6ngplk7axbiksm26dgkhh4swk8y"; + sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; @@ -35,8 +38,13 @@ buildPythonPackage rec { sortedcontainers ]; - checkInputs = [ pytestCheckHook pytest-xdist pexpect ] - ++ lib.optional (pythonAtLeast "3.9") tzdata; + checkInputs = [ + pexpect + pytest-xdist + pytestCheckHook + ] ++ lib.optional (pythonAtLeast "3.9") [ + tzdata + ]; inherit doCheck; @@ -45,10 +53,16 @@ buildPythonPackage rec { rm tox.ini ''; - pytestFlagsArray = [ "tests/cover" ]; + pytestFlagsArray = [ + "tests/cover" + ]; + + pythonImportsCheck = [ + "hypothesis" + ]; meta = with lib; { - description = "A Python library for property based testing"; + description = "Library for property based testing"; homepage = "https://github.com/HypothesisWorks/hypothesis"; license = licenses.mpl20; maintainers = with maintainers; [ SuperSandro2000 ]; 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 776ff77fce..3ce0f068fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, hypothesis, lark-parser, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, lark, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: buildPythonPackage rec { pname = "hypothesmith"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; - propagatedBuildInputs = [ hypothesis lark-parser libcst ]; + propagatedBuildInputs = [ hypothesis lark libcst ]; checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix index 5f03119797..340e3618be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix @@ -3,7 +3,7 @@ } : buildPythonPackage rec { - name = "i-pi"; + pname = "i-pi"; version = "2.4.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix index 82033321f8..aae5785fcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "3.0.2"; + version = "3.0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4aq89Nw55OL7JQx3Ra6Ppp5yKLdS6Lc0YA8UJxVhz84="; + sha256 = "sha256-EQyu7lV8F/U8cZklYYIMk9ut1FTcoBvGc8Ggx6JerDk="; }; propagatedBuildInputs = [ 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 da18e5a923..b4bd659f98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.5"; + version = "2.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VXQ9lyouwAuw2iGr1m/2KFklUFgmQOP2/gwInATKB4k="; + sha256 = "sha256-4pFkysb0gxgb1oYirTnvQgjEStJkzUn0Ktw33ZP7zA4="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix new file mode 100644 index 0000000000..b5010be728 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ilua/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonApplication +, fetchPypi +, jupyter_console +, jupyter_core +, pygments +, termcolor +, txzmq +}: + +buildPythonApplication rec { + pname = "ilua"; + version = "0.2.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-YxV6xC7GS5NXyMPRZN9YIJxamgP2etwrZUAZjk5PjtU="; + }; + + propagatedBuildInputs = [ + jupyter_console + jupyter_core + pygments + termcolor + txzmq + ]; + + # No tests found + doCheck = false; + + pythonImportsCheck = [ "ilua" ]; + + meta = with lib; { + description = "Portable Lua kernel for Jupyter"; + homepage = "https://github.com/guysv/ilua"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix index a249b2dbfe..6998ff330a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -3,7 +3,7 @@ , isPy3k , fetchPypi , substituteAll -, ffmpeg +, ffmpeg_4 , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./ffmpeg-path.patch; - ffmpeg = "${ffmpeg}/bin/ffmpeg"; + ffmpeg = "${ffmpeg_4}/bin/ffmpeg"; }) ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { ${python.interpreter} << EOF from imageio_ffmpeg import get_ffmpeg_version - assert get_ffmpeg_version() == '${ffmpeg.version}' + assert get_ffmpeg_version() == '${ffmpeg_4.version}' EOF runHook postCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 0a97a27d17..98495932fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , imageio-ffmpeg , numpy , pillow @@ -12,11 +13,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.13.2"; + version = "2.14.1"; disabled = isPy27; src = fetchPypi { - sha256 = "5b7a55d07de88a2fd70f18a1608ca05ba2b55596a942fb2c390240201009a6c3"; + sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg="; inherit pname version; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 9a6a59f6b8..58e3db524a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , pikepdf , pillow , stdenv @@ -26,6 +27,15 @@ buildPythonPackage rec { sha256 = "sha256-jlHFBD76lddRSBtRYHGgBvh8KkBZlhqaxD7COJFd4J8="; }; + patches = [ + # Disable tests broken by Pillow 9.0.0 + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/130#issuecomment-586 + (fetchpatch { + url = "https://salsa.debian.org/debian/img2pdf/-/raw/f77fefc81e7c4b235c47ae6777d222d391c59536/debian/patches/pillow9"; + sha256 = "sha256-8giZCuv5PzSbrBQqslNqiLOhgxbg3LsdBVwt+DWnvh4="; + }) + ]; + propagatedBuildInputs = [ pikepdf pillow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix new file mode 100644 index 0000000000..2ea3f01d2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, networkx +, pytestCheckHook +}: + +buildPythonPackage { + pname = "importlab"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "google"; + repo = "importlab"; + rev = "676d17cd41ac68de6ebb48fb71780ad6110c4ae3"; + sha256 = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE="; + }; + + propagatedBuildInputs = [ networkx ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "tests/test_parsepy.py" ]; + + pythonImportsCheck = [ "importlab" ]; + + meta = with lib; { + description = "A library that automatically infers dependencies for Python files"; + homepage = "https://github.com/google/importlab"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} 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 a607de5eb1..13b26e337a 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 @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.10.0"; + version = "4.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-kqi1jOc0sqRJSHjg7PfXnM16EotfxgFMQB4LYfAG8PY="; + hash = "sha256-lR8NiltyYOnbXkHUKShbX0UekoR58Z2AgYh4Un026V4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix index ca454d4323..a6c549b61f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "inflect"; - version = "5.3.0"; + version = "5.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; + sha256 = "sha256-tY1YxOc//KmyXgdcHE/Jyt7LtcmdfNnzze3ac+zoPBw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index 8ecd46e3b9..ec81f631ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , python-dateutil -, fetchFromGitHub +, fetchPypi , fetchpatch , mock , msgpack @@ -16,13 +16,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.3.0"; + version = "5.3.1"; - src = fetchFromGitHub { - owner = "influxdata"; - repo = "influxdb-python"; - rev = "v${version}"; - sha256 = "1jfkf53jcf8lcq98qc0bw5d1d0yp3558mh8l2dqc9jlsm0smigjs"; + src = fetchPypi { + inherit pname version; + sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26"; }; propagatedBuildInputs = [ @@ -41,14 +39,6 @@ buildPythonPackage rec { pandas ]; - patches = [ - (fetchpatch { - # Relaxes msgpack pinning - url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch"; - sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4"; - }) - ]; - disabledTests = [ # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas. # https://github.com/influxdata/influxdb-python/pull/845 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix index 84e381f0b8..dd2db106ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix @@ -1,30 +1,48 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, poetry-core + +# propagated +, blessed +, python-editor +, readchar + +# tests +, pytest-mock +, pytestCheckHook +, pexpect +}: buildPythonPackage rec { pname = "inquirer"; - version = "2.7.0"; + version = "2.9.1"; + format = "pyproject"; - # PyPi archive currently broken: https://github.com/magmax/python-inquirer/issues/106 src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; - rev = version; - sha256 = "152l5qjgkag8zkr69ax2i5s8xcac1qvyngisrplbnbzwbpf77d0d"; + rev = "v${version}"; + sha256 = "sha256:0vdly2k4i7bfcqc8zh2miv9dbpmqvayxk72qn9d4hr7z15wph233"; }; - propagatedBuildInputs = [ blessed python-editor readchar ]; + nativeBuildInputs = [ + poetry-core + ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "blessed==1.17.6" "blessed~=1.17" \ - --replace "readchar==2.0.1" "readchar>=2.0.0" - ''; + propagatedBuildInputs = [ + blessed + python-editor + readchar + ]; - checkInputs = [ pytest pytest-cov pexpect pytest-mock ]; - - checkPhase = '' - pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration - ''; + checkInputs = [ + pexpect + pytest-mock + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/magmax/python-inquirer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix new file mode 100644 index 0000000000..bc33a23891 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pydantic +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "intellifire4py"; + version = "0.9.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jeeftor"; + repo = pname; + rev = version; + hash = "sha256-cNWsKwXVlnZgPjkll1IaEhDHfHNvWCBY6U3B34IdHd0="; + }; + + propagatedBuildInputs = [ + aiohttp + pydantic + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Test file is missing + "test_json_files" + ]; + + pythonImportsCheck = [ + "intellifire4py" + ]; + + meta = with lib; { + description = "Module to read Intellifire fireplace status data"; + homepage = "https://github.com/jeeftor/intellifire4py"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index 1a34dfaf65..0827e61167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.6.0"; + version = "6.7.0"; src = fetchPypi { inherit pname version; - sha256 = "3a227788216b43982d9ac28195949467627b0d16e6b8af9741d95dcaa8c41a89"; + sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index 4c64fca34b..51b76fc532 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.3.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0a97b276c62db633e9e97a816282bdd166f9df74e28204f0c8fa54b71944cfdc"; + sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73"; }; buildInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 73ead288ee..cee9868cfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -3,65 +3,79 @@ , buildPythonPackage , fetchPypi , pythonOlder + # Build dependencies , glibcLocales -# Test dependencies -, nose -, pygments + # Runtime dependencies -, jedi -, decorator -, matplotlib-inline -, pickleshare -, traitlets -, prompt-toolkit -, pexpect , appnope , backcall +, black +, decorator +, jedi +, matplotlib-inline +, pexpect +, pickleshare +, prompt-toolkit +, pygments +, stack-data +, traitlets + +# Test dependencies +, pytestCheckHook +, testpath }: buildPythonPackage rec { pname = "ipython"; - version = "7.30.1"; - disabled = pythonOlder "3.7"; + version = "8.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "cb6aef731bf708a7727ab6cde8df87f0281b1427d41e65d62d4b68934fa54e97"; + sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb"; }; - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = [ glibcLocales ]; - - checkInputs = [ nose pygments ]; + buildInputs = [ + glibcLocales + ]; propagatedBuildInputs = [ - jedi + backcall + black decorator + jedi matplotlib-inline + pexpect pickleshare - traitlets prompt-toolkit pygments - pexpect - backcall - ] ++ lib.optionals stdenv.isDarwin [appnope]; + stack-data + traitlets + ] ++ lib.optionals stdenv.isDarwin [ + appnope + ]; LC_ALL="en_US.UTF-8"; - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "IPython" ]; + preCheck = '' + export HOME=$TMPDIR + + # doctests try to fetch an image from the internet + substituteInPlace pytest.ini \ + --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py" + ''; + + checkInputs = [ + pytestCheckHook + testpath + ]; + meta = with lib; { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix index 61fd8d269b..567c033e24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.8.1"; + version = "1.8.2"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566"; + sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A="; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix index 037a5f0520..3cd86abb0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "irctokens"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb"; + sha256 = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; }; checkInputs = [ pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix index f708391cba..d21f79b6ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.9.3"; + version = "5.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = version; - sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw="; + sha256 = "09spgl2k9xrprr5gbpfc91a8p7mx7a0c64ydgc91b3jhrmnd9jg1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix index c8a9efdb54..f4c52db722 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "janus"; - version = "0.7.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f10dcf5776e8d49cc30ec86d5eb7268eeec39abaa24fe0332ee8fb8fa3611845"; + sha256 = "df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612"; }; disabled = pythonOlder "3.6"; 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 index 46f2bfdff3..d45d354b38 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 @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.4.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9"; + sha256 = "b04f00bd4b3c4fc4ba5fe1baf8042c0efd192b13e386830ea23fff77bb69dc88"; }; pythonNamespaces = [ "jaraco" ]; 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 index 1316c2b4e7..73aa7708cf 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 @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "659a64743047d00c6ae2a2aa60573c62cfc0b4b70eaa14fa50c80360ada32aa8"; + sha256 = "31e0e93d1027592b7b0bec6ad468db850338981ebee76ba5e212e235f4c7dda0"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix index 334907bb2e..0af64fcf48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "jax"; - version = "0.2.27"; + version = "0.2.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "${pname}-v${version}"; - sha256 = "0r1rs1zn0nzf8wpy6g5wrn2yrgi12gg2i7l285ka5d8wczjnbq47"; + sha256 = "1ky442zi5i8b5mk284s0i7dk8rh6vi9dvyqfscpij88g37clgpp0"; }; patches = [ 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 f597eeacfc..52e673eb36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -16,19 +16,23 @@ { addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config , fetchurl, isPy39, lib, stdenv # propagatedBuildInputs -, absl-py, flatbuffers, scipy, cudatoolkit_11 +, absl-py, flatbuffers, scipy, cudatoolkit_11, cudnn # Options: , cudaSupport ? config.cudaSupport or false }: +# Note that these values are tied to the specific version of the GPU wheel that +# we fetch. When updating, try to go for the latest possible versions that are +# still compatible with the cudatoolkit and cudnn versions available in nixpkgs. assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1"; +assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5"; let device = if cudaSupport then "gpu" else "cpu"; in buildPythonPackage rec { pname = "jaxlib"; - version = "0.1.71"; + version = "0.1.75"; format = "wheel"; # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting @@ -36,14 +40,23 @@ buildPythonPackage rec { # version. disabled = !isPy39; + # Find new releases at https://storage.googleapis.com/jax-releases. src = { cpu = fetchurl { url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "sha256:0rqhs6qabydizlv5d3rb20dbv6612rr7dqfniy9r6h4kazdinsn6"; + sha256 = "1davmx9dvai8dq3h5ac82634gjhv6l46kq6baajrxjqczbp0w7m6"; }; gpu = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda111/jaxlib-${version}+cuda111-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "sha256:065kyzjsk9m84d138p99iymdiiicm1qz8a3iwxz8rspl43rwrw89"; + # Note that there's also a release targeting cuDNN 8.2, but unfortunately + # we don't yet have that packaged at the time of writing (02/03/2022). + # Check pkgs/development/libraries/science/math/cudnn/default.nix for more + # details. + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl"; + sha256 = "1mk618lq1q5x0dc3xbid8bim59l9j6l47xq232gdbn401ykrid7r"; + + # This is what the cuDNN 8.2 download looks like for future reference: + # url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl"; + # sha256 = "000mnm2masm3sx3haddcmgw43j4gxa3m4fcm14p9nb8dnncjkgpb"; }; }.${device}; @@ -71,7 +84,7 @@ buildPythonPackage rec { rpath=$(patchelf --print-rpath $file) # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to # /lib which is different from /lib. - patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file + patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib cudnn ]}" $file done ''; 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 c44bfda133..5318f2fd18 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.18.1"; + version = "1.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "0xzx32fnm39w916z8wm387ry480rbf7n9qppc18bjdv4jjwgf2rw"; + sha256 = "sha256-5GGY23MDsUbSC2tYGVqwwtFi5vnSldozMR4HuY+h+l4="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix index 6989c4257c..97e500eebc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "db57ee517356b1bfc1603ef412f5da61eae92241ba0bcaf0851028cae424780c"; + sha256 = "c685687e3f39e1b9a3ba9c00ed9d8e88603bc8994413e84623e6c5d43214e6f8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix index 546e56f702..a275b97310 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.8.9"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2"; + sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 89b9ba1f6d..bc5432cb6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.11.0"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "42ea423f44beafee0e985009124968e300447f6e3be4180e83568cf21520d1b1"; + sha256 = "sha256-gpsot4LW1IBfYt8eb72WJqMzWEAMt4gqWOD1KhTQjds="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix index c7d8207aa3..b22f5ccd73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "jira"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "pycontribs"; repo = pname; rev = version; - sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE="; + sha256 = "04s2zgwxip54g894hps2cm081cp07mbi7qipmsv4dvailhsg43nn"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix index dc096b93ae..09c41a7ede 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix @@ -19,10 +19,9 @@ buildPythonPackage rec { sha256 = "0hh4cmp93wjyidj48gh07vhx2kjvpwd23xvy79bsjn5qaaf6q4cm"; }; - # Wheel requires only `numpy`, but the import needs both `jax` and `jaxlib`. + # Wheel requires only `numpy`, but the import needs `jax`. propagatedBuildInputs = [ jax - jaxlib ]; pythonImportsCheck = [ @@ -30,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + jaxlib pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix index 2f7921374e..9f247c2d75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -18,20 +18,20 @@ buildPythonPackage rec { pname = "johnnycanencrypt"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; repo = "johnnycanencrypt"; rev = "v${version}"; - sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4"; + sha256 = "0b1yfddf38dicmjgnw9mk5g0iisa5yq6l9cj6kfskhyrznasvz3g"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit patches src; name = "${pname}-${version}"; - hash = "sha256-2XhXCKyXVlFgbcOoMy/A5ajiIVxBii56YeI29mO720U="; + hash = "sha256-1dRFC59GY7M99LvQWy2eXPesmLX5k46rN8l4suLYkQY="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix index c091480f63..036b60e9ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -1,28 +1,25 @@ { lib -, fetchPypi , buildPythonPackage , cryptography +, fetchPypi , pyopenssl -, setuptools -, mock , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "josepy"; - version = "1.11.0"; + version = "1.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "40ef59f2f537ec01bafe698dad66281f6ccf4642f747411647db403ab8fa9a2d"; + sha256 = "267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25"; }; - postPatch = '' - # remove coverage flags - sed -i '/addopts/d' pytest.ini - sed -i '/flake8-ignore/d' pytest.ini - ''; - propagatedBuildInputs = [ pyopenssl cryptography @@ -30,15 +27,23 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook ]; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --flake8 --cov-report xml --cov-report=term-missing --cov=josepy --cov-config .coveragerc" "" + sed -i '/flake8-ignore/d' pytest.ini + ''; + + pythonImportsCheck = [ + "josepy" + ]; + meta = with lib; { description = "JOSE protocol implementation in Python"; homepage = "https://github.com/jezdez/josepy"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix index 442267b52e..92c78895eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jpylyzer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "openpreserve"; repo = pname; rev = version; - sha256 = "01wfbb1bgby9b7m6q7483kvpyc1qhj80dg8d5a6smcxvmy8y6x5n"; + sha256 = "1cd9klq83g9p4nkg7x78axqid5vcsqzggp431hcfdiixa50yjxjg"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix index 3833bf9850..ed80bc9f81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "73ce588025495e6ebcda20bb9e64b6d9f3f1657c22895143ae243899ac710cbc"; + sha256 = "sha256-hqzixD8XtaZKOIh+3nLHuM4qsLz6ge4o/2Q06TUBCr4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix index d16fa89a97..4892d72aae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "jsonlines"; - version = "1.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "wbolster"; repo = pname; rev = version; - sha256 = "1f8zsqy8p9a41gqg2a5x7sppc5qhhq7gw58id2aigb270yxzs7jw"; + sha256 = "1242bvk208vjaw8zl1d7ydb0i05v8fwdgi92d3bi1vaji9s2hv65"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix index b78165fc4f..dd2a47f1bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -1,38 +1,59 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib , attrs -, functools32 +, buildPythonPackage +, fetchPypi , importlib-metadata -, mock -, nose +, importlib-resources , pyperf , pyrsistent +, pytestCheckHook +, pythonOlder , setuptools-scm , twisted -, vcversioner +, typing-extensions }: buildPythonPackage rec { pname = "jsonschema"; - version = "3.2.0"; + version = "4.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; + sha256 = "636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83"; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; - checkInputs = [ nose mock pyperf twisted vcversioner ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # zope namespace collides on py27 - doCheck = !isPy27; - checkPhase = '' - nosetests - ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + pyrsistent + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + checkInputs = [ + pyperf + pytestCheckHook + twisted + ]; + + pythonImportsCheck = [ + "jsonschema" + ]; meta = with lib; { - homepage = "https://github.com/Julian/jsonschema"; description = "An implementation of JSON Schema validation for Python"; + homepage = "https://github.com/Julian/jsonschema"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; }; 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 c3971c6875..b1389889b5 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 @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "2021.08.0"; + version = "2022.02.0"; pname = "jupyter-repo2docker"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; rev = version; - sha256 = "10hcdag7ivyqyiqrmr9c48zynp8d81ic3px1ffgnaysih7lvkwb6"; + sha256 = "sha256-L7jUaGRea5HJnb/SX2K2qfvtFwkq9jfhrpvsu+LHH3M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index a90fa0eb9a..66344e408a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -149,6 +149,8 @@ buildPythonPackage rec { "test_upgrade" # Testcase fails to find requests import "test_external_service" + # attempts to do ssl connection + "test_connection_notebook_wrong_certs" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index 46c76ebfe2..9d2907072e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.34.0"; + version = "0.34.1"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "3b9ee3a577834c0f021d41069be7b03068297ce0c2a73c76b17e8018eb3eb62f"; + sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9"; }; nativeBuildInputs = [ 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 92b341a591..26794fbc77 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 @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "1.0.2"; + version = "2.0.0b1"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "7885092b2b96bf189c3a705cc3c412a4472ec5e8382d0b47219a66cccae73cfa"; + sha256 = "1xinfk3bhqmfp9ygfpi8b87h4ky8dv3sdr96035psx1jjgyyw8bi"; }; nativeBuildInputs = [ 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 88c3d39ccf..3280e7ec28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.6"; + version = "3.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb"; + sha256 = "5e4e99868c4f385372686767781408acbb9004b690b198b45597ba869802334b"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index 777f82a3e5..368cc19fdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.13.5"; + version = "1.13.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "v${version}"; - sha256 = "0rapp2baqml1z3n8k7ijf5461b3p8wgr45y3njz54q75v0jk7v45"; + sha256 = "0xvc4i3wwycaqx16qylglywa14ky7mikdv1jm3p7yz19cq5hr0fx"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix index f7d4738ebc..d5a906dd73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -17,13 +17,13 @@ let in buildPythonPackage rec { pname = "kaldi-active-grammar"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "daanzu"; repo = pname; rev = "v${version}"; - sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY="; + sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk"; }; KALDI_BRANCH = "foo"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index ba7579d106..c89782d402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.10.0"; + version = "3.11.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "v${version}"; - sha256 = "0afrzxy8hmsvqp84mf89k7sqlzzyh6xwp2pz5abj0981mqlzf2x9"; + sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix index c1c67fd4c1..6c29a66252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -6,19 +6,26 @@ }: buildPythonPackage rec { - pname = "lark-parser"; - version = "0.12.0"; + pname = "lark"; + version = "1.0.0"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "sha256-zcMGCn3ixD3dJg3GlC/ijs+U1JN1BodHLTXZc/5UR7Y="; + sha256 = "0pfvjh4ydc49gs6m8b3ip85c8nd4da2bhz9714fwcyl3hdp33q7n"; }; # Optional import, but fixes some re known bugs & allows advanced regex features propagatedBuildInputs = [ regex ]; + pythonImportsCheck = [ + "lark" + "lark.parsers" + "lark.tools" + "lark.grammars" + ]; + checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix index 09232cbc62..0619a62fa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.6.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"; + sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4"; }; nativeBuildInputs = [ 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 a094bf6b37..f88e14d0a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.1.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "lektor"; repo = "lektor"; rev = version; - sha256 = "16qw68rz5q77w84lwyhjpfd3bm4mfrhcjrnxwwnz3vmi610h68hx"; + sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix index cb8f4c023b..c23b9df7cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3"; + sha256 = "sha256-zSFnXTuYWPjRs7FDKzYONoFFvtN4B+HxOwcRqozTkP0="; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 5b251f842b..7a7e116aa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -1,21 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytestCheckHook +, pkgs +}: buildPythonPackage rec { pname = "libtmux"; - version = "0.10.2"; + version = "0.10.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "a0e958b85ec14cdaabecfa738a0dd51846f05e5c5e9d6749a2bf5160b9f7e1d2"; + src = fetchFromGitHub { + owner = "tmux-python"; + repo = pname; + rev = "v${version}"; + hash = "sha256:0syj8m4x2mcq96b76b7h75dsmcai22m15pfgkk90rpg7rp6sn772"; }; - checkInputs = [ pytest ]; - postPatch = '' - sed -i 's/==.*$//' requirements/test.txt - ''; + nativeBuildInputs = [ + poetry-core + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pkgs.procps + pkgs.tmux + pytestCheckHook + ]; meta = with lib; { description = "Scripting library for tmux"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index f1b474b960..da84d890ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46"; + sha256 = "5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightwave2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightwave2/default.nix index 61bb86b8f7..f840a2186c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightwave2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "2f18ee4aba0431236a4c48a032de6714cfb56ff1e97c86d48cfe619eb961b21a"; + sha256 = "sha256-UULOQawsY2N0xxYlgIZKs8Xyl0XDqC6fSSKvo8ZBEcY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix index 4c4f7a3213..9a19dda157 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.6"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6c0a57b42647f1141f5a7a0a8479b49e4367c24937a01bd9d4063a595c2dd48a"; + sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index 7a4e93f9dd..0467790c29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.1.1.post1"; + version = "2022.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9p06yD95emBOFKtTZMVR/3ySAB24pB3QRmzVEnqeb9U="; + hash = "sha256-Jc11hS+WrRnjgYOUpc+GdkRoNV/DUJhQK6rI2lUkEIA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index e3b9e3bb7c..637a4deb3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.37.0"; + version = "0.38.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15"; + sha256 = "a99d166ccf3b116f3b9ed23b9b70ba2415640a9c978f3aaa13fad49c58f4965c"; }; nativeBuildInputs = [ llvm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix index 42cf477ca1..2004f96209 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix @@ -6,7 +6,6 @@ , emoji , fetchPypi , nose -, python , pythonOlder , pytz , requests @@ -46,7 +45,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck # Only coverage no real unit tests - ${python.interpreter} setup.py nosetests + nosetests runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix index 3c5bff1382..1a7982026b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.5.3"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"; + sha256 = "sha256-BmvQZ1jQpRPpg2/ZxrWnW/s/02hB9LmWvGC1R6MJ1Bw="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ @@ -30,19 +30,6 @@ buildPythonPackage rec { colorama ]; - patches = [ - # Fixes tests with pytest>=6.2.2. Will be part of the next release after 0.5.3 - (fetchpatch { - url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch"; - sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67"; - }) - # Fix tests with Python 3.9 - (fetchpatch { - url = "https://github.com/Delgan/loguru/commit/19f518c5f1f355703ffc4ee62f0e1e397605863e.patch"; - sha256 = "0yn6smik58wdffr4svqsy2n212fwdlcfcwpgqhl9hq2zlivmsdc6"; - }) - ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loo-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loo-py/default.nix index 16060c1c03..d16b06a284 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loo-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loo-py/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "loo-py"; - version = "2017.2"; + version = "2020.2"; src = fetchPypi { pname = "loo.py"; inherit version; - sha256 = "c656992de48b328cdaccd7d1f14eb522b9dd5a1d0d15f54623f4ab18fd219abc"; + sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix index 23ec7c33c2..8daee818d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.1.1"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bWBiM+u5wl9fWqL8k+R2IaYXSNnc4IxgWgUzyJVxkKk="; + sha256 = "sha256-UclKPuWcIa1nNFKqPIEnqlnJh0aXP50k2nMbHhT1aFs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index 51e3292a92..c78d5c7bae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.10"; + version = "4.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SOUOoVPrWc+NqXyBchtvtreufqSeQPJg+MgBr8n+U/Y="; + hash = "sha256-PmPl2P72K9VYby+Kkt4LOGXYPt7nhu43LEmuv4ha1yA="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix index 73ddb17cac..91e0303b4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.0.post1"; + version = "0.4.0.post2"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "1in9ibis91rlqmd7apbdp9c8y1mgnpm5bg6ldad8whx62nkkvwa3"; + sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 1aeaa04e17..9887f42bd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.26.1"; + version = "0.27.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d8525f74de51554b5c8491effe036f60629a426229befa33ff614c8569a16a73"; + sha256 = "1521b129564444648c523a38f6446c137f1aae5c9c7de1ec151d5ebf03fd407d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 31bf90f7f0..97b52855f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -7,7 +7,7 @@ , bubblewrap , exiftool , ffmpeg -, mime-types +, mailcap , wrapGAppsHook , gdk-pixbuf , gobject-introspection @@ -47,6 +47,11 @@ buildPythonPackage rec { ./executable-name.patch # hardcode path to mat2 executable ./tests.patch + # fix gobject-introspection typelib path for Nautilus extension + (substituteAll { + src = ./fix_poppler.patch; + poppler_path = "${poppler_gi}/lib/girepository-1.0"; + }) ]; postPatch = '' @@ -76,7 +81,7 @@ buildPythonPackage rec { install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps" install -Dm 444 doc/mat2.1 -t "$out/share/man/man1" install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions" - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $pythonPath $propagatedBuildInputs" patchPythonScript "$out/share/nautilus-python/extensions/mat2.py" '' + lib.optionalString dolphinIntegration '' install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/fix_poppler.patch b/third_party/nixpkgs/pkgs/development/python-modules/mat2/fix_poppler.patch new file mode 100644 index 0000000000..02bdbb6345 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/fix_poppler.patch @@ -0,0 +1,14 @@ +diff --git a/nautilus/mat2.py b/nautilus/mat2.py +index 11e6986..5a0e68f 100644 +--- a/nautilus/mat2.py ++++ b/nautilus/mat2.py +@@ -22,6 +22,9 @@ import gi + gi.require_version('Nautilus', '3.0') + gi.require_version('Gtk', '3.0') + gi.require_version('GdkPixbuf', '2.0') ++gi.require_version('GIRepository', '2.0') ++from gi.repository import GIRepository ++GIRepository.Repository.prepend_search_path('@poppler_path@') + from gi.repository import Nautilus, GObject, Gtk, Gio, GLib, GdkPixbuf + + from libmat2 import parser_factory diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 69721aeb82..12c7813ba4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -40,7 +40,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' + --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ + --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ # Remove after https://github.com/poljar/matrix-nio/pull/288 substituteInPlace pyproject.toml \ --replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"' 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 4d578a97c7..683b3c099e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.6"; + version = "0.14.10"; src = fetchPypi { inherit pname version; - sha256 = "46a87a8ee9e45e90c72e17ebb75190073e773f0890cfde7b81b0a36e15caec5d"; + sha256 = "sha256-mO0bKUepIjb50UKEOvFIaepHAskehkBajevsTRST8e4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix index 58670c49a9..a37e82a62d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.0"; + version = "8.1.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo="; + sha256 = "sha256-Dlqia+B7WJZlFGlIhgUWdND1qhSS/FOPoFH+uim6i8I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix index 7b4686dcac..5d7b53f77a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "md2gemini"; - version = "1.8.1"; + version = "1.9.0"; propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ]; checkInputs = [ pytestCheckHook ]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0mfa0f0m762168fbsxjr1cx9yhj82dr8z1d28jl6hj9bkqnvvwiy"; + sha256 = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix index 6bc9635a66..064d8a8d20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.4.3"; + version = "0.4.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = version; - sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8="; + sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix index e9b74d02b0..54f8431ba2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "4.4.6"; + version = "5.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0kv832s2vyff30zz8yqypw5jifwdanvh5x56d2bzkvy94h4jlddy"; + sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52"; }; propagatedBuildInputs = [ 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 9193d05906..c8df80596f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.76"; + version = "1.2.81"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-LQo7TwD91o9j/fJ5BTNV7WoCDFXnJVy1PDObH5FiNtk="; + sha256 = "sha256-ITE3gtcvXMisARlmnhlSzkZr/tGLiDq8aSO6d6jmlOw="; }; propagatedBuildInputs = [ 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 c157cd2a6b..2c78575d37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix @@ -20,12 +20,12 @@ }: buildPythonPackage rec { - version = "4.3.1"; + version = "5.1.0"; pname = "Mezzanine"; src = fetchPypi { inherit pname version; - sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3"; + sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265"; }; disabled = isPyPy || lib.versionOlder django.version "1.11" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mill-local/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mill-local/default.nix index 9d00bb71c8..003fbc974f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mill-local/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mill-local/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mill-local"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyMillLocal"; rev = version; - sha256 = "0q0frwj9yxdmqi5axl7gxirfflgn8xh1932c6lhp9my2v1d0gdrk"; + sha256 = "sha256-OKaR0hpNVBlaZrEmEmHxqRG1i03XP2Z4c7c35YIqe+I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix index ebd2b3f0b6..f242ac69c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.15"; + version = "0.2.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "20fae3cf1b329451eb3cba55d6b3c5b44501db5a23e49f47bc770e7461308672"; + sha256 = "sha256-yoPUTwpsk8wimN9DXFFz6ZJi1tI0uAVcfAi5BiwsfJM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix index 0de5077ebe..814a93e9c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mistletoe"; - version = "0.8.1"; + version = "0.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "468c6a42fd98b85e05b318033f63d76e02712e1ea1328a7ebcba7e47fb6f1e41"; + sha256 = "sha256-ouNU5lPym8r1WZ2JSFEhGaxgN+nC+O53851VRQ59Gmw="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix index 7aba4ade41..9610b735c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix @@ -1,7 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, nose, version, sha256 }: +{ lib, buildPythonPackage, fetchPypi, nose, version, sha256, format ? "setuptools" }: buildPythonPackage rec { - inherit version; + inherit version format; pname = "mistune"; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix index c7e7d6d54c..bb9d25d558 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix @@ -4,8 +4,9 @@ self: rec { sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; }; mistune_2_0 = self.callPackage ./common.nix { - version = "2.0.0rc1"; - sha256 = "1nd7iav1ixh9hlj4hxn6lmpava88d86ys8rqm30wgvr7gjlxnas5"; + version = "2.0.2"; + sha256 = "sha256-b8iMPLSduosWaHtBcl5mHPhXhMEuiXSim50zbdWWw6E="; + format = "pyproject"; }; mistune = mistune_0_8; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index 4692dc61c2..05fc6b4bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.17.3"; + version = "0.19.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = version; - sha256 = "1515wgmj5rhwpmky7apmmvys1630sfg534fai6559s13hp11pdcl"; + sha256 = "0qawzlzv4zf612n9n03fxnz6gxmzschq0ykh9dgv70l33ihmjbaw"; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix index afef1cb572..1a0b7ee907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.3"; + version = "3.10.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "82634f7d1a39f6a340ff9c7486e37bf3698e6510fdcfa7b378b5fbb256a42cda"; + sha256 = "831c23bf891c525828b7da49a358c6e0698481e4c8b3a61a69e87f36d06ef969"; }; propagatedBuildInputs = [ @@ -45,6 +45,8 @@ buildPythonPackage rec { pook ]; + # skip http tests + SKIP_TRUE_HTTP = true; pytestFlagsArray = [ # Requires a live Redis instance "--ignore=tests/main/test_redis.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix index 0f2f305c97..85e574f0b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mongomock"; - version = "3.23.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1pdh4pj5n6dsaqy98q40wig5y6imfs1p043cgkaaw8f2hxy5x56r"; + sha256 = "sha256-sYMsN0jUdETBiGc3PlzqdUwub2RKDPv9Zn8Xj2i97Pw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix index 36d798e550..16205286c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.12.1"; + version = "2022.1.12.1"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "0zcbdh7pqv4dq3fan0zh912w9bvmf2p0zj1fhp0ayhdsc50cwldh"; + sha256 = "11bp3zkmqffc6rqw93qfk8d905mzc10nqbjmvj2bay8h197q0dg2"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix index 2888ff1e06..9f6ca7e91a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61"; }; + postPatch = '' + # see comment on https://github.com/cmroche/moonraker-api/commit/e5ca8ab60d2839e150a81182fbe65255d84b4e4e + substituteInPlace setup.py \ + --replace 'name="moonraker-api",' 'name="moonraker-api",version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix index 6e9946cce1..9151bb736f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.5.10"; + version = "0.5.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = version; - sha256 = "0zz5ardnik370pdfpl77m0hln8rj7ikkvrkyc6fm0vd0w12sihmm"; + sha256 = "sha256-XvxEYOIYjr1NcviyQ6N8xHPCnUO+IgMKFsiRa5YnLDM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix index 4d9156349e..a998e7b74b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -6,6 +6,7 @@ , cfn-lint , docker , flask +, flask-cors , freezegun , jinja2 , jsondiff @@ -24,15 +25,16 @@ , idna , nose , pytestCheckHook +, pytest-xdist }: buildPythonPackage rec { pname = "moto"; - version = "1.3.16"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0zy0prsyip264i6h03lxsn1qg1n3dc8c4iyfawckjqvm24gnns3c"; + sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k="; }; postPatch = '' @@ -42,22 +44,6 @@ buildPythonPackage rec { --replace "MarkupSafe<2.0" "MarkupSafe" \ ''; - patches = [ - # Remove dependence on boto. The boto library (long ago superseded by boto3) - # has not had an official release in over two years or even a commit in the - # last 18 months. These patches should be included in the next moto release - # after 1.3.16 - (fetchpatch { - url = "https://github.com/spulec/moto/pull/3503/commits/ae85c539fd57034c4d5cfd0f95af41ff19862dd1.patch"; - sha256 = "16hr2py6q701d8ih6zcvs3lbanshpbk15ixckgdqngjf160k5m9p"; - excludes = ["tests/test_ec2/test_ec2_cloudformation.py"]; - }) - (fetchpatch { - url = "https://github.com/spulec/moto/pull/3468/commits/6ee39bd7fda4d3623569e10dcd9561bf2cd1d0bd.patch"; - sha256 = "10m3xdqxgys7spav9mkbhcn4z0124rlprwxnw6ysb10610xlna0i"; - }) - ]; - propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -80,8 +66,15 @@ buildPythonPackage rec { idna ] ++ lib.optionals isPy27 [ backports_tempfile ]; - # Next release after 1.3.16 will not require `nose` - checkInputs = [ boto3 nose freezegun pytestCheckHook sure parameterized ]; + checkInputs = [ + boto3 + flask-cors + freezegun + parameterized + pytestCheckHook + pytest-xdist + sure + ]; # Multiple test files still import boto, rather than boto3 like # boto is long-deprecated and broken on python3.9 @@ -89,6 +82,7 @@ buildPythonPackage rec { # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700 pytestFlagsArray = [ + "-n $NIX_BUILD_CORES" "--ignore=tests/test_awslambda/test_policy.py" "--ignore=tests/test_autoscaling/test_autoscaling.py" "--ignore=tests/test_autoscaling/test_cloudformation.py" @@ -226,6 +220,12 @@ buildPythonPackage rec { "--ignore=tests/test_swf/responses/test_timeouts.py" "--ignore=tests/test_swf/responses/test_workflow_executions.py" "--ignore=tests/test_swf/responses/test_workflow_types.py" + # attempts web connections + "--ignore=tests/test_appsync/test_appsync_schema.py" + "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py" + "--ignore=tests/test_awslambda/test_lambda_invoke.py" + "--ignore=tests/test_batch/test_batch_jobs.py" + "--ignore=tests/**/*_integration.py" ]; disabledTests = [ @@ -256,6 +256,14 @@ buildPythonPackage rec { "test_get_records_seq" "test_stream_with_range_key" "test_create_notebook_instance_bad_volume_size" + "http_destination" + "test_invoke_function_from_sqs_exception" + "test_state_machine_list_executions_with_pagination" + "test_put_subscription_filter_with_lambda" + "test_create_custom_lambda_resource__verify_cfnresponse_failed" + "test_state_machine_creation_fails_with_invalid_names" + # needs graphql + "test_get_schema_creation_status" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix index 8d17d8b3b0..282d4a71c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpd2/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.4"; + version = "3.0.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs"; + sha256 = "sha256-bxv/2TuaMvwBipu/NIdQW1Lg11fsNAZpBcYKkS1JI4Q="; }; buildInputs = [ mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index 6e8fd896d9..aa5a74c2cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -2,19 +2,13 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.0.3"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"; + sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg="; }; - patches = [ (fetchpatch { - name = "disable-broken-test"; # upstream patch - url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch"; - sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx"; - })]; - passthru = { inherit mpi; }; 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 fa2fa87d0e..e511ab1004 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multiset"; - version = "2.1.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; + sha256 = "e45671cae8385a8e6248a9b07a3a83280c2d0cc4312713058cfbacdc5ec9973e"; }; buildInputs = [ setuptools-scm pytest-runner ]; 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 0a82522345..b47c6701a0 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 @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "5.5.0"; + version = "6.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-cFe8d6w28VFTNyj/ABWHkFQDfnM4aTrNZ+WUw5g8H5I="; + sha256 = "1krsh8pmxigpzz21gvsy7qnpnwfkyyjbz92bqp9iflf7kklfhb79"; }; nativeBuildInputs = [ 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 e7aa7de0c9..54829a6790 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,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.28"; + version = "1.20.35.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "85ac23d06f9d0d794f60041b4c4f271d2bb8f5a83375c963e4a9e73e51ba9ca5"; + sha256 = "e576fa0f3d1ea9ce53ad620ee565962687cdae5d8f1f8414db0669aed788836c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix index fdcfed839c..9fe1fa8abe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "2.10"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1fed214e16351b09946770794a321a818abb744078b1d863a479da070028684c"; + sha256 = "558dcc390290e43c7def0d4238cc41a79abde06ff509b3014c3dff0553c7b0c1"; }; propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix index 6b6e889b5d..fab05cd4ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix @@ -1,31 +1,45 @@ { lib , buildPythonPackage -, twine -, numpy -, pytest , fetchPypi +, numpy +, pytestCheckHook +, pythonOlder +, twine }: buildPythonPackage rec { pname = "nagiosplugin"; - version = "1.3.2"; + version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1vr3zy0zfvbrqc4nf81zxv4gs2q82sv5sjamdm4573ld529mk2nv"; + hash = "sha256-vOr67DWfAyOT3dVgrizI0WNhODPsY8k85xifhZBOU9Y="; }; - nativeBuildInputs = [ twine ]; - checkInputs = [ pytest numpy ]; + nativeBuildInputs = [ + twine + ]; - checkPhase = '' - # this test relies on who, which does not work in the sandbox - pytest -k "not test_check_users" tests/ - ''; + checkInputs = [ + numpy + pytestCheckHook + ]; + + disabledTests = [ + # Test relies on who, which does not work in the sandbox + "test_check_users" + ]; + + pythonImportsCheck = [ + "nagiosplugin" + ]; meta = with lib; { - description = "A Python class library which helps with writing Nagios (Icinga) compatible plugins"; - homepage = "https://github.com/mpounsett/nagiosplugin"; + description = "Python class library which helps with writing Nagios (Icinga) compatible plugins"; + homepage = "https://github.com/mpounsett/nagiosplugin"; license = licenses.zpl21; maintainers = with maintainers; [ symphorien ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix index 9d36c73bc3..63e795f98c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "bbd4831c72426757ec59674a1aad29c40bf411358a6d6e1cdd68002cbcb90d08"; + sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM="; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-nats-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix similarity index 56% rename from third_party/nixpkgs/pkgs/development/python-modules/asyncio-nats-client/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index 46dbcdbacd..f87eb269da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-nats-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -9,15 +9,17 @@ }: buildPythonPackage rec { - pname = "asyncio-nats-client"; - version = "0.11.5"; - disabled = pythonOlder "3.6"; + pname = "nats-py"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.py"; rev = "v${version}"; - sha256 = "0zwiijaswmfdk71diqmdpb6nx54fmgi8hy0vwx2m3ihhsyjxj82h"; + hash = "sha256-BraT30J7OIcW2NXAwjcg9PYu+kgf8f1iDjKiN9J6l7Y="; }; propagatedBuildInputs = [ @@ -38,12 +40,24 @@ buildPythonPackage rec { disabledTests = [ # RuntimeError: Event loop is closed "test_subscribe_no_echo" - "test_reconnect_to_new_server_with_auth" - "test_drain_connection" - "test_discover_servers_on_first_connect" + "test_publish" + "test_publish_verbose" + "test_fetch_max_waiting_fetch_one" + "test_fetch_n" + "test_consumer_management" + "test_ephemeral_subscribe" + "test_queue_subscribe_deliver_group" + "test_subscribe_push_bound" + "test_double_acking_subscribe" + "test_flow_control" + "test_ordered_consumer" + "test_ordered_consumer_single_loss" + "test_kv_simple" ]; - pythonImportsCheck = [ "nats.aio" ]; + pythonImportsCheck = [ + "nats" + ]; meta = with lib; { description = "Python client for NATS.io"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix index 0e6630281c..2c062d3ff9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, python , notebook , pythonOlder , jupyter_server @@ -10,19 +11,26 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.3.1"; + version = "0.3.5"; disabled = pythonOlder "3.6"; # tests only on github src = fetchFromGitHub { owner = "jupyterlab"; repo = pname; - rev = version; - sha256 = "sha256-gx086w/qYB02UFEDly+0mUsV5BvAVAuhqih4wev2p/w="; + rev = "v${version}"; + sha256 = "1d0x7nwsaw5qjw4iaylc2sxlpiq3hlg9sy3i2nh7sn3wckwl76lc"; }; propagatedBuildInputs = [ jupyter_server notebook ]; + preCheck = '' + cd nbclassic + mv conftest.py tests + cd tests + + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; checkInputs = [ pytestCheckHook pytest-tornasync diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index c10b442bac..c5e3facc06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.9"; - disabled = pythonOlder "3.6"; + version = "0.5.10"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-meRt2vrNC4YSk78kb+2FQKGErfo6p9ZB+JAx7AcHAeA="; + sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088"; }; inherit doCheck; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index 400d59272e..ab91f22acc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.3.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a"; + sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5"; }; # Add $out/share/jupyter to the list of paths that are used to search for 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 a7c5425963..7d1d827cc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32"; + sha256 = "8b55333e2face27bc7ff80c266c468ca5633947cb0697727348020dd445b0874"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nengo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nengo/default.nix index 566540a4c9..c422278c83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nengo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nengo/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "nengo"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nengo"; repo = "nengo"; rev = "v${version}"; - sha256 = "1wkayimf2jqkbr6piikh5zd6yw8gf2qv4v4bfrprs4laa6wzh2qh"; + sha256 = "12lz8lzirxvwnpa74k9k48c64gs6gi092928rh97siya3i6gjs6i"; }; propagatedBuildInputs = [ numpy ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix index 91195abce1..60f5fcde63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.2.1"; + version = "3.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4d2ff9426b740011a1c916b54fc25da9348282e727eaa2ea163f42e00f1fc29e"; + sha256 = "sha256-sNzBdLMEBc6ej+weqzy7sg9cXkkgl2wIsi4FC3wST5Q="; }; propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix index 27e17daa37..9beeb4cb0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,7 @@ -{ fetchPypi, buildPythonPackage, lib, isPy3k +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , click , joblib , regex @@ -6,13 +9,16 @@ }: buildPythonPackage rec { - version = "3.6.7"; pname = "nltk"; + version = "3.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "51bf1aef5304740a708be7c8e683f7798f03dc5c7a7e7feb758be9e95f4585e3"; + hash = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI="; }; propagatedBuildInputs = [ @@ -30,10 +36,14 @@ buildPythonPackage rec { # best. doCheck = false; - meta = { + pythonImportsCheck = [ + "nltk" + ]; + + meta = with lib; { description = "Natural Language Processing ToolKit"; homepage = "http://nltk.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ lheckemann ]; + license = licenses.asl20; + maintainers = with maintainers; [ lheckemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix index 456bbfd9ae..451c71897d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix @@ -14,6 +14,19 @@ buildPythonPackage rec { sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; }; + # 2to3 was removed in setuptools 58 + postPatch = '' + substituteInPlace setup.py \ + --replace "'use_2to3': True," "" + + substituteInPlace setup3lib.py \ + --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" + ''; + + preBuild = '' + 2to3 -wn nose functional_tests unit_tests + ''; + propagatedBuildInputs = [ coverage ]; doCheck = false; # lot's of transient errors, too much hassle diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix index 1cb5f1b757..7a1902cb21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.6"; + version = "6.4.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7bcdf79bd1cda534735bd9830d2cbedab4ee34d8fe1df6e7b946b3aab0902ba3"; + sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a"; }; LC_ALL = "en_US.utf8"; 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 c45419c5c8..8bead014e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.54.1"; + version = "0.55.0"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "f9dfc803c864edcc2381219b800abf366793400aea55e26d4d5b7d953e14f43f"; + sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix index 31b529c83d..ffc422e9b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, python , numpy +, packaging +, python +, pythonOlder }: buildPythonPackage rec { pname = "numexpr"; - version = "2.8.0"; + version = "2.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9fec076b76c90a5f3929373f548834bb203c6d23a81a895e60d0fe9cca075e99"; + hash = "sha256-zXeapE3ZhsTvEBY1GSOWArAnvgalJ5RmViB6zx9YETs="; }; - # Remove existing site.cfg, use the one we built for numpy. - preBuild = '' - ln -s ${numpy.cfg} site.cfg - ''; - nativeBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy + packaging ]; + preBuild = '' + # Remove existing site.cfg, use the one we built for numpy + ln -s ${numpy.cfg} site.cfg + ''; + checkPhase = '' runtest="$(pwd)/numexpr/tests/test_numexpr.py" pushd "$out" @@ -34,9 +40,14 @@ buildPythonPackage rec { popd ''; - meta = { + pythonImportsCheck = [ + "numexpr" + ]; + + meta = with lib; { description = "Fast numerical array expression evaluator for NumPy"; homepage = "https://github.com/pydata/numexpr"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with 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 945828fbc1..2fbe1a7a69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,19 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.4"; + + # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so + # build both to verify they don't break. + # https://github.com/scipy/scipy/issues/15414 + version = "1.21.5"; + format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"; + sha256 = "sha256-alkovGJBJk3OXtUJ5m8zZ2/Jf0ZOepGe3GcvtVMiIe4="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index 8c4c8e1fbc..f4cc9d3140 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.5.2"; + version = "1.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "12703306872404be556648ab2282dc1566f4e77bfb9f14747fb13294c9235081"; + sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix index 5926848b5a..da0a70aafb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "objax"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "objax"; rev = "v${version}"; - sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42"; + sha256 = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ="; }; # Avoid propagating the dependency on `jaxlib`, see 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 2278133582..b262f4b84d 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.53.1"; + version = "2.54.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-TnLKT/F36jHEfT9K6DFM2GmPRccXz1GJWIF+EEQYRls="; + hash = "sha256-LTfJSlVT4I00ftshU0mbtxzy92G8lOmQiKMTMC+ZFHk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix index e2dd2f4bf9..de64e2f8fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "od"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "180fb0d13c3af1384047b8296c95683816b5d0c68a60c22d07c703be8bd755cb"; + sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; # repeated_test no longer exists in nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix index 54c5c6c165..76019730eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0" + ''; + disabledTests = [ # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index 8c922413ca..3c557eabb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.13.0"; + version = "0.14.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-y1ewaVwCcJGACwupGoh7zcKxE9qVXRjMf7k3q/hFhDE="; + sha256 = "sha256-AFfbMeYxdZaIABhf4XpszhLvFuMJebhl07sv9kuiknA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix index 18e357c1f2..8251c2cd01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core , pytestCheckHook , isodate , jsonschema @@ -13,13 +14,20 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.1.5"; + version = "0.2.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "a4b2712020284cee880b4c55faa513fbc2f8f07f365deda6098f8ab943c9f0df"; + src = fetchFromGitHub { + owner = "p1c2u"; + repo = pname; + rev = version; + sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix index 2e44c3756e..616d69d389 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix @@ -21,8 +21,6 @@ buildPythonApplication (common // rec { disabled = !isPy3k; - sourceRoot = "source/daemon"; - outputs = [ "out" "man" ]; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; @@ -37,6 +35,10 @@ buildPythonApplication (common // rec { setproctitle ]; + prePatch = '' + cd daemon + ''; + postPatch = '' substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix index 6832266b87..5cc7eef653 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, numpy +, pytestCheckHook }: buildPythonPackage rec { pname = "opensimplex"; - version = "0.3"; + version = "0.4.2"; src = fetchFromGitHub { owner = "lmas"; repo = pname; rev = "v${version}"; - sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; + sha256 = "zljS0yu3cHF2Vz3rFkwLXiHnKjo970MDIrC/56FoHa4="; }; - checkInputs = [ nose ]; - checkPhase = '' - nosetests tests/ - ''; + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/test_opensimplex.py" ]; pythonImportsCheck = [ "opensimplex" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix new file mode 100644 index 0000000000..797a524e01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dulwich +, pbr +, sphinx +}: + +buildPythonPackage rec { + pname = "openstackdocstheme"; + version = "2.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-zzWgAozJrYMFyGWzoDLYbeoY+IPlgzmVhnX7lgM6BXs="; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ dulwich pbr sphinx ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "openstackdocstheme" ]; + + meta = with lib; { + description = "Sphinx theme for RST-sourced documentation published to docs.openstack.org"; + homepage = "https://github.com/openstack/openstackdocstheme"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} 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 bf0383fa15..6a3b6a9d3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix @@ -22,10 +22,11 @@ buildPythonPackage rec { sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ absl-py chex - jaxlib numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix index cc89f31248..b4d1c8fb88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , asn1crypto , fetchPypi @@ -35,6 +36,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "oscrypto" ]; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Encryption library for Python"; homepage = "https://github.com/wbond/oscrypto"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index dd2d69a0c2..a2e6eac8e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -10,7 +10,7 @@ , pbr , pyinotify , python-dateutil -, stestr +, pytestCheckHook }: buildPythonPackage rec { @@ -36,12 +36,13 @@ buildPythonPackage rec { checkInputs = [ oslotest - stestr + pytestCheckHook ]; - checkPhase = '' - stestr run - ''; + disabledTests = [ + # not compatible with sandbox + "test_logging_handle_error" + ]; pythonImportsCheck = [ "oslo_log" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix index 1db266e116..865bd45c61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix @@ -5,6 +5,7 @@ , future , numpy , qdldl +, setuptools-scm , scipy # check inputs , pytestCheckHook @@ -13,14 +14,16 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post0"; + version = "0.6.2.post5"; src = fetchPypi { inherit pname version; - sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc"; + sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61"; }; - nativeBuildInputs = [ cmake ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ cmake setuptools-scm ]; dontUseCmakeConfigure = true; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix index 42615fa664..e8a7840d31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ovoenergy"; - version = "1.1.12"; + version = "1.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "1430k699gblxwspsbgxnha8afk6npqharhz2jyjw5gir9pi6g9cz"; + sha256 = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix index d1530c7971..af28ea45a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix @@ -1,8 +1,11 @@ { lib , aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub , poetry-core +, pytest-asyncio +, pytestCheckHook , pythonOlder , yarl }: @@ -21,6 +24,12 @@ buildPythonPackage rec { sha256 = "1ciaclgq4aknldjqlqa08jcab28sbqrjxy5nqqwlnb2wlprg5ijz"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' \ + --replace 'addopts = "--cov"' "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -30,8 +39,11 @@ buildPythonPackage rec { yarl ]; - # Project has no tests - doCheck = false; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "p1monitor" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix index 564a08b4eb..7af22d0ddd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "c01fbaf62ad2eb791e97158d1f30349e830bee2dd3e9503a87f6c3ffae8d1cf0"; + sha256 = "sha256-1D22r2o1AJnjLp4F5zcBPQQJKHt2H6WcWKA+VdvDZIo="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 880a5afdce..536f883f29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.4"; + version = "1.3.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc"; + sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1"; }; nativeBuildInputs = [ cython ]; 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 83e4a9f6f7..5c30e14db7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "349aecd526c15c39f73a08df836467e2fead877c474d82c7df349f27ad272525"; + sha256 = "be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix index 1805172f4d..d117c8eb8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -1,66 +1,121 @@ -{ lib, buildPythonPackage, fetchFromGitHub, xdg-utils -, requests, filetype, pyparsing, configparser, arxiv2bib -, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser -, click, python-slugify, habanero, isbnlib, typing-extensions -, prompt-toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pytest-cov -#, optional, dependencies -, whoosh, pytest +{ lib , stdenv +, arxiv2bib +, beautifulsoup4 +, bibtexparser +, buildPythonPackage +, chardet +, click +, colorama +, configparser +, fetchFromGitHub +, filetype +, habanero +, isbnlib +, lxml +, prompt-toolkit +, pygments +, pyparsing +, pytestCheckHook +, python-doi +, python-slugify +, pythonAtLeast +, pythonOlder +, pyyaml +, requests +, stevedore +, tqdm +, typing-extensions +, whoosh +, xdg-utils }: buildPythonPackage rec { pname = "papis"; version = "0.11.1"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Missing tests on Pypi src = fetchFromGitHub { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "0bbkjyw1fsvvp0380l404h2lys8ib4xqga5s6401k1y1hld28nl6"; + hash = "sha256-hlokGoXBhxkAMbqohztZEWlPBSSAUIAGuHtrF7iXcy0="; }; propagatedBuildInputs = [ - requests filetype pyparsing configparser arxiv2bib - pyyaml chardet beautifulsoup4 colorama bibtexparser - click python-slugify habanero isbnlib - prompt-toolkit pygments typing-extensions - stevedore tqdm lxml + arxiv2bib + beautifulsoup4 + bibtexparser + chardet + click + colorama + configparser + filetype + habanero + isbnlib + lxml + prompt-toolkit + pygments + pyparsing python-doi - # optional dependencies + python-slugify + pyyaml + requests + stevedore + tqdm + typing-extensions whoosh ]; postPatch = '' substituteInPlace setup.py \ - --replace "lxml<=4.3.5" "lxml~=4.3" \ - --replace "isbnlib>=3.9.1,<3.10" "isbnlib~=3.9" \ - --replace "python-slugify>=1.2.6,<4" "python-slugify" + --replace "isbnlib>=3.9.1,<3.10" "isbnlib>=3.9" + substituteInPlace setup.cfg \ + --replace "--cov=papis" "" ''; - doCheck = !stdenv.isDarwin; + # Tests are failing on Python > 3.9 + doCheck = !stdenv.isDarwin && !(pythonAtLeast "3.10"); checkInputs = ([ - pytest pytest-cov + pytestCheckHook ]) ++ [ xdg-utils ]; - # most of the downloader tests and 4 other tests require a network connection - # test_export_yaml and test_citations check for the exact output produced by pyyaml 3.x and - # fail with 5.x - checkPhase = '' - HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \ - -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url \ - and not test_validate_arxivid and not test_downloader_getter and not match" + preCheck = '' + export HOME=$(mktemp -d); ''; - meta = { + pytestFlagsArray = [ + "papis tests" + ]; + + disabledTestPaths = [ + "tests/downloaders" + ]; + + disabledTests = [ + "get_document_url" + "match" + "test_doi_to_data" + "test_downloader_getter" + "test_general" + "test_get_data" + "test_validate_arxivid" + "test_yaml" + ]; + + pythonImportsCheck = [ + "papis" + ]; + + meta = with lib; { description = "Powerful command-line document and bibliography manager"; - homepage = "https://papis.readthedocs.io/en/latest/"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ nico202 teto ]; + homepage = "https://papis.readthedocs.io/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nico202 teto ]; }; } 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 d271111d58..d7be0348d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.9.1"; + version = "2.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-of3e07VfYdIzieT+UtmuQolgrJWNLt9QNz+qXYkm7dA="; + sha256 = "944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patrowl4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patrowl4py/default.nix index 3dc1fc038b..22de8feb0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patrowl4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patrowl4py/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "patrowl4py"; - version = "1.1.7"; + version = "1.1.9"; src = fetchFromGitHub { owner = "Patrowl"; repo = "Patrowl4py"; rev = version; - sha256 = "19r9ym31bcaxcrv35gnfx5k8mn5lyascqzdr312rzc7ikbhcj73s"; + sha256 = "sha256-ZGvntLbXIWmL0WoT+kQoNT6gDPgsSKwHQQjYlarvnKo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix index 11d677e110..aa99d5f23f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.9.4"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c="; + sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29"; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix index e39993194a..436192e18b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.6.0"; + version = "4.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; repo = pname; rev = version; - sha256 = "0xrz0cmjyaylr81rmy5i3qbp4ms1iwh0gpb07q1dwljffb8xzbhr"; + sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep257/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep257/default.nix index c168e087fc..d6205fc6e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep257/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep257/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pep257"; - version = "0.7.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "GreenSteam"; repo = "pep257"; rev = version; - sha256 = "sha256-RkE9kkNkRTmZ8zJVwQzMsxU1hcjlxX6UA+ehnareynQ="; + sha256 = "0hcf3nyvzl8kd6gmc9qsiigz7vpwrjxcd1bd50dd63cad87qqicg"; }; checkInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix index 90dc504619..ad58cdb72d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix @@ -2,11 +2,12 @@ , buildPythonPackage , fetchPypi , flit-core -, toml +, tomli , pythonOlder , importlib-metadata , zipp , pytestCheckHook +, setuptools , testpath , mock , pip @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.9.1"; + version = "0.12.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"; + sha256 = "931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0"; }; nativeBuildInputs = [ @@ -27,18 +28,24 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - toml + tomli ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata zipp ]; checkInputs = [ pytestCheckHook + setuptools testpath mock pip ]; + disabledTests = [ + "test_setup_py" + "test_issue_104" + ]; + preCheck = '' rm pytest.ini # wants flake8 rm tests/test_meta.py # wants to run pip 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 af653ed0c8..ca8f867e6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , dufte , matplotlib , numpy @@ -13,16 +14,20 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.8"; + version = "0.9.13"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = version; - sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d"; + rev = "v${version}"; + sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6"; }; - format = "pyproject"; + + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ dufte @@ -44,5 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/nschloe/perfplot"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; + broken = true; # missing matplotx dependency }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 4383602608..bb275b0e0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.56"; + version = "2.1.62"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "8dfb7ef551cc9d3d03a6e2dc1b1ba6183cd94f3cde7431836f017d60cc992d53"; + sha256 = "b69743e72c879b2d145560fc0a52ff57e7db6e7ca657c3db50e5845e46294783"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index f61a0c5932..57c9f77f1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.23.0"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pBPgAUE0KBOiykfot7BUn/M4zKAryBkHa21w8S11XHk="; + sha256 = "sha256-BsawsGjQfONm97ztrfdqC12mph+GMCyMr/aQt/xd/ts="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix index 54a8166438..29f7266b69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { pname = "phonemizer"; - version = "2.2.2"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ae252f0bc7633e172b08622f318e7e112cde847e9281d4675ea7210157325146"; + sha256 = "1b4ea53b8da9a156361dff1d0c04ac1a8e65e6966d1cb9a8147c200960b32296"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 44f4dda6b1..fbd22e7f39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.41"; + version = "8.12.42"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f477da623a51cba084567d6a67b1882a8aaaf3e7beadad655f8613a8f887ac62"; + sha256 = "sha256-i1SHHtZOz85JSgeOnVazY8I+JMWRbf2J6EuYWhiVW+4="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pijuice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pijuice/default.nix index f46ddfca1b..59f898f790 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pijuice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pijuice/default.nix @@ -14,10 +14,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PiSupply"; repo = "PiJuice"; - # rev hash retrieved from the latest modification on file Software/Source/VERSION, as this project - # does not use Github tags facility - rev = "3ba6719ab614a3dc7495d5d9c900dd4ea977c7e3"; - sha256 = "GoNN07YgVaktpeY5iYDbfpy5fxkU1x0V3Sb1hgGAQt4="; + # Latest commit that fixes using the library against python 3.9 by renaming + # isAlive() to is_alive(). The former function was removed in python 3.9. + rev = "e2dca1f8dcfa12e009952a882c0674a545d193d6"; + sha256 = "07Jr7RSjqI8j0tT0MNAjrN1sjF1+mI+V0vtKInvtxj8="; }; patches = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { ]; PIJUICE_BUILD_BASE = 1; + PIJUICE_VERSION = version; preBuild = '' cd Software/Source @@ -50,7 +51,10 @@ buildPythonPackage rec { rm $out/bin/pijuice_sys.py rm $out/bin/pijuiceboot mv $out/bin/pijuice_cli.py $out/bin/pijuice_cli - ''; + ''; + + # no tests + doCheck = false; meta = with lib; { description = "Library and resources for PiJuice HAT for Raspberry Pi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index ca81335491..c02e5c5ce0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.4.0"; + version = "4.4.1"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-AfHqKcb+ejEmY53irbIv9+1fPEczMgd7/VaFt01cNUs="; + hash = "sha256-8yYqyXz4ZqZxsk2Ka8S0rDsHaqO4l6cZTyNuVQuHkew="; }; patches = [ 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 e0f29d366e..57b085a540 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.4.0"; + version = "9.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"; + sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 9d54eef4d7..307e99c04d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.4.0"; + version = "6.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b"; + sha256 = "sha256-gPViqmmfx2pCRTlpfgvvQeSQoFDlemohRoUxmBqdQZ4="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 2f80806c43..3f461b15a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.17.0"; + version = "1.0.0"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "sha256-vR/tKV+ZB0nZaxEcB83dwoSI7kBC1rA+6fo30rizroM="; + sha256 = "1sgfrlhci2m83k436dfwfmqjpb8hij6yypm03pm3n8drmr2aaa4s"; }; propagatedBuildInputs = [ @@ -68,6 +68,6 @@ buildPythonPackage rec { "Install and Run Python Applications in Isolated Environments"; homepage = "https://github.com/pipxproject/pipx"; license = licenses.mit; - maintainers = with maintainers; [ yevhenshymotiuk ]; + maintainers = with maintainers; [ yshym ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix index 7645fdaec8..6637198b56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "coin3d"; repo = "pivy"; rev = version; - sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"; + sha256 = "1xlynrbq22pb252r37r80b3myzap8hzhvknz4zfznfrsg9ykh8k2"; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index 4a21cebcab..ef702b93ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.9.1"; + version = "4.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "0c0zhbq6ggn5ck4cgbr92440xhfk3iz5a8fm25909idlx8vw0s3q"; + sha256 = "sha256-93qMSOnCl18dRZQB8v2Cxv21vsdFzHefQ7zttQAuPKk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index c4811044ae..fbe869b070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.4.0"; + version = "5.5.0"; src = fetchPypi { inherit pname version; - sha256 = "735d50738c760ecbf3a38e2336b8c1b119bff2d857096e4f68af31089b798161"; + sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0"; }; propagatedBuildInputs = [ 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 91902a8574..3297dbc091 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.15.4"; + version = "0.16.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "0lp87vn9kh0xqng5mv5j914pgrbnhp54bisq76njijn32mgaw4qq"; + sha256 = "sha256-//0M5eNWJoviHWuZnHO6hCEP3g2dA8utJeoS5Lp0Hy8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix index e571f276f2..ae3c4941f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix @@ -1,19 +1,61 @@ -{ buildPythonPackage -, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, openssh +, ps +, psutil +, pytest-mock +, pytest-timeout +, pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "plumbum"; version = "1.7.2"; - checkInputs = [ pytest ]; + src = fetchFromGitHub { + owner = "tomerfiliba"; + repo = "plumbum"; + rev = "v${version}"; + sha256 = "sha256-bCCcNFz+ZsbKSF7aCfy47lBHb873tDYN0qFuSCxJp1w="; + }; - # No tests in archive - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-config=setup.cfg" "" + ''; - src = fetchPypi { - inherit pname version; - sha256 = "0d1bf908076bbd0484d16412479cb97d6843069ee19f99e267e11dd980040523"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + openssh + ps + psutil + pytest-mock + pytest-timeout + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMP + ''; + + disabledTests = [ + # broken in nix env + "test_change_env" + "test_dictlike" + "test_local" + ]; + + meta = with lib; { + description = " Plumbum: Shell Combinators "; + homepage = " https://github.com/tomerfiliba/plumbum "; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix index 86bbd847aa..969f1207a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.11.19"; + version = "0.12.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM="; + sha256 = "sha256-6yG60vUsvLpIiZ3i1D3NZOL9bINaF5ydrDvewqpEmpA="; }; propagatedBuildInputs = [ 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 dda98f7a8b..a3aabdc568 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -7,12 +7,13 @@ , colorful , tomlkit , git +, packaging , requests }: buildPythonPackage rec { pname = "pontos"; - version = "22.1.1"; + version = "22.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p7E86McHeijsXpaByD5qLHYQLnSImLwHn15INyxWiZc="; + hash = "sha256-VMfvlqpmA2Mg/llVNcY3Enuuq3mwV0G1GYrpbvzo8pU="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorful tomlkit + packaging requests ]; @@ -39,6 +41,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'packaging = "^20.3"' 'packaging = "*"' + ''; + disabledTests = [ # Signing fails "test_find_no_signing_key" @@ -48,7 +55,9 @@ buildPythonPackage rec { "test_missing_cmd" ]; - pythonImportsCheck = [ "pontos" ]; + pythonImportsCheck = [ + "pontos" + ]; meta = with lib; { description = "Collection of Python utilities, tools, classes and functions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix index 27c35abe57..4cea071d27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.15rc1"; + version = "0.7.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ponyorm"; repo = pname; rev = "v${version}"; - hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ="; + hash = "sha256-yATIsX2nKsW5DBwg9/LznQqf+XPY3q46WZut18Sr0v0="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix index 52e46cec75..a3cb25624f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "portend"; - version = "2.7.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3fbc0df9e4970b661e4d7386a91fc7bcf34ebeaf0333ce15d819d515a71ba8b2"; + sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix index 90ed4b34b7..fd7bf7bc09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.4.0"; + version = "1.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "c2831ff4328a21e928ffc9e52124bcafacaf5816d38a1a72dc329680dc1bb7ba"; + sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix index 86c7b61ae2..8bc7ecb7f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pot"; - version = "0.8.0"; + version = "0.8.1.0"; src = fetchPypi { pname = "POT"; inherit version; - sha256 = "a70e092ddc5a29a4b526192750604a634dfc2faa1641664b4c2c1c00b3cd63cf"; + sha256 = "ff2974418fbf35b18072555c2a9e7e4f6876eddfb6791179ddb8f0f6d6032505"; }; postPatch = '' 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 cbc931d5c5..26cfada429 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix @@ -4,6 +4,7 @@ , chardet , requests , ruamel-yaml +, setuptools-scm , six , semver , pytestCheckHook @@ -22,6 +23,12 @@ buildPythonPackage rec { sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ chardet requests @@ -51,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; - homepage = "https://github.com/jfinkhaeuser/prance"; + homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index 85aaa1e656..f914a0f3df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca"; + sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix new file mode 100644 index 0000000000..c2ad9ca512 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchPypi +, buildPythonPackage +, primecount +, cython +, cysignals +}: + +buildPythonPackage rec { + pname = "primecountpy"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676"; + }; + + buildInputs = [ primecount ]; + + propagatedBuildInputs = [ cython cysignals ]; + + # depends on pytest-cython for "pytest --doctest-cython" + doCheck = false; + + pythonImportsCheck = [ "primecountpy" ]; + + meta = with lib; { + description = "Cython interface for C++ primecount library"; + homepage = "https://github.com/dimpase/primecountpy/"; + maintainers = teams.sage.members; + license = licenses.gpl3Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index 766b7090f9..3f4f49d429 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.55.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04"; + sha256 = "14d3165a1781d053ffaa117daf27cc706128d2ec1d2977fdb05b6bb079888013"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix index 418e63ec93..e38560be2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.23"; + version = "3.0.24"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf"; + sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix index ba17c5eca7..581e83ddf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.8.0"; + version = "5.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c"; + sha256 = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"; }; # We have many test failures on various parts of the package: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix index 34660a84cd..bdf2b65cb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.2"; + version = "2.9.3"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea"; + sha256 = "8e841d1bf3434da985cc5ef13e6f75c8981ced601fd70cc6bf33351b91562981"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index 6464b376d6..c36554122d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.0.0"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "v${version}"; - hash = "sha256-ktwPut4FBkPMukUk00I1xNOuTvSJkbskPOjoYDJN5Eg="; + hash = "sha256-TXxnFKDq1eWShimtNKaUMEQrs1nRQ8NqAQSI8Hutcp8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix index 6e35cb5735..69d776f900 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.10.5"; + version = "22.1.2"; src = fetchPypi { inherit pname version; - sha256 = "b347983fb78baab168f4dc4804ab2c59ca5b813bf62f8146dfb5fcb6ab6c8ba2"; + sha256 = "sha256-icAIrRgLX/WNqSit/6/423/pVLzA55wlFRcUHlgvEVk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix index 55802290c1..a49465e1e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pvo"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-pvoutput"; rev = "v${version}"; - sha256 = "sha256-liV5Ae3Bz6MZT3KQ/1aNt6P4Wsg4SOfAMQKI0Qpxvao="; + sha256 = "sha256-IXK4DvmwSLdxyW4418pe1/UOeQELUBSnTO+P6TzPnKw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix index e363cd412d..3d2e1b05e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.5"; + version = "1.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "mib1185"; repo = "synologydsm-api"; rev = "v${version}"; - sha256 = "sha256-mm5N2RKn2KP2dV7+dw0sNWlCDT5X/fRmH8POQqJIoZY="; + sha256 = "sha256-jAdD6FCbsBocJNX7o+dpthgHaPLIueFWJMzBNoKAq7w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index f55c869a7a..391afabf93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a0405d1c6c60e6603594e9319c28d31b97abe49afe9af21d230f5072a1d38976"; + sha256 = "sha256-5vIjVqvr/+Cok9z3L+CaDIve2tb0mMVaMMPdMs5Ijmo="; }; propagatedBuildInputs = [ aiohttp requests ]; 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 6ca3166fb1..bf46734df5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyamg"; - version = "4.1.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "b4cacfcfd13379762a4551ac059a2e52a093b476ca1ad44b9202e736490a8863"; + sha256 = "48d9be622049d8363cda84125c45d18b89e0ab7d99be5a93c0246f375ebad344"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix index d2ed7d6ff3..a06d2a05fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyatag"; - version = "0.3.5.3"; + version = "3.5.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = version; - sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; + sha256 = "17x2m7icbby1y2zfc79jpbir2kvyqlrkix9pvvxanm658arsh8c7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index d35a574029..5cd314b6cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "6.2.2"; + version = "6.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "1cd6g5vix8k45ndx4aq4pvyyisqdp38gd2466jrlg8z9byandj0i"; + sha256 = "sha256-VXkQByaNA02fwBO2yuf7w1ZF/oJwd/h21de1EQlCu2U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 9f1bd00810..85c526334c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -14,13 +14,14 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, requests , srptools , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.9.8"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,9 +30,18 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1ns1ys3mwi1s1b8zxcr7xgr1rfnlxwdn2fp680yi09x4d9nmnvqp"; + sha256 = "sha256-aYNBFtsnSg3PORq72U0PXPFCTVj2+8D2TS3nMau55t4="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + # Remove all version pinning + + substituteInPlace base_versions.txt \ + --replace "protobuf==3.19.1,<4" "protobuf>=3.19.0,<4" + ''; + propagatedBuildInputs = [ aiohttp bitarray @@ -40,6 +50,7 @@ buildPythonPackage rec { miniaudio netifaces protobuf + requests srptools zeroconf ]; @@ -52,13 +63,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - # Remove all version pinning - sed -i -e "s/==[0-9.]*//" requirements/requirements.txt - ''; - 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/pyaussiebb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaussiebb/default.nix new file mode 100644 index 0000000000..63edd6e60f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaussiebb/default.nix @@ -0,0 +1,53 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, loguru +, poetry-core +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyaussiebb"; + version = "0.0.11"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "yaleman"; + repo = "aussiebb"; + rev = "v${version}"; + hash = "sha256-aL+n2ut7n6UUyymMEHoFMhRvK9iFRRunYE9ZirKFXhc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + requests + loguru + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requests = "^2.27.1"' 'requests = "*"' + ''; + + # Tests require credentials and requests-testing + doCheck = false; + + pythonImportsCheck = [ + "aussiebb" + ]; + + meta = with lib; { + description = "Module for interacting with the Aussie Broadband APIs"; + homepage = "https://github.com/yaleman/aussiebb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix index d93bfe149c..46c1307826 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix @@ -8,18 +8,18 @@ , python , catch , numpy -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "pybind11"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-zYDgXXpn8Z1Zti8Eje8qxDvbQV70/LmezG3AtxzDG+o="; + hash = "sha256-wBvEWQlZhHoSCMbGgYtB3alWBLA8mA8Mz6JPLhXa3Pc="; }; nativeBuildInputs = [ cmake ]; @@ -49,16 +49,18 @@ buildPythonPackage rec { checkInputs = [ catch numpy - pytest + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - - make check - - runHook postCheck - ''; + disabledTestPaths = [ + # require dependencies not available in nixpkgs + "tests/test_embed/test_trampoline.py" + "tests/test_embed/test_interpreter.py" + # numpy changed __repr__ output of numpy dtypes + "tests/test_numpy_dtypes.py" + # no need to test internal packaging + "tests/extra_python_package/test_files.py" + ]; meta = with lib; { homepage = "https://github.com/pybind/pybind11"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix deleted file mode 100644 index af9f18aad2..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycallgraph/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -}: - -buildPythonPackage rec { - pname = "pycallgraph"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0w8yr43scnckqcv5nbyd2dq4kpv74ai856lsdsf8iniik07jn9mi"; - }; - - buildInputs = [ pytest ]; - - # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118 - doCheck = false; - - meta = with lib; { - homepage = "http://pycallgraph.slowchop.com"; - description = "Call graph visualizations for Python applications"; - maintainers = with maintainers; [ auntie ]; - license = licenses.gpl2; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix new file mode 100644 index 0000000000..320e6d51c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pydantic +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pycfmodel"; + version = "0.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = pname; + rev = version; + hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; + }; + + propagatedBuildInputs = [ + pydantic + ]; + + checkInputs = [ + httpx + pytestCheckHook + ]; + + disabledTests = [ + # Test require network access + "test_cloudformation_actions" + ]; + + pythonImportsCheck = [ + "pycfmodel" + ]; + + meta = with lib; { + description = "Model for Cloud Formation scripts"; + homepage = "https://github.com/Skyscanner/pycfmodel"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index f9a4b24ffc..f5921d0dfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.2.2"; + version = "10.2.3"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "bd1dbb9383ed549d42d12f337a6c664a9088b4910ebb3f11de6fe15f397e7efd"; + sha256 = "ddb86c5acdc13e8bdadd2b7f5738fda36b32c1750548f7b629ca8d178f05e0da"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix index 868504e399..560c5a7081 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "20.7.3"; + version = "22.1.10"; src = fetchPypi { inherit pname version; - sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"; + sha256 = "b9a6d9cdbf53f81ccdf73f6f5de01b0d8493cab2213a230af3e34458de85ea32"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix index 4fbc259c18..6e7f71cee3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pycryptodome-test-vectors"; - version = "1.0.4"; + version = "1.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-2+ZL8snmaB0tNxGZRbUM6SdfXZf4CM0nh3/wTOu9R50="; + hash = "sha256-GfzFM3S4yk0V2zTaQ+rkljyHdvC0ETUNSccZImqoLIU="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index 67f8da66be..adbb0d21a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.6.0"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fk6zMWgvhKp+7BMDGw89Akb4fgK6+xi+AyvEY3pdTQQ="; + sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.6.0 + # while they have tests, they do not run them in their CI and they fail as of 2.7.0 # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix index 7d75896397..5b0ffade58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix @@ -1,23 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, invoke +, mock +, pytestCheckHook +, pythonOlder +, sphinx_rtd_theme +}: buildPythonPackage rec { pname = "pydash"; - version = "4.9.3"; + version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dgilland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; + hash = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; }; - patches = [ ./0001-Only-build-unit-tests.patch ]; + checkInputs = [ + invoke + mock + sphinx_rtd_theme + pytestCheckHook + ]; - checkInputs = [ mock pytestCheckHook invoke ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov/d" setup.cfg + ''; + + pythonImportsCheck = [ + "pydash" + ]; meta = with lib; { - homepage = "https://github.com/dgilland/pydash"; - description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library."; + description = "Python utility libraries for doing stuff in a functional way"; + homepage = "https://pydash.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix index 00e36ec373..8dccfbc261 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix @@ -4,19 +4,33 @@ , substituteAll , graphviz , python +, pytestCheckHook , chardet +, pythonOlder , pyparsing }: buildPythonPackage rec { pname = "pydot"; version = "1.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d"; }; + propagatedBuildInputs = [ + pyparsing + ]; + + checkInputs = [ + chardet + pytestCheckHook + ]; + patches = [ (substituteAll { src = ./hardcode-graphviz-path.patch; @@ -27,21 +41,31 @@ buildPythonPackage rec { postPatch = '' # test_graphviz_regression_tests also fails upstream: https://github.com/pydot/pydot/pull/198 substituteInPlace test/pydot_unittest.py \ - --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" + --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" \ + # Patch path for pytestCheckHook + substituteInPlace test/pydot_unittest.py \ + --replace "shapefile_dir = os.path.join(test_dir, 'from-past-to-future')" "shapefile_dir = 'test/from-past-to-future'" \ + --replace "path = os.path.join(test_dir, TESTS_DIR_1)" "path = os.path.join('test/', TESTS_DIR_1)" ''; - propagatedBuildInputs = [ pyparsing ]; + pytestFlagsArray = [ + "test/pydot_unittest.py" + ]; - checkInputs = [ chardet ]; + disabledTests = [ + "test_exception_msg" + # Hash mismatch + "test_my_regression_tests" + ]; - checkPhase = '' - cd test - ${python.interpreter} pydot_unittest.py - ''; + pythonImportsCheck = [ + "pydot" + ]; - meta = { + meta = with lib; { + description = "Allows to create both directed and non directed graphs from Python"; homepage = "https://github.com/erocarrera/pydot"; - description = "Allows to easily create both directed and non directed graphs from Python"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } 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 82556ac1a7..9bfa5aa3d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pydy"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1b487a62b55a8c8664009b09bf789254b2c942cd704a380bedb1057418c94fa2"; + sha256 = "sha256-e/Ssfd5llioA7ccLULlRdHR113IbR4AJ4/HmzQuU7vI="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix index b59aa56c48..7f51f435ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyerfa"; format = "pyproject"; - version = "2.0.0"; + version = "2.0.0.1"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "sha256-+QQjHhpXD5REDgYUB5lZCJUQf5QoR7UqdTzoHJYJFi0="; + sha256 = "2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix index 4223ce02ca..840a74f252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.5"; + version = "0.6.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b"; + sha256 = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix index f7d564e7e5..e6a2d5c022 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.5"; + version = "0.2.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-a+u8zS69qLHABPSvWEzhM/gdzlLh2RJLTDJjaX4DtpI="; + sha256 = "sha256-3GRyM6OK0EpQ7wepTzqg+XANx9D0OVBTnw98i3b1V/8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix index 3a29fd79f7..aafd60c0db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.3.0"; + version = "7.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a7031ec4cfff034affc822e47ff5e6c1a0272e576d79465cdbbe25f721740322"; + sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s="; }; propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index eb5eb993ef..29803793fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.3"; + version = "4.5.4"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f49db689c1d5db6172131479ca77bd474ba2cb886c869b9867fb89cdab2df397"; + sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix index 8fdb051a48..77ddabe205 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyfcm"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "olucurious"; repo = "pyfcm"; rev = version; - sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; + sha256 = "15q6p21wsjm75ccmzcsgad1w9fgk6189hbrp7pawpxl7l3qxn2p7"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix index 99506de102..a481e9a97a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix index 0bfda48269..714159ff99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix @@ -9,17 +9,21 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.2"; + version = "0.6.4"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-fritzhome"; rev = version; - sha256 = "1hwxq9w5qmiky8gpp623nabmydr3yv6hvgzk24fdbmkglfp6ja1v"; + sha256 = "sha256-JCaB3E8KCfncwnTKIb0shB2qYpsKwBkrPZdC5lAJ1KQ="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; checkInputs = [ mock @@ -30,7 +34,9 @@ buildPythonPackage rec { nosetests ''; - pythonImportsCheck = [ "pyfritzhome" ]; + pythonImportsCheck = [ + "pyfritzhome" + ]; meta = with lib; { description = "Python Library to access AVM FRITZ!Box homeautomation"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix index 58f65b6d0f..55cf1e36de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix @@ -3,21 +3,23 @@ , buildPythonPackage , fetchFromGitHub , pygame +, python-i18n , pytestCheckHook }: buildPythonPackage rec { pname = "pygame-gui"; - version = "0.5.7"; + version = "0.6.4"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "v_${lib.replaceStrings ["."] [""] version}"; - sha256 = "4P2PT8/7oA5Q7H4+pm7BOET7w05pQYQltXVV3+YVrVE="; + sha256 = "13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; }; - propagatedBuildInputs = [ pygame ]; + propagatedBuildInputs = [ pygame python-i18n ]; postPatch = '' substituteInPlace pygame_gui/core/utility.py \ @@ -44,6 +46,10 @@ buildPythonPackage rec { "test_process_event_text_ctrl_x" ]; + disabledTestPaths = [ + "tests/test_performance/test_text_performance.py" + ]; + meta = with lib; { description = "A GUI system for pygame"; homepage = "https://github.com/MyreMylar/pygame_gui"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix index 60a1fece63..66a1fb0ba2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = pname; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - sha256 = "sha256-Pe7BJ+8rXw+hhRv64fI+79gJcU1npQFFAXxECx2+Trw="; + sha256 = "sha256-v1z6caEMJNXqbcbTmFXoy3KQewHiz6qK4vhNU6Qbukk="; extraPostFetch = "rm -rf $out/docs/reST"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index 4f3a9de3a3..6f8a9fa696 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.7.2"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "70a4536a35452c31f823b59b6fdb665aa3778a43b73ccda3a4f79fa9962ad2bb"; + sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix index 3c0552ef4d..3780122f19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.8"; + version = "1.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-6y4losZHBE57ZrWhWb5k2q7yS1Sfz1NcJBNp1ubgnEU="; + hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix index fd6ba2f2df..a4c04ce79e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "PyHamcrest"; - version = "2.0.2"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316"; + sha256 = "dfb19cf6d71743e086fbb761ed7faea5aacbc8ec10c17a08b93ecde39192a3db"; }; checkInputs = [ mock pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix index f69a21115f..aa967b7695 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.58"; + version = "0.3.59"; src = fetchFromGitHub { owner = "chimpler"; repo = "pyhocon"; rev = version; - sha256 = "sha256-ddspVDKy9++cISWH6R95r+gJrzNGqMTybI04OgVtIUU="; + sha256 = "1yr24plg3d4girg27ajjkf9mndig706fs8b2kmnmhi4l2xi866yh"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix new file mode 100644 index 0000000000..0d5ed18cfd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyhumps"; + version = "3.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nficano"; + repo = "humps"; + rev = "v${version}"; + hash = "sha256-dnNtx0VTD2e89yXMz0+acDhOaLBSkAA7n2io6qypN5E="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/nficano/humps/pull/240 + substituteInPlace pyproject.toml \ + --replace 'version = "3.0.2"' 'version = "${version}"' + ''; + + pythonImportsCheck = [ + "humps" + ]; + + meta = with lib; { + description = "Module to convert strings (and dictionary keys) between snake case, camel case and pascal case"; + homepage = "https://github.com/nficano/humps"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 04dbd8142f..fbf1fbce79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.13"; + version = "1.0.15"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-KVwAF+yoU26ktNRKWQ+nrhS1i90xQxAhRAr4VJ+xtl0="; + sha256 = "sha256-bR+2885JdGoVHBIZQG8iF0OXsECew7m5N9vopKtGp3I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix index 48274e6b4e..b671dbde59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "v${version}"; - sha256 = "1mj9na64nq0ls8d9x3304ai7lixaglpr646p3m2a4s5qlmm4il3m"; + hash = "sha256-ad3hVs0B3uBHj/LVWwAXAkUMbjHPtyaeKueRPcmIMFg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix index 145ea83abe..f4ea169b01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.3.1"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax"; + sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix index 098cdd33bf..257cb72b3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylast"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2m6+pQYBmvVxlBw1yLSAKr3kZ5WS1S0TZ1ZQ3ER+bCk="; + sha256 = "sha256-YoALculx2trEDD1vU4xhiCGdb1OFPdxI1p2fwlZZAY8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index c93c8d4207..291ef8fba6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.4.4"; + version = "2.5.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bFcb5GhC7jc7jEpNlyjWa2CuCSMvQLJdnag+7mHwSb8="; + sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr"; }; propagatedBuildInputs = [ 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 be6d71aed5..eec564c126 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.11.0"; + version = "2021.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-HdIxi6RfdXBYEYFEcv/f9wAqKZg/MsEZd6mDYwE45to="; + sha256 = "sha256-hz+MQTxobf7IkOJTpwbDDd3i13FFtxFn2kmCwPV3pu4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix index e1d7ddff29..a4725c4781 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.5.1"; + version = "0.5.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = version; - sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr"; + sha256 = "0am16z9kmj57r5pi32jhzlbdngzmvzzaiqjm7cba1izh7w5m6dvc"; }; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix index c9cc924674..e7fd963062 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.13.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pVBFlGguVN6b3YY2lFF8KG83tBuotLmWLq/dKjRKAUQ="; + sha256 = "sha256-NLVxEor+Z+AVF+0/ugPM4bpeKba6yd43uTLYhtTNhqM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index 5354efacb4..be13f77490 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub +, cython , enum34 , glibcLocales , matplotlib @@ -8,6 +9,7 @@ , palettable , pandas , plotly +, pybtex , pydispatcher , requests , ruamel-yaml @@ -21,14 +23,20 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.17"; + version = "2022.2.7"; - src = fetchPypi { - inherit pname version; - sha256 = "7103b89b889bb940709eea53226d3c9298584ad9ab42ab8c8f9de3872d7d969b"; + # sdist doesn't include c files + src = fetchFromGitHub { + owner = "materialsproject"; + repo = "pymatgen"; + rev= "v${version}"; + sha256 = "sha256-92Dxmo1Z9LR2caSOftIf1I6jeZmqDe3SqhhoCofWraw="; }; - nativeBuildInputs = [ glibcLocales ]; + nativeBuildInputs = [ + cython + glibcLocales + ]; propagatedBuildInputs = [ enum34 @@ -39,6 +47,7 @@ buildPythonPackage rec { palettable pandas plotly + pybtex pydispatcher requests ruamel-yaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index 4bb3cabac3..6f846481b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.19"; + version = "2.4.20"; src = fetchPypi { inherit pname version; - sha256 = "8518f71c221c263770322355d0745da2fffc48238d04eb48bcf3ef6c35e5f722"; + sha256 = "sha256-QdYlmlDZzVH8tErGdgAz6FjT/L7jexduvrffKVEqMfY="; }; propagatedBuildInputs = [ future lxml ]; 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 b153b14c5f..fdc7e1f678 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eb4b275bcdfbf947e00b27c20dfc8ebcedfc1fb1252449141eccb5c39d782440"; + sha256 = "d51619cfbd90f4bb4e8fbfe1bccd58d4f5ece9bdb78d8f33fed1776d749d5fa9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix index 095f3baf97..5cf2615ed0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix @@ -68,5 +68,8 @@ buildPythonPackage rec { homepage = "https://github.com/pymc-devs/pymc3"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ilya-kolpakov ]; + # several dependencies are not declared and in the end it requires theano-pymc3 + # instead of Theano. The former is currently not packaged. + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index f7555d48eb..42c369dbf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.19.2"; + version = "1.19.4"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "964bbacddab9cba6cd2c8f388429fe4a97c0775b3096a13ac15724f5a1a2c58d"; + sha256 = "125783986da87fe1a5372d621e90fa49e454454af0b3d0f894858c146c712f81"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix index 9506e15048..d071743d74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.22.1"; + version = "0.23.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "theolind"; repo = pname; rev = version; - sha256 = "sha256-n4khOQspJBeq0w+epdXYZh6I1lI1drB1JewZ6GfzVHs="; + sha256 = "0a09w1bzz2pn0w11f7kx8052914kdpgfb7w6hc9s50x8wl9q604h"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix index 91a197e7cf..f34956d728 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -6,19 +7,19 @@ , libsodium , cffi , hypothesis -, stdenv -, six }: buildPythonPackage rec { pname = "pynacl"; - version = "1.4.0"; + version = "1.5.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "PyNaCl"; - sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal"; + sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba"; }; buildInputs = [ @@ -31,7 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi - six ]; checkInputs = [ @@ -41,11 +41,14 @@ buildPythonPackage rec { SODIUM_INSTALL = "system"; - pythonImportsCheck = [ "nacl" ]; + pythonImportsCheck = [ + "nacl" + ]; meta = with lib; { description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix index 46bc5d49ca..d3b3945743 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6c9bec5946949d07c76230187cdb9126e8247c94499bbc8e79ded11d17060a60"; + sha256 = "sha256-x6nFV7UjZLwJJX7dADeO68dSWLvaoP4FD8ziNWFJ+Qo="; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix index 54fb270a17..84e03a6086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.5.0"; + version = "6.6.0"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "v${version}"; - sha256 = "1fk64bi7aswsmfqsciamml2wydgfg464h6i7479xfim4mwmkkik4"; + sha256 = "sha256-vgknnFnmRLIpBLdv1iFGkuql2NOLurOgF2CDKoo8WGg="; }; 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 b9e026886c..5eaf015e9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix @@ -1,22 +1,21 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitLab +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "pynina"; - version = "unstable-2021-11-11"; + version = "0.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitLab { - owner = "DeerMaximum"; - repo = pname; - rev = "0ac42b28d48af7bcd9c83f5d425b5b23c4c19f02"; - sha256 = "FSrFCs/4tfYcSPz9cgR+LFsRbWIHE1X+ZUl8BWSEaWQ="; + src = fetchPypi { + pname = "PyNINA"; + inherit version; + sha256 = "1q382b70ydzzbqb9sa5y5w7039rp6q0wyffarrsdw916kbc4zyqd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynuki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynuki/default.nix index 9c3dc394cc..58c7f1df15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynuki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynuki/default.nix @@ -3,27 +3,40 @@ , fetchFromGitHub , poetry-core , requests +, pythonOlder }: buildPythonPackage rec { pname = "pynuki"; - version = "1.4.1"; + version = "1.5.2"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pschmitt"; repo = pname; rev = version; - sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4"; + sha256 = "sha256-Uqw1Xa0pBQmQsFEBv/l1gtsPy+owYcTZITOYUmMvT5Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requests = ">=2.27,<3"' 'requests = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pynuki" ]; + + pythonImportsCheck = [ + "pynuki" + ]; meta = with lib; { description = "Python bindings for nuki.io bridges"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index d657efd707..8ba6acb19f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -2,18 +2,19 @@ , stdenv , fetchPypi , buildPythonPackage -, Mako -, pytest -, numpy -, cffi -, pytools -, decorator , appdirs -, six -, opencl-headers -, ocl-icd -, pybind11 +, cffi +, decorator +, Mako , mesa_drivers +, numpy +, ocl-icd +, opencl-headers +, platformdirs +, pybind11 +, pytest +, pytools +, six }: let @@ -21,16 +22,25 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.10"; + version = "2021.2.11"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; - propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; + propagatedBuildInputs = [ + appdirs + cffi + decorator + Mako + numpy + platformdirs + pytools + six + ]; src = fetchPypi { inherit pname version; - sha256 = "75a1f202741bace9606a8680bbbfac69bf8a73d4e7511fb1a6ce3e48185996ae"; + sha256 = "334a6cdde7ef18e4370604b9a1d6551b055e8828a4da004893f26091669b561b"; }; # py.test is not needed during runtime, so remove it from `install_requires` 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 688731033a..16bfddc834 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix @@ -47,6 +47,8 @@ let "test_fallback_default_verify_paths" # https://github.com/pyca/pyopenssl/issues/768 "test_wantWriteError" + # https://github.com/pyca/pyopenssl/issues/1043 + "test_alpn_call_failure" ] ++ ( lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests ) ++ ( @@ -64,12 +66,12 @@ in buildPythonPackage rec { pname = "pyopenssl"; - version = "20.0.1"; + version = "21.0.0"; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51"; + sha256 = "5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix index 5ecfdfb888..27047cf6ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix @@ -2,34 +2,47 @@ , fetchFromGitHub , lib -# pythonPackages -, coverage +# since this is a dependency of pytest, we need to avoid +# circular dependencies +, jinja2 +, railroad-diagrams }: -buildPythonPackage rec { - pname = "pyparsing"; - version = "2.4.7"; +let + pyparsing = buildPythonPackage rec { + pname = "pyparsing"; + version = "3.0.6"; - src = fetchFromGitHub { - owner = "pyparsing"; - repo = pname; - rev = "pyparsing_${version}"; - sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; - }; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; + }; - # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6 - checkInputs = [ coverage ]; - checkPhase = '' - coverage run --branch simple_unit_tests.py - coverage run --branch unitTests.py - ''; - - meta = with lib; { - homepage = "https://github.com/pyparsing/pyparsing"; - description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + jinja2 + railroad-diagrams ]; + + checkPhase = '' + python -m unittest + ''; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; }; -} +in + pyparsing diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix index 797657a28c..ae297389bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix @@ -1,23 +1,25 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder -, stdenv }: buildPythonPackage rec { pname = "pypck"; - version = "0.7.11"; + version = "0.7.13"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "1jj0y487qcxrprx4x2rs6r7rqsf5m9khk0xhigbvnbyvh8rsd2jr"; + sha256 = "sha256-Gbz+3Hq4yStlTI7UxB4NBZigUzZjSJFFcwdzWtbGnio="; }; checkInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "pypck" ]; + pythonImportsCheck = [ + "pypck" + ]; meta = with lib; { description = "LCN-PCK library written in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix index 74581ba7e3..7bb46b115e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, flit , pytestCheckHook }: buildPythonPackage rec { pname = "pyphen"; - version = "0.11.0"; + version = "0.12.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8"; + sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b"; }; + nativeBuildInputs = [ + flit + ]; + preCheck = '' sed -i '/addopts/d' pyproject.toml ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix index 4cac927341..c01878f354 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "v${version}"; - sha256 = "sha256-LYiiZvpM/V3QRyTUXGWGnSnR0AnqWfTW0xJB4Vnw7lI="; + sha256 = "0jz5b5a2bqz2pvx4imnlvz9n765b5yji27fmpijspalkpjcnpa4q"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix new file mode 100644 index 0000000000..e88891172d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, freezegun +, numpy +, py +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pypytools"; + version = "0.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-oUDAU+TRwLroNfQGYusAQKdRkHcazysqiDLfp77v5Sk="; + }; + + propagatedBuildInputs = [ + py + ]; + + checkInputs = [ + freezegun + numpy + pytestCheckHook + ]; + + patches = [ + # Support for later Python releases, https://github.com/antocuni/pypytools/pull/2 + (fetchpatch { + name = "support-later-python.patch"; + url = "https://github.com/antocuni/pypytools/commit/c6aed496ec35a6ef7ce9e95084849eebc16bafef.patch"; + sha256 = "sha256-YoYRZmgueQmxRtGaeP4zEVxuA0U7TB0PmoYHHVI7ICQ="; + }) + ]; + + pythonImportsCheck = [ + "pypytools" + ]; + + meta = with lib; { + description = "Collection of tools to use PyPy-specific features"; + homepage = "https://github.com/antocuni/pypytools"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix index f984bcc2de..38dd2a8c5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix @@ -4,7 +4,7 @@ , fetchpatch , importlib-metadata , ipython -, lark-parser +, lark , networkx , numpy , poetry-core @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lark-parser + lark networkx numpy qcs-api-client @@ -71,7 +71,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'lark = "^0.11.1"' 'lark-parser = ">=0.11.1"' + --replace 'lark = "^0.11.1"' 'lark = "*"' ''; disabledTestPaths = [ @@ -92,6 +92,9 @@ buildPythonPackage rec { disabledTests = [ "test_compile_with_quilt_calibrations" "test_sets_timeout_on_requests" + # sensitive to lark parser output + "test_memory_commands" + "test_classical" ]; pythonImportsCheck = [ "pyquil" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix new file mode 100644 index 0000000000..0e12b339c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-vcr +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, untangle +}: + +buildPythonPackage rec { + pname = "pyqvrpro"; + version = "0.52"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oblogic7"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lOd2AqnrkexNqT/usmJts5NW7vJtV8CRsliYgkhgRaU="; + }; + + propagatedBuildInputs = [ + pyyaml + requests + untangle + ]; + + checkInputs = [ + pytest-vcr + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyqvrpro" + ]; + + meta = with lib; { + description = "Module for interfacing with QVR Pro API"; + homepage = "https://github.com/oblogic7/pyqvrpro"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix index 6b63ac8f9f..7e1fb8876c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = version; - sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm"; + hash = "sha256-JBU/ApBumdW87fQqMAopzv+UV0f6VsHMiyNqG7BRLgo="; }; propagatedBuildInputs = [ @@ -24,6 +24,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # https://github.com/Danielhiversen/pyRFXtrx/issues/130 + "tests/test_rollertrol.py" + ]; + meta = with lib; { description = "Library to communicate with the RFXtrx family of devices"; homepage = "https://github.com/Danielhiversen/pyRFXtrx"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix index c345c988d2..dc453e86c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.3.6"; + version = "1.4.3"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-Q3JGTNSfqEMUqEru0crcbE8Ut/n+9MjFIDRKRSZ7tlE="; + hash = "sha256-5twH9ZfwtP6gi50K8nqXOmCPSFkHO5Hitd7XaDP0EQg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix index 10515ed7a6..1f1d97f19f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.9"; + version = "0.9.11"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "45879ae588038d7cf7cb0289ae47af60722b394d0efa527bf4327103dc4dc918"; + sha256 = "93e51057d39fd583b80001d42b21d5a3f71e30d489d85924d944b2c7350e2da6"; }; # Deliberately not in propagated build inputs; users can decide diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix index 3cb56247b5..fab58a7225 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix @@ -2,12 +2,12 @@ , setuptools }: buildPythonPackage rec { - version = "2.1.3"; + version = "2.2.0"; pname = "pyshp"; src = fetchPypi { inherit pname version; - sha256 = "e32b4a6832a3b97986df442df63b4c4a7dcc846b326c903189530a5cc6df0260"; + sha256 = "sha256-Dtogm9YvM0VwHE9nmbY4wRTOtn/uKClc3bThyvBT6UQ="; }; buildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix index 2345529b11..c06e1ed32a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix @@ -4,7 +4,7 @@ , fetchPypi , dataclasses-json , pycryptodome -, setuptools +, setuptools-scm , pytest-asyncio , pytest-cases , pytestCheckHook @@ -28,10 +28,13 @@ buildPythonPackage rec { --replace "--cov pysiaalarm --cov-report term-missing" "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ dataclasses-json pycryptodome - setuptools ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix index 85fc184636..0028173506 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.2.54"; + version = "0.2.59"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = version; - sha256 = "sha256-Z3fcihyK8QHtdREXWt2ESqjwAwxFZFEI9OXf3Y9onmw="; + sha256 = "sha256-I4BgNb+ijp6yVxHfccQMHY0Haf6tcWjsPNPWhEO6Puc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix index 1f08eb1418..f7c1e4857c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix @@ -3,20 +3,26 @@ , bitstring , buildPythonPackage , fetchFromGitHub +, poetry-core , pyserial-asyncio }: buildPythonPackage rec { pname = "pysml"; - version = "0.0.5"; + version = "0.0.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "mtdcr"; repo = pname; rev = version; - sha256 = "05zgrk49b2y5jflxnjww2kqg1flynl3j4ifm0jr28nk0li5wg2bs"; + sha256 = "sha256-h8rQOKZozioZ7HmPETC5wBJyz7rMH1Q2wL6lF8G3zQU="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ async-timeout bitstring 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 bfbec757b1..95e22510d8 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 @@ -2,35 +2,48 @@ , buildPythonPackage , fetchPypi , numpy -, six , pytest +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-arraydiff"; - version = "0.3"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15"; + sha256 = "714149beffd0dfa085477c65791c1139b619602b049536353ce1a91397fb3bd2"; }; - buildInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ numpy - six ]; - # The tests requires astropy, which itself requires - # pytest-arraydiff. This causes an infinite recursion if the tests - # are enabled. + # The tests requires astropy, which itself requires pytest-arraydiff doCheck = false; + pythonImportsCheck = [ + "pytest_arraydiff" + ]; + meta = with lib; { description = "Pytest plugin to help with comparing array output from tests"; homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix index 4059a3c12f..6401e1ce2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,15 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub +, flaky , hypothesis , pytest , pytestCheckHook , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.16.0"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,14 +20,21 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4zMbzdDtiLRKo5C12wZRoBNguXLn3f26NuDwQ+pHA0I="; + sha256 = "sha256-4wDXvO6pDK0dQLnyfJTTa+GXf9Qtsi6ywYDUIdhkgGo="; }; - buildInputs = [ + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ pytest ]; checkInputs = [ + flaky hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix index b087cd6f45..6ca95bca4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib +, buildPythonPackage +, fetchFromGitHub , execnet , glob2 , Mako @@ -8,41 +10,51 @@ , py , pytest , pytestCheckHook -, six +, pythonOlder }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "4.0.2"; + version = "5.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # tests are not included in pypi tarball src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = version; - sha256 = "0pxx4c8lm68rw0jshbr09fnadg8zz8j73q0qi49yw9s7yw86bg5l"; + sha256 = "sha256-3P9ongMAsLITOCRPmME492xnkdVc8IdOVrINK57gfOY="; }; - patches = [ - # Fixed compatibility with pytest > 6.1 - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-bdd/commit/e1dc0cad9a1c1ba563ccfbc24f9993d83ac59293.patch"; - sha256 = "1p3gavh6nir2a8crd5wdf0prfrg0hmgar9slvn8a21ils3k5pm5y"; - }) + buildInputs = [ + pytest ]; + propagatedBuildInputs = [ + glob2 + Mako + parse + parse-type + py + ]; - buildInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + execnet + mock + ]; - propagatedBuildInputs = [ glob2 Mako parse parse-type py six ]; - - checkInputs = [ pytestCheckHook execnet mock ]; preCheck = '' export PATH=$PATH:$out/bin ''; + pythonImportsCheck = [ + "pytest_bdd" + ]; + meta = with lib; { - description = "BDD library for the py.test runner"; + description = "BDD library for the pytest"; homepage = "https://github.com/pytest-dev/pytest-bdd"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix index c3374032d3..766e075438 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.8"; + version = "3.6.9"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d423e87b30e1080cc162d86c72bfa35861cccfe3539125e81c68ba142ab974bc"; + sha256 = "sha256-Bf9favhlHcGj8nf1JxTkMjpo8hMyfBHgMCilOcIL2Sk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix index 77de2d9698..9efd9f49f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,21 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "pytest-celery"; - version = "0.0.0"; + version = "0.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "cfd060fc32676afa1e4f51b2938f903f7f75d952186b8c6cf631628c4088f406"; + format = "flit"; + + src = fetchFromGitHub { + owner = "celery"; + repo = "pytest-celery"; + rev = "v${version}"; + sha256 = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w="; }; - patches = [ ./no-celery.patch ]; + postPatch = '' + # avoid infinite recursion with celery + substituteInPlace pyproject.toml \ + --replace '"celery >= 4.4.0"' "" + ''; - doCheck = false; # This package has nothing to test or import. + # This package has nothing to test or import. + doCheck = false; meta = with lib; { - description = "pytest plugin for unittest subTest() support and subtests fixture"; - homepage = "https://github.com/pytest-dev/pytest-subtests"; + description = "Pytest plugin to enable celery.contrib.pytest"; + homepage = "https://github.com/celery/pytest-celery"; license = licenses.mit; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/no-celery.patch b/third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/no-celery.patch deleted file mode 100644 index 6533748988..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-celery/no-celery.patch +++ /dev/null @@ -1,9 +0,0 @@ -This plugin is needed to test celery itself, so it can't depend on celery. - ---- a/setup.py -+++ b/setup.py -@@ -6,3 +6,3 @@ from distutils.core import setup - install_requires = \ --['celery >= 4.4.0'] -+[] - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix index 87f5972a74..971b12dc01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix @@ -4,20 +4,21 @@ , pytest , coverage , toml +, tomli }: buildPythonPackage rec { pname = "pytest-cov"; - version = "2.12.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1mzl06m8qcgsac1r2krixrkqdwq0nqk8asrpkcj2ddr7qawfw716"; + sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"; }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage toml ]; + propagatedBuildInputs = [ coverage toml tomli ]; # xdist related tests fail with the following error # OSError: [Errno 13] Permission denied: 'py/_code' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix index d3b2bc66aa..c4668def27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "4.5.1"; + version = "4.5.2"; src = fetchPypi { inherit pname version; - sha256 = "01fe1242e706375d7c942d206a30826bd9c0dffde99bfac627050cdc91f0d792"; + sha256 = "d9076f759bb7c36939dbdd5ae6633c18edfc2902d1a69fdbefd2426b970ce6c2"; }; nativeBuildInputs = [ pytest setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix index 836da1e157..0069eb6f17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -1,35 +1,46 @@ -{ buildPythonPackage -, lib -, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub , httpbin +, pytest +, pytestCheckHook +, requests , six }: buildPythonPackage rec { pname = "pytest-httpbin"; - version = "1.0.0"; + version = "1.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "0wlvw5qgkax7f0i5ks1562s37h2hdmn5yxnp1rajcc2289zm9knq"; + src = fetchFromGitHub { + owner = "kevin1024"; + repo = "pytest-httpbin"; + rev = "v${version}"; + hash = "sha256-Vngd8Vum96+rdG8Nz1+aHrO6WZjiAz+0CeIovaH8N+s="; }; - checkInputs = [ pytest ]; + buildInputs = [ + pytest + ]; - propagatedBuildInputs = [ httpbin six ]; + propagatedBuildInputs = [ + httpbin + six + ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + requests + ]; - # https://github.com/kevin1024/pytest-httpbin/pull/51 - doCheck = false; + pythonImportsCheck = [ + "pytest_httpbin" + ]; - meta = { - description = "Easily test your HTTP library against a local copy of httpbin.org"; + meta = with lib; { + description = "Test your HTTP library against a local copy of httpbin.org"; homepage = "https://github.com/kevin1024/pytest-httpbin"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix index cd07a10403..eb04881455 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "87561c4fa6a7bc306d76d1979a3eb9d54eb26bfb2f3f51f1643bf3c090ce629d"; + sha256 = "6de464ba5f74628d6182ebbdcb56783edf2c9b0caf598dc35c11f014f24a3f0d"; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix index e5008af9ef..e3823c18d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.5.1"; + version = "0.5.1.post0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761"; + sha256 = "5ec7f8e6534cf03887af2cb59e577f169ac0e8b2fd2c3e3409280035f386d407"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix index a8127e276f..7f07ed2b6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # output of pytest has changed + "test_used_with_" + "test_plain_stopall" + ]; + pythonImportsCheck = [ "pytest_mock" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 38b2168e13..806c12c0e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -1,27 +1,57 @@ { lib , buildPythonPackage -, fetchFromGitHub , chevron -, pyyaml +, decorator +, fetchFromGitHub , mypy , pytest -, decorator +, pytestCheckHook +, pythonOlder +, pyyaml , regex }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.9.2"; + version = "1.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "typeddjango"; repo = pname; rev = version; - sha256 = "sha256-Me5P4Q2M+gGEWlUVgQ0L048rVUOlUzVMgZZcqZPeE4Q="; + sha256 = "sha256-4hG3atahb+dH2dRGAxguJW3vvEf0TUGUJ3G5ymrf3Vg="; }; - propagatedBuildInputs = [ chevron pyyaml mypy pytest decorator regex ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + chevron + pyyaml + mypy + decorator + regex + ]; + + checkInputs = [ + mypy + pytestCheckHook + ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + pythonImportsCheck = [ + "pytest_mypy_plugins" + ]; meta = with lib; { - description = "pytest plugin for testing mypy types, stubs, and plugins"; + description = "Pytest plugin for testing mypy types, stubs, and plugins"; homepage = "https://github.com/TypedDjango/pytest-mypy-plugins"; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-raisin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-raisin/default.nix index 7412928062..1dc250da2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-raisin/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pytest-raisin"; - version = "0.3"; + version = "0.4"; format = "flit"; src = fetchFromGitHub { owner = "wimglenn"; repo = "pytest-raisin"; rev = "v${version}"; - sha256 = "73cOrsqlE04m6X3a6VwtRzfi24oqkdO3HjKQH61bU88="; + sha256 = "sha256-BI0SWy671DYDTPH4iO811ku6SzpH4ho7eQFUA8PmxW8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix index a2fe0c6f25..5aae59bc60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.10.3"; + version = "3.11.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { repo = pname; owner = "pytest-dev"; rev = version; - sha256 = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc="; + hash = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to randomly order tests and control random.seed"; homepage = "https://github.com/pytest-dev/pytest-randomly"; - license = licenses.bsd3; + license = licenses.mit; maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix index 90b72c886e..6866df7b71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , pythonOlder , matplotlib @@ -16,33 +15,44 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "15a71f77cb266dd4ca94331abe4c339ad056b2b2175e47442711c98cf6d65716"; + sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4="; }; - patches = [ - # Make pytest-regressions compatible with NumPy 1.20. - # Should be part of the next release. - (fetchpatch { - url = "https://github.com/ESSS/pytest-regressions/commit/ffad2c7fd1d110f420f4e3ca3d39d90cae18a972.patch"; - sha256 = "sha256-bUna7MnMV6u9oEaZMsFnr4gE28rz/c0O2+Hyk291+l0="; - }) - ]; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ numpy pandas pillow pytest-datadir pyyaml ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ pytestCheckHook matplotlib ]; - pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + numpy + pandas + pillow + pytest-datadir + pyyaml + ]; + + + checkInputs = [ + pytestCheckHook + matplotlib + ]; + + pythonImportsCheck = [ + "pytest_regressions" + "pytest_regressions.plugin" + ]; meta = with lib; { description = "Pytest fixtures to write regression tests"; 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 fb91f46132..fc9b5e6f9c 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 @@ -1,38 +1,54 @@ { lib , buildPythonPackage , fetchPypi -, six , pytest +, pytestCheckHook +, pythonOlder +, setuptools-scm +, six }: buildPythonPackage rec { pname = "pytest-remotedata"; - version = "0.3.2"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0"; + sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ six ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - # these tests require a network connection - pytest --ignore tests/test_strict_check.py - ''; + disabledTestPaths = [ + # These tests require a network connection + "tests/test_strict_check.py" + ]; + + pythonImportsCheck = [ + "pytest_remotedata" + ]; meta = with lib; { description = "Pytest plugin for controlling remote data access"; - homepage = "https://astropy.org"; + homepage = "https://github.com/astropy/pytest-remotedata"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix index f095cbb997..cc890096f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.4.0"; + version = "1.4.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - hash = "sha256-+bsxoOsY0yf77EivImrfqxgVW0T/VnFIJXvy8X5pmEY="; + hash = "sha256-xNkOXBCQ4AH/JVmxFzI3VSouA6jkCbUom7AdckfjGiE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix index 6b556abeaa..d5e379b524 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix @@ -8,22 +8,30 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.5.0"; - disabled = pythonOlder "3.5"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5bd1e4bf0eda4c89a6cd42b0ee28e1d2ca0848de3fd67ad8cdd6d559ed00f120"; + sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pytest_subtests" ]; + pythonImportsCheck = [ + "pytest_subtests" + ]; meta = with lib; { - description = "pytest plugin for unittest subTest() support and subtests fixture"; + description = "Pytest plugin for unittest subTest() support and subtests fixture"; homepage = "https://github.com/pytest-dev/pytest-subtests"; license = licenses.mit; maintainers = with maintainers; [ fab ]; 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 f504bd8086..f99340e48b 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 @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pexOzt246nJpEYSFk9ZoWUEH55diHpf5Oh0dvG+7kIA="; + sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix index d643603a06..60e6f2e745 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.19"; + version = "0.25.0"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "09j338lmrjabbd3fpajr4piz4r20sl33030szfsqfzlwrrmvkyi0"; + sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9"; }; prePatch = '' @@ -38,6 +38,10 @@ buildPythonPackage rec { "test_cli" "test_timedated" "test_upower" + # needs glib + "test_accounts_service" + # needs dbus-daemon active + "test_systemd" # Very slow, consider disabling? # "test_networkmanager" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 6853bddf54..6704cb8ad0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.1.0"; + version = "3.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7216c9100b2a17cae5cf53b4b40ee36a7262d4ead7526c5a6278d911eba74847"; + sha256 = "sha256-ytEzjB/xp5GnuueZXcYh4mx3378iW63kVqzsdRJ4KCU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix new file mode 100644 index 0000000000..349532ac52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pyyaml }: + +buildPythonPackage rec { + pname = "python-i18n"; + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "danhper"; + repo = pname; + rev = "v${version}"; + sha256 = "6FahoHZqaOWYGaT9RqLARCm2kLfUIlYuauB6+0eX7jA="; + }; + + checkInputs = [ pytestCheckHook pyyaml ]; + + pytestFlagsArray = [ "i18n/tests/run_tests.py" ]; + + meta = with lib; { + description = "Easy to use i18n library"; + homepage = "https://github.com/danhper/python-i18n"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix index 7f8b8fe58a..cbd68f3876 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "0rcix3q845zsmfj5857kq1r5b8m7m3sad34i23k65m0p58clwdqm"; + sha256 = "sha256-VXWSoVRfgJWf9rOT4SE1mTJdeNmzR3TRc2pc6Pp1M5U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix index 6d22c1fd84..262370f610 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-louvain"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KoVu374plSpgpVOKhLt4zKGPaISoi5Ml6FoRyN1JF+s="; + sha256 = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs="; }; propagatedBuildInputs = [ networkx numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix index bd557c402f..dbd51166a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-lsp-black"; - version = "1.0.1"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-black"; rev = "v${version}"; - sha256 = "03k32m4jfqfzrawj69yxhk9kwzsdcwginip77kxdbra2xwgqfc3w"; + sha256 = "sha256-WIQf1oz3b1PLIcXfQsu4hQ58nfp7l3J7zkcWNT6RbUY="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index b000379dd1..3135243516 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -20,6 +20,7 @@ , pythonOlder , rope , setuptools +, stdenv , ujson , yapf , withAutopep8 ? true @@ -73,14 +74,17 @@ buildPythonPackage rec { matplotlib numpy pandas - pyqt5 pytestCheckHook - ]; + ] + # pyqt5 is broken on aarch64-darwin + ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ]; disabledTests = [ # pytlint output changed "test_lint_free_pylint" - ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; + ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config" + # pyqt5 is broken on aarch64-darwin + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion"; disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" ++ lib.optional (!withRope) "test/plugins/test_completion.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix index aea8b6dab3..21f29efb28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d53f69238cdc454c0297f513e0b481a039d0bac723990ebd5ab9d3d29633956e"; + sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix index 8caa61517c..1cbdd2837a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-nest/default.nix @@ -1,23 +1,41 @@ -{ buildPythonPackage, fetchPypi, lib, python-dateutil, requests -, six, sseclient-py }: +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, requests +, six +, sseclient-py +, pythonOlder +}: buildPythonPackage rec { pname = "python-nest"; - version = "4.1.0"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "12iyypbl92ybh8w1bf4z0c2g0sb9id2c07c89vzvnlxgjylw3wbi"; + hash = "sha256-01hoZbDssbJ10NA72gOtlzjZMGjsUBUoVDVM35uAOLU="; }; - propagatedBuildInputs = [ python-dateutil requests six sseclient-py ]; - # has no tests + propagatedBuildInputs = [ + python-dateutil + requests + six + sseclient-py + ]; + + # Module has no tests doCheck = false; - pythonImportsCheck = [ "nest" ]; + + pythonImportsCheck = [ + "nest" + ]; meta = with lib; { - description = - "Python API and command line tool for talking to the Nest™ Thermostat"; + description = "Python API and command line tool for talking to the Nest™ Thermostat"; homepage = "https://github.com/jkoelker/python-nest"; license = licenses.cc-by-nc-sa-40; maintainers = with maintainers; [ jamiemagee ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix index 8e446d6b99..05efc97b64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix @@ -2,12 +2,15 @@ , buildPythonPackage , fetchPypi , ddt +, installShellFiles +, openstackdocstheme , osc-lib , pbr , python-cinderclient , python-keystoneclient , python-novaclient , requests-mock +, sphinx , stestr }: @@ -20,6 +23,12 @@ buildPythonPackage rec { sha256 = "c65e3d51018f193cce2daf3d0fd69daa36003bdb2b85df6b07b973e4c39e2f92"; }; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + ]; + propagatedBuildInputs = [ osc-lib pbr @@ -28,6 +37,11 @@ buildPythonPackage rec { python-novaclient ]; + postInstall = '' + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/openstack.1 + ''; + checkInputs = [ ddt stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix index b494d2e442..0d34262ea3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "gijzelaerr"; repo = "python-snap7"; rev = version; - sha256 = "103drdwf4v3yqvd7sscxx154mmmshb6x19v9yqmkj2lj76m0619s"; + sha256 = "18z13wb2q5q3msp9w3wddg1byp7picczw4ng8w1ccj4npidxsqv8"; }; propagatedBuildInputs = [ setuptools six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix index e6c2d016bb..e11f5ff1eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.0.0"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6.1"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iTwlUyfTD2ZhOvBX3IDqjkeW4Z2tfKxvQjIV7GGBVJA="; + sha256 = "1ixhi23x28bg45146p23z26y38rlz445xr0inwgx7avh0rs7vwfx"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 939c4404d8..8d6ab3aeec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.10"; + version = "13.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d2c555431821f4ace0c1b7ce12af41999f01b793b275dee131f1034d08c01e3e"; + sha256 = "sha256-uu/3BLqirD3BepRMAtqIgiitJY6Jvi5by9E6ilEC1XM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix index d79f357e50..3a47e107df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix @@ -3,17 +3,19 @@ , fetchFromGitHub , pytestCheckHook , six +, pytest-mypy }: buildPythonPackage rec { pname = "python-utils"; - version = "2.7.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "WoLpH"; repo = pname; rev = "v${version}"; - sha256 = "0gns9v5144cj03p7qbb3822scb6pwrlgr6niixpkynwqkcwjfg4c"; + sha256 = "sha256-+NgcVIDM9f2OKBpJNWlSyFxEONltPWJSWIu400/5RkQ= +"; }; # disable coverage and linting @@ -27,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-mypy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix index 9039c52a8a..8a9433ec89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, python, fetchFromGitHub, cmake, swig, opencascade, smesh, freetype, libGL, libGLU, libX11 -, Cocoa }: +{ lib, stdenv, python, fetchFromGitHub +, cmake +, Cocoa +, fontconfig +, freetype +, libGL +, libGLU +, libX11 +, libXext +, libXi +, libXmu +, opencascade-occt +, rapidjson +, smesh +, swig +}: stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "0.18.1"; + version = "7.5.1"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; rev = version; - sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3"; + sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s"; }; postPatch = '' @@ -20,8 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake swig ]; buildInputs = [ - python opencascade smesh - freetype libGL libGLU libX11 + python opencascade-occt smesh + freetype libGL libGLU libX11 libXext libXmu libXi + fontconfig rapidjson ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 784f73f718..e2c788f1b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -7,21 +7,22 @@ , graphql-subscription-manager , python-dateutil , pytz +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pytibber"; - version = "0.22.0"; + version = "0.22.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-4eARNxVXtJtUC0oxym1kv5z+WkxgCHJZtN3MrIMA8+s="; + hash = "sha256-kzKY9ixsAkfee5En0IzYl5izeXq3xY/8bc5Kz/qkE7U="; }; propagatedBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix index f68200e996..a94201b037 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2022.01.0"; + version = "2022.02.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-7iR2R/ESaBd29Xf6ZKMGY41/uU55tB62QOvT3dFSZaE="; + sha256 = "sha256-IGjM9yU/3EjO9sV1ZZUX7RUL/a6CcMPzANhVMTcbZGU="; }; nativeBuildInputs = [ 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 63991752a8..de75aa0ae8 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 @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "0.8.5"; + version = "1.5.8"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = version; - sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a"; + sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 0c1ca751eb..e9728b3d67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.99"; + version = "1.1.0"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "1ahs2b7q3hxi6yv4g2fjy7mvl899h56dvlpc2r9301440qsgkdzr"; + sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 564087769a..c370eaf6a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -117,7 +117,7 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.9.0"; + version = "1.10.2"; disabled = !isPy3k; @@ -132,7 +132,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gZmEhV1zzfr/5T2uNfS+8knzyJIxnv2COWVyiAzU9jM="; + sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU="; }; patches = lib.optionals stdenv.isDarwin [ @@ -304,7 +304,7 @@ in buildPythonPackage rec { passthru = { inherit cudaSupport; cudaArchList = final_cudaArchList; - # At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. + # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix index 1a2e6cc43e..e1c74b0846 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "8.0.1"; + version = "9.0.0"; + format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - hash = "sha256-Wxz2P55lc7yJ1OXNXYWb25a+xtMs1sANNc7hE7nawHI="; + hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; }; propagatedBuildInputs = [ @@ -29,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pytradfri" ]; + pythonImportsCheck = [ + "pytradfri" + ]; meta = with lib; { description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index 20dbe0ba31..9156db165f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytrends"; - version = "4.7.3"; + version = "4.8.0"; disabled = isPy27; # python2 pandas is too old src = fetchPypi { inherit pname version; - sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; + sha256 = "sha256-BLezPrbfwSCqictGQGiKi2MzNydrbdzqRP8Mf2tiQ9I="; }; propagatedBuildInputs = [ requests lxml pandas ]; 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 b7558bc631..595b4c3573 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.1.11611"; + version = "9.1.11752"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-HLnylnRBpPdGJKmhVYFEnvK2nJew0yfNDZyU5ly7xiw="; + hash = "sha256-DI+Jc5MtDd2XXfjIDtPd8qt4/eQ/3nwbDUqWE2haUhM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix index 1a78aefa6d..10e07f4e22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix @@ -2,25 +2,35 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , pyyaml }: buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.19"; + version = "0.2.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Julius2342"; repo = pname; rev = version; - sha256 = "031gp3sjagvmgdhfpdqlawva425ja1n3bmxk6jyn4zx54szj9zwf"; + sha256 = "1irjix9kr6qih84gii7k1a9c67n8133gpnmwfd09550jsqdmg006"; }; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pyvlx" ]; + pythonImportsCheck = [ + "pyvlx" + ]; meta = with lib; { description = "Python client to work with Velux units"; 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 f1dbd72cef..c115174b6e 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.9"; + version = "0.4.10"; src = fetchPypi { inherit pname version; - sha256 = "EJ/Ul1ZpIQa5Mw6UmkRi7GC+b+mCMqhto6EsfNjpCdg="; + sha256 = "sha256-3fVAJXiIS6sFUj8riHg7LJ4VLLpjZEK8qTJNYSaXtOw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix index 32a5c5d8ab..a36f3a2ccf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "v${version}"; - sha256 = "17zas565jqvp0qrs8l589rm4f9xpyynhqk8lrqcx089w3rv0hh2p"; + sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; }; propagatedBuildInputs = [ 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 1e2f8db96c..15545acf2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-NwhKrk5cQT7kk4VCr0BMQz0yTP/vuBA6MjTRuk2LM5Y="; + hash = "sha256-bGoqhrjoRKUGPBNfmr2XP+1HL5mdRi6XoCi0BdvY9x8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix index 16a72550ff..919b2a7574 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.4.16"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Da5hkmzGJtfqiDPV9X02opv54Ry6sGiSbDnej9a2QDA="; + sha256 = "sha256-1iu+Ztwwm97fyBWyYkFiATxjJYVLiW1y0QmSO2LzjMo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix index a1f466cfe6..8c2d660158 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.3"; + version = "0.15.7"; src = fetchPypi { inherit pname version; - sha256 = "sCHeiD6KugHZLtxcVcLggdHC1gqCxStuHy1065TbGiY="; + sha256 = "EJAqtzFKx9Zripspv3lXIDj54pqHV0in6RrOCgFUyU8="; }; # The XWayland detection uses some hard-coded FHS paths. Since we diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix index 6b9b94b603..6e3b6064fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.8.1"; + version = "3.0.3"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"; + sha256 = "936d2d35b552f429803a985dbc17fc879a2f966faa9fbf8983896ccfa33e68f6"; }; # No tests available diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiling/default.nix index 3576f5b736..51c762c810 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiling/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "qiling"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xUoNHMyGN0G2itVcKLsk+7QKxZdguzyh6OZCqCHNB4Y="; + sha256 = "e72dc5856cbda975f962ddf063063a32bd6c3b825f75e0795e94ba6840a7d45f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix index b2e708d586..13ffac0c2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.9.1"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g="; + sha256 = "0icdsiwpvjwiakg94i562wpgnj1qd7l8pkcjnvfwksq4w3pd9xjg"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix index d4eaa58e7a..05676a60f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.2.1"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY="; + sha256 = "1wpx519apnpp25yiq20warg4q8yv09x8fk0m8b9kyp199x86iffp"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 5b304bf389..0c8f74cf66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.18.1"; + version = "0.18.3"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-rySSCyI+62G7kL1ZRtjX1WeWj3LPXECvrlXAcIDINF4="; + sha256 = "1n1w1lnq2xw94hhhn6kdvw8dqlxk5fxwpm8ng31gxbp1s3qgni17"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index f7ebbee39f..a8f45b73e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0="; + hash = "sha256-5dsRKsz/nruWKuox/WJBghp2CWSDuYvax+G5ZxjZG4s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix index a2006079c1..511bc0b2a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.2.1"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY="; + sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix index 09941fcdd4..66f7bdbf62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.2.2"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY="; + sha256 = "1lr198l2z9j1hw389vv6mgz6djkq4bw91r0hif58jpg8w6kmzsx9"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix index 5d9ae3d437..b1ce0561dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.2.3"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img="; + sha256 = "18qs0m21j73fjawq3pxz5q5c0g2wgqgicy7p4a57lialpv6vrmc0"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index da31f86500..75d4ba2c0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -56,7 +56,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.18.3"; + version = "0.19.1"; disabled = pythonOlder "3.6"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs="; + sha256 = "16d8dghjn81v6hxfg4bpj3cl2csy2rkc279qvijnwp2i9x4y8iyq"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix index 9d05060600..b6195d9bd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix @@ -29,7 +29,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.32.1"; + version = "0.34.1"; disabled = pythonOlder "3.6"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-0L4TlolvL1akHhWSJ0GRQ/Cu/rZ+Es00jjNM5Ho2uEA="; + sha256 = "08hfd5ny206x2d9r700wgcmqvh0vcisp4kbv6n3grdizwbvh0ny0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix new file mode 100644 index 0000000000..a85f2ad689 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyqt5 +, twisted +, pytest-twisted +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "qt5reactor"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "c3470a8a25d9a339f9ca6243502a9b2277f181d772b7acbff551d5bc363b7572"; + }; + + propagatedBuildInputs = [ + pyqt5 + twisted + ]; + + checkInputs = [ + pytest-twisted + pytestCheckHook + ]; + + pythonImportsCheck = [ "qt5reactor" ]; + + meta = with lib; { + description = "Twisted Qt Integration"; + homepage = "https://github.com/twisted/qt5reactor"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index 4bcb536ad8..5c4984ca3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -1,21 +1,49 @@ -{ lib, buildPythonPackage, fetchPypi, pyside, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# propagates +, packaging + +# tests +, pyqt5 +, pyside +, pytestCheckHook +}: buildPythonPackage rec { pname = "QtPy"; - version = "1.11.3"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d427addd37386a8d786db81864a5536700861d95bf085cb31d1bea855d699557"; + sha256 = "777e333df4d711b2ec9743117ab319dadfbd743a5a0eee35923855ca3d35cd9d"; }; - # no concrete propagatedBuildInputs as multiple backends are supposed - checkInputs = [ pyside pytest ]; + propagatedBuildInputs = [ + packaging + ]; - doCheck = false; # require X - checkPhase = '' - py.test qtpy/tests - ''; + doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity' + checkInputs = [ + pyside + (pyqt5.override { + withConnectivity = true; + withMultimedia = true; + withWebKit = true; + withWebSockets = true; + }) + pytestCheckHook + ]; + + disabledTestPaths = [ + # Fatal error in python on x86_64 + "qtpy/tests/test_uic.py" + ]; meta = with lib; { description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix index 28e08eade4..48cc70d5f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.5"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; + sha256 = "0fde20115410de21cefa786f3aeae69c1b51bb19ee492190324c1da705e61a81"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix index 38cf79e190..8d19e360ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "qutip"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04g7ixq1yrrid4lliqbcamnzyw5r0fjbl8ipklps234hvsjfwmxb"; + sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; }; # QuTiP says it needs specific (old) Numpy versions. We overwrite them here diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix index ac01b853c8..f75e5cc19e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , freezegun , humanize -, lark-parser +, lark , parse-type , pysingleton , pytestCheckHook @@ -29,7 +29,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - lark-parser + lark click colorful tag-expressions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix new file mode 100644 index 0000000000..57c07e0dc4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "railroad-diagrams"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8a1ec227666be2000e76794aa740f77987f1586077aae4d090d2633b3064c976"; + }; + + # this is a dependency of pyparsing, which is a dependency of pytest + doCheck = false; + + pythonImportsCheck = [ "railroad" ]; + + meta = with lib; { + description = "Generate SVG railroad syntax diagrams, like on JSON.org"; + homepage = "https://github.com/tabatkins/railroad-diagrams"; + license = licenses.cc0; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix index 2ffe190a47..73f170b90b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , html5lib , isodate , networkx @@ -16,14 +16,16 @@ buildPythonPackage rec { pname = "rdflib"; - version = "6.0.2"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-YTauBWABR07ir/X8W5VuYqEcOpxmuw89nAqqX7tWhU4="; + src = fetchFromGitHub { + owner = "RDFLib"; + repo = pname; + rev = version; + hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd"; }; propagatedBuildInputs = [ @@ -41,6 +43,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # requires network access + "--deselect rdflib/__init__.py::rdflib" + "--deselect test/jsonld/test_onedotone.py::test_suite" + ]; + disabledTests = [ # Requires network access "api_key" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix index c83a2bba1c..81c489bd8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, flake8 + +# tests +, pytestCheckHook +, pexpect +}: buildPythonPackage rec { pname = "readchar"; - version = "2.0.0"; + version = "3.0.5"; + format = "setuptools"; # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; repo = "python-${pname}"; - rev = version; - sha256 = "0j1vj4f2j8x5f40rs6h8qplklcxcdbvkkvjpkpmr1xagw05i12bm"; + rev = "v${version}"; + sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; }; - nativeBuildInputs = [ flake8 ]; - checkInputs = [ pytest pytest-cov pexpect ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov readchar" "" + ''; + + nativeBuildInputs = [ + flake8 + ]; + + checkInputs = [ + pytestCheckHook + pexpect + ]; meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix index f64faaf82c..65ab0cb268 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix @@ -40,6 +40,11 @@ buildPythonPackage rec { --replace "cmarkgfm>=0.5.0,<0.7.0" "cmarkgfm>=0.5.0,<1" ''; + disabledTests = [ + # https://github.com/pypa/readme_renderer/issues/221 + "test_GFM_" + ]; + pythonImportsCheck = [ "readme_renderer" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix index eef2459c25..8ebf9a2d26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.6"; + version = "0.1.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "0v9a8p0ynikqzg7vvinvik5gjvsc5nrfqkq528mhcw7y4hmj8ndm"; + sha256 = "sha256-gGr9yzcEgcte2uYhHzgmqT80JRJyRia31bK/v+42teU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix index 71f94d489a..69a1b11fea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.56"; + version = "0053"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ld1KDWweaG7y7EPN6Y19PzQRGCIFAPEb6AmlXXbjgCU="; + sha256 = "0qjp7n2qa9n9fdhfcgfgw89hy19z5144cxhkhmhv1xnfdiz175qd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index 9fac4f0c24..82d84dc26a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.3"; + version = "3.6.5"; src = fetchPypi { inherit pname version; - sha256 = "be4f05230eb17b9c9c61a180ab0c89c30112da2823c77807a2a5ddba19365865"; + sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a"; }; checkInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix index 1b33bb6954..47bb842cc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "repoze.who"; - version = "2.4"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cf97450de3c8eb5c03b4037be75b018db91befab1094204e452a0b1c0f7a94a6"; + sha256 = "sha256-ikybkmi0/w7dkG6Xwu7XzoPrn2LkJQv+A7zbum0xojc="; }; propagatedBuildInputs = [ zope_interface webob ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix index f095cf00a2..adaf824d3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.0"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,8 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "0gz6fyc6lgbab9k92cihrp3711r1wcp4xhs25qp176zbzgccbj43"; + sha256 = "sha256-MZ3N0zbo745erF52D6DqOEb4OPpXFwSsemi0z6Do02c= +"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix index 374627a1bb..d8cd9d81c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix @@ -1,22 +1,38 @@ -{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, requests, six }: +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, requests +, six +}: buildPythonPackage rec { - pname = "requests-file"; + pname = "requests-file"; version = "1.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e"; + hash = "sha256-B9dCCNM4nQHDirie9AOvDP7GOVfVOgCB2OynONAkfY4="; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ + requests + six + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - meta = { - homepage = "https://github.com/dashea/requests-file"; + pythonImportsCheck = [ + "requests_file" + ]; + + meta = with lib; { description = "Transport adapter for fetching file:// URLs with the requests python library"; - license = lib.licenses.asl20; + homepage = "https://github.com/dashea/requests-file"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix index 7a27055aba..c51e24e0ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "requests-http-signature"; version = "0.2.0"; + format = "setuptools"; - # .pem files for tests aren't present on PyPI src = fetchFromGitHub { owner = "pyauth"; repo = pname; rev = "v${version}"; - sha256 = "1jsplqrxadjsc86f0kb6dgpblgwplxrpi0ql1a714w8pbbz4z3h7"; + hash = "sha256-B45P/loXcRKOChSDeHOnlz+67mtmTeAMYlo21TOmV8s="; }; propagatedBuildInputs = [ @@ -27,17 +27,21 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + pytestFlagsArray = [ + "test/test.py" + ]; disabledTests = [ # Test require network access "test_readme_example" ]; - pythonImportsCheck = [ "requests_http_signature" ]; + pythonImportsCheck = [ + "requests_http_signature" + ]; meta = with lib; { - description = "A Requests auth module for HTTP Signature"; + description = "Requests authentication module for HTTP Signature"; homepage = "https://github.com/kislyuk/requests-http-signature"; license = licenses.asl20; maintainers = with maintainers; [ mmai ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix index 40bbb1aa6c..3a1382061b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,33 +1,29 @@ { lib -, fetchFromGitHub , buildPythonPackage , cryptography -, requests +, fetchFromGitHub , pykerberos , pyspnego -, pytestCheckHook , pytest-mock -, mock +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "requests-kerberos"; version = "0.14.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # tests are not present in the PyPI version src = fetchFromGitHub { owner = "requests"; repo = pname; rev = "v${version}"; - sha256 = "0s30pcnlir3j2jmf7yh065f294cf3x0x5i3ldskn8mm0a3657mv3"; + hash = "sha256-Y9dTzFCgVmSnbnTE0kEfjpEkXDEA+uOqFHLkSC27YGg="; }; - # avoid needing to package krb5 - postPatch = '' - substituteInPlace setup.py \ - --replace "pyspnego[kerberos]" "pyspnego" - ''; - propagatedBuildInputs = [ cryptography requests @@ -36,12 +32,19 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook pytest-mock ]; - pythonImportsCheck = [ "requests_kerberos" ]; + # avoid needing to package krb5 + postPatch = '' + substituteInPlace setup.py \ + --replace "pyspnego[kerberos]" "pyspnego" + ''; + + pythonImportsCheck = [ + "requests_kerberos" + ]; meta = with lib; { description = "An authentication handler for using Kerberos with Python Requests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix index 946e406c8b..57f4d5787c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -9,26 +9,35 @@ buildPythonPackage rec { pname = "requests-unixsocket"; - version = "0.2.0"; + version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea"; + hash = "sha256-KDBCg+qTV9Rf/1itWxHkdwjPv1gGgXqlmyo2Mijulx4="; }; - nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + pbr + ]; - checkInputs = [ pytestCheckHook waitress ]; + propagatedBuildInputs = [ + requests + ]; - preCheck = '' - rm pytest.ini - ''; + checkInputs = [ + pytestCheckHook + waitress + ]; + + pythonImportsCheck = [ + "requests_unixsocket" + ]; meta = with lib; { description = "Use requests to talk HTTP via a UNIX domain socket"; homepage = "https://github.com/msabramo/requests-unixsocket"; license = licenses.asl20; - maintainers = [ maintainers.catern ]; + maintainers = with maintainers; [ catern ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix index 8ba7aef460..f5b021801f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix @@ -7,22 +7,23 @@ , charset-normalizer , fetchPypi , idna +, isPy27 +, isPy3k +, pysocks , pytest-mock , pytest-xdist , pytestCheckHook -, urllib3 -, isPy27 -, isPy3k , trustme +, urllib3 }: buildPythonPackage rec { pname = "requests"; - version = "2.26.0"; + version = "2.27.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + hash = "sha256-aNfFb9WomZiHco7zBKbRLtx7508c+kdxT8i0FFJcmmE="; }; patches = [ @@ -32,7 +33,8 @@ buildPythonPackage rec { postPatch = '' # Use latest idna - substituteInPlace setup.py --replace ",<3" "" + substituteInPlace setup.py \ + --replace ",<3" "" ''; propagatedBuildInputs = [ @@ -48,6 +50,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pysocks pytest-mock pytest-xdist pytestCheckHook @@ -73,11 +76,13 @@ buildPythonPackage rec { "TestTimeout" ]; - pythonImportsCheck = [ "requests" ]; + pythonImportsCheck = [ + "requests" + ]; meta = with lib; { - description = "Simple HTTP library for Python"; - homepage = "http://docs.python-requests.org/en/latest/"; + description = "HTTP library for Python"; + homepage = "http://docs.python-requests.org/"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix index 71cb33560e..3d51f4741a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix @@ -1,31 +1,44 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, types-setuptools }: + buildPythonPackage rec { pname = "requirements-parser"; - version = "0.2.0"; + version = "0.5.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "5963ee895c2d05ae9f58d3fc641082fb38021618979d6a152b6b1398bd7d4ed4"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "madpah"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-e2dfVBMh1uGRMDw7OdPefO4/eRxc3BGwvy/D7u5ipkk="; }; - checkInputs = [ - nose + nativeBuildInputs = [ + poetry-core ]; - checkPhase = '' - nosetests - ''; + propagatedBuildInputs = [ + types-setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "requirements" ]; meta = with lib; { - description = "A Pip requirements file parser"; + description = "Pip requirements file parser"; homepage = "https://github.com/davidfischer/requirements-parser"; license = licenses.bsd2; maintainers = teams.determinatesystems.members; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix index f5c1f43572..30345ae654 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "resolvelib" + ]; + meta = with lib; { description = "Resolve abstract dependencies into concrete ones"; homepage = "https://github.com/sarugaku/resolvelib"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix index cff31f782c..86e37419c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage -, cookies , fetchPypi -, mock , pytest-localserver , pytestCheckHook , pythonOlder @@ -13,21 +11,20 @@ buildPythonPackage rec { pname = "responses"; - version = "0.16.0"; + version = "0.17.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ouOsoqgnfmElfNOxwVSx3Q14Kxrj04t/o3y+P+tTF5E="; + hash = "sha256-7GdeCA0Gv40fteWmih5c0N9GsJx4IwMV9lCvXkA2vsc="; }; propagatedBuildInputs = [ requests - urllib3 six - ] ++ lib.optionals (pythonOlder "3.4") [ - cookies - ] ++ lib.optionals (pythonOlder "3.3") [ - mock + urllib3 ]; checkInputs = [ @@ -35,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "responses" ]; + pythonImportsCheck = [ + "responses" + ]; meta = with lib; { description = "Python module for mocking out the requests Python library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix index d085d43008..51d88446c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8="; + sha256 = "134h9526md242p7ql0cpknqvkpd3fhxk2vridkvswg91f532w180"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix index f4490c7287..62b419def8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "retworkx"; - version = "0.9.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "retworkx"; rev = version; - hash = "sha256-1W7DexS+ECAPsxyZAF36xcEguFkjUMX9lDBylNVPqyk="; + hash = "sha256-o3XPMTaiFH5cBtyqtW650wiDBElLvCmERr2XwwdPO1c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-y5l7jqrlk3ONHefZPS31IvcaO9ttXWLM7fIUmNVwbco="; + hash = "sha256-Zhk4m+HNtimhPWfiBLi9dqJ0fp2D8d0u9k6ROG0/jBo="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; 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 71a7d0730b..f8fcc9aef7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -1,17 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, idna +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "rfc3986"; - version = "1.5.0"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"; + sha256 = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw="; }; - propagatedBuildInputs = [ idna ]; + propagatedBuildInputs = [ + idna + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rfc3986" + ]; meta = with lib; { description = "Validating URI References per RFC 3986"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix index 82374a8a04..c33d44f628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "rflink"; - version = "0.0.58"; + version = "0.0.62"; format = "setuptools"; src = fetchFromGitHub { owner = "aequitas"; repo = "python-rflink"; rev = version; - sha256 = "1zab55lsw419gg0jfrl69ap6128vbi3wdmg5z7qin65ijpjdhasc"; + sha256 = "sha256-dEzkYE8xtUzvdsnPaSiQR8960WLOEcr/QhwDiQlobcs="; }; propagatedBuildInputs = [ @@ -34,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Remove loop, https://github.com/aequitas/python-rflink/pull/61 - (fetchpatch { - name = "remove-loop.patch"; - url = "https://github.com/aequitas/python-rflink/commit/777e19b5bde3398df5b8f142896c34a01ae18d52.patch"; - sha256 = "sJmihxY3fNSfZVFhkvQ/+9gysQup/1jklKDMyDDLOs8="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "version=version_from_git()" "version='${version}'" 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 eca38c08f0..ec735c057a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "665e8312750b3fc5f7002e656d05b9dcb6e93b6063df40d95c49ad90c19d1f0e"; + sha256 = "63b0465d2948cd9f01de449d7adfb92d207c1aef3982f20310f8009be4a507e8"; }; checkInputs = [ pytest hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index ed2ba7155c..012d899ef2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { - version = "5.1.3"; + version = "6.0.0"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "v${version}"; - sha256 = "1djlrbrgd7v15xk5w90xk7iy98cr1p2g57k614gvbd298dmnf2wd"; + sha256 = "1rjzz6mrx4zavcck2ry8269rf3dkvvs1qfa9ra7dkppbarrjin3f"; }; propagatedBuildInputs = [ robotframework selenium ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix index 81226a2345..63e87609ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { - version = "1.3"; + version = "2.1.0"; pname = "robotstatuschecker"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; rev = version; - sha256 = "0rppwwpp4djn5c43x7icwslnxbzcfnnn3c6awpg1k97j69d2nmln"; + sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; }; propagatedBuildInputs = [ robotframework ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index 9f102c5c92..c350f1df7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -1,9 +1,12 @@ { lib , aiohttp , aresponses +, awesomeversion +, backoff , buildPythonPackage , cachetools , fetchFromGitHub +, poetry , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,22 +16,29 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.12.0"; - format = "setuptools"; + version = "0.13.1"; + format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - sha256 = "1pqiba4zgx7knm1k53p6w6b9a81dalqfq2agdyrz3734nhl6gx1h"; + hash = "sha256-6bHEg7bpqldLDr3UX42GUg7kIDHVxtnVnrFr8CvTJU4="; }; + nativeBuildInputs = [ + # Requires poetry not poetry-core + poetry + ]; + propagatedBuildInputs = [ aiohttp + backoff cachetools xmltodict + awesomeversion yarl ]; @@ -38,6 +48,11 @@ buildPythonPackage rec { pytest-asyncio ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov" "" + ''; + disabledTests = [ # https://github.com/ctalkington/python-rokuecp/issues/249 "test_resolve_hostname" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix index ccc5749387..c9c4c9af5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.0.38"; + version = "0.0.39"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - sha256 = "sha256-vXx7MgoGjBPdx7uKUtAVqlXphPJYt5SyuTo2JlKia60="; + sha256 = "03m00qbdkm0vdflc48ds186kh9qjxqr6z602yn3l6fzj5f93zgh5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix new file mode 100644 index 0000000000..9cc4a85bee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rtsp-to-webrtc"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "rtsp-to-webrtc-client"; + rev = version; + hash = "sha256-ry6xNymWgkkvYXliVLUFOUiPz8gbCsQDrSuGmCaH4ZE="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rtsp_to_webrtc" + ]; + + meta = with lib; { + description = "Module for RTSPtoWeb and RTSPtoWebRTC"; + homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} 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 b12920fc76..143452274a 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 @@ -5,12 +5,13 @@ buildPythonPackage rec { pname = "ruamel-yaml-clib"; - version = "0.2.4"; + version = "0.2.6"; + format = "setuptools"; src = fetchhg { url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; - sha256 = "sha256-HQZY1opUvVQdXUHmsZmcYX2vfgjKsl6xATmVIXjnBlc="; + sha256 = "sha256-mpkh9JhYKRX47jfKprjt1Vpm9DMz8LcWzkotJ+/xoxY="; }; # no tests 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 4b6774a4f9..79f21ba6aa 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 @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.17"; + version = "0.17.20"; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - sha256 = "9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be"; + sha256 = "sha256-S4ozwe+ytEOpP8qvz6TS5EX46MKcUo2fXNr7fMnkAEw="; }; # Tests use relative paths diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix index 728d56527b..9d59efd9bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix @@ -10,6 +10,7 @@ , pythonOlder , requests , requests-mock +, setuptools-scm }: buildPythonPackage rec { @@ -26,6 +27,12 @@ buildPythonPackage rec { sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ defusedxml requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index 22d7eb1a09..d90d105228 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.11.1"; + version = "2022.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1a9ea7596663cda3a5dc6802f11eb468b397de35a8793750e9a98c65abd1a114"; + sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4"; }; buildInputs = [ 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 20da548c0e..80c4bd92a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.74.0"; + version = "2.75.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "14215f5077151a7f32ca048ff7fad63c977d7cdeadc93d93c8957efbe3c89ba6"; + sha256 = "sha256-MN/F7TWaKsQpKMR7Pxx0Vam1+O+PFEJ/H5jLJh3zpe4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix index c99a78e0cc..4bc446c2e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "0.7.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "v${version}"; - sha256 = "0ib6rf1ly1059lfprc3hpmy377c3wfgfhnar6n4jgbxiyin7vzm7"; + sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8"; }; postPatch = '' 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 2fab2a3df8..660ca5de80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "sanic"; - version = "21.9.3"; + version = "21.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = pname; rev = "v${version}"; - sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i"; + sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g"; }; postPatch = '' @@ -73,9 +73,24 @@ buildPythonPackage rec { preCheck = '' # Some tests depends on sanic on PATH PATH="$out/bin:$PATH" + PYTHONPATH=$PWD:$PYTHONPATH + + # needed for relative paths for some packages + cd tests ''; + # uvloop usage is buggy + #SANIC_NO_UVLOOP = true; + + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + disabledTests = [ + # Lack of uvloop setup through fixtures + "test_create_asyncio_server" + "test_listeners_triggered_async" + "test_tls_options" # Tests are flaky "test_keep_alive_client_timeout" "test_check_timeouts_request_timeout" @@ -103,6 +118,14 @@ buildPythonPackage rec { "test_version" ]; + disabledTestPaths = [ + # unable to create async loop + "test_app.py" + "test_asgi.py" + # occasionally hangs + "test_multiprocessing.py" + ]; + # avoid usage of nixpkgs-review in darwin since tests will compete usage # for the same local port __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix index 58cdfe646c..8375c62e97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.1.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "keboola"; repo = pname; rev = version; - sha256 = "1xja4v5d30hy26lfys21vcz1lcs88v8mvjxwl2dc3wxx2pzdvcf6"; + sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3"; }; postPatch = '' 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 c18f2934c2..4f823a5458 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 @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2021.10.29"; + version = "2022.2.2"; src = fetchPypi { inherit pname version; - sha256 = "799f36e918a2b64ed8434d6c4fef3a1a47757055955c240fba0d4aadccca26b2"; + sha256 = "sha256-0Pvm6Sn0OWOwEX7E4OhBwo2hxzQmGzV2Yvytkm14+ls="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix index e490d50294..69b9bf0546 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix @@ -8,6 +8,7 @@ , numpy , osqp , pandas +, setuptools-scm , scikit-learn , scipy , pytestCheckHook @@ -24,6 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython + setuptools-scm ]; propagatedBuildInputs = [ 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 bf3e1d1ef4..cf2e524337 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 @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "scikit-tda"; - version = "0.0.4"; + version = "1.0.0"; disabled = isPy27; src = fetchFromGitHub { owner = "scikit-tda"; repo = "scikit-tda"; - rev = version; - sha256 = "0a90k6i9fkmc9gf250b4fidx2fzd2qrn025l74mjk51fvf23q13a"; + rev = "v${version}"; + sha256 = "0yhmf5jmxywyj6l9q0rfv9r8wpdk063fvvfnb4azwwccblgz37rj"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix index 7adef77210..bc02e81e2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.3"; + version = "1.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "farfar"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-EOaFZch/C9N4lacZ4IqIJUVSaEn8wOFN/WN6WOL/1mo="; + rev = version; + hash = "sha256-NA/UiapJ/SyUmrj9hd2xGV5WWy1KhxwQtqGLV73TfHk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix index 1637814cad..cfcc235f15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { ''; postPatch = '' - sed -i '38,45d' setup.py + # don't do hacky tarball download + setuptools check + sed -i '38,54d' setup.py substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index 4b1d79d0e5..c9b6d7c968 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.5"; + version = "6.9.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "1r8xh0c6wivrajj6gl1hv25vsb9i79n19nd4x53207i5vz9d55g5"; + sha256 = "sha256-6MkAtkbKVoa8UatG92RzbCdAM+WsQN2WnOIh4pRoUVk="; }; propagatedBuildInputs = [ 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 a59ec10be0..a2c8ea9584 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,14 +40,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.2"; + version = "1.5.4"; format = "setuptools"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "086kzvrpy1c7kiwjrdyr4i4a8dp4vncsc8dk6hp8c7bwswfffa3d"; + sha256 = "sha256-MZ1J2Stq+pRoeJ05hv8cSpxtaeRGaJEWAtidbr8YP88="; }; propagatedBuildInputs = [ @@ -109,6 +109,8 @@ buildPythonPackage rec { "test_circular_references" # Failing wsgi test "test_session_mode_defaults_to_request_mode_in_wsgi_handler" + # Network requests to public web + "test_crumb_capture" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix index 07b521ee94..c42565082c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix @@ -23,14 +23,25 @@ buildPythonPackage rec { sha256 = "21hABRiY8CTKkpFjePgBAtjs4/G5eFS3aPNMCBC41CY="; }; + preBuild = '' + export PYGRADLE_PROJECT_VERSION=${version}; + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + checkInputs = [ git mock pep440 pytestCheckHook - setuptools-scm ]; + preCheck = '' + unset PYGRADLE_PROJECT_VERSION + ''; + disabledTests = [ # Tests want to scan site-packages "test_check_dependencies" 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 81276f4e33..2ab609c7d0 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 @@ -6,22 +6,23 @@ , semantic-version , setuptools , setuptools-scm +, typing-extensions , toml }: buildPythonPackage rec { pname = "setuptools-rust"; - version = "0.12.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e"; + sha256 = "a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1"; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ semantic-version setuptools toml ]; + propagatedBuildInputs = [ semantic-version setuptools toml typing-extensions ]; doCheck = false; pythonImportsCheck = [ "setuptools_rust" ]; 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 62568869b7..c175cfb4c6 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 @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "6.3.2"; + version = "6.4.2"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4"; + sha256 = "sha256-aDOsZcbtlxGk1dImb4Akz6B8UzoOVfTBL27/KApanjA="; }; propagatedBuildInputs = [ 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 efac8148a7..78e160058b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , setuptools-scm +, bashInteractive }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + bashInteractive pytest-timeout pytestCheckHook ]; @@ -37,11 +39,6 @@ buildPythonPackage rec { --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" ''; - disabledTests = [ - # bash tests are failing - "bash" - ]; - pythonImportsCheck = [ "shtab" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index bbfd95cd92..fa813c4b5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2021.12.2"; + version = "2022.02.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-XVSoPPBdjSQBYrUs0AFGsGFRrQOWbPzlB2mmEBSbFI4="; + sha256 = "sha256-r+TcSzFkEGRsuTtEHBT/GMNa9r6GsIyvbLaF32cFfeQ="; }; nativeBuildInputs = [ @@ -40,7 +40,6 @@ buildPythonPackage rec { backoff docutils pytz - types-pytz voluptuous websockets ]; @@ -51,6 +50,7 @@ buildPythonPackage rec { pytest-aiohttp pytest-asyncio pytestCheckHook + types-pytz ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinjar.nix b/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinjar.nix index c1a0d8a575..d29e0e2f99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinjar.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinjar.nix @@ -4,9 +4,9 @@ let skeinRepo = callPackage ./skeinrepo.nix { inherit src version; }; in stdenv.mkDerivation rec { - name = "skein-${version}.jar"; + pname = "skein.jar"; - inherit src; + inherit version src; nativeBuildInputs = [ maven ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix b/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix index d7bdef56eb..86cbf82b7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skein/skeinrepo.nix @@ -1,9 +1,9 @@ { autoPatchelfHook, lib, maven, stdenv, src, version }: stdenv.mkDerivation rec { - name = "skein-${version}-maven-repo"; + pname = "skein-maven-repo"; - inherit src; + inherit version src; nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix index 5196651959..3d1566bac4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.12"; + version = "1.1.18"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lendy007"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-OKNw+t8S6rRQDKNRBN/CU36OwWojuOH6mMQ5QItkkb8="; + rev = version; + hash = "sha256-etcNdiuCgOe08HkOL+kXACoBAouDGUBqpaKUercud84="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 8a8957459e..3c88cc9e7f 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 @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.13.0"; + version = "3.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-L12faNLwjlEkJZ9s9aIyUHSk7x3n908EHCYU9jECiYQ="; + sha256 = "sha256-KhEfD8k7qQMfY2ErqApn1K1lhIJgBiVBjjWKL2DjNdg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix index 800cf08425..5e8344e3d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "smmap"; - version = "4.0.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182"; + sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"; }; checkInputs = [ nosexcover ]; 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 d13fbfb788..744883302a 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 @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.3"; + version = "2.7.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "026562392d8733bdfaddcd5ec1537a139940df46a3a225849a36c71c1bf3e61c"; + sha256 = "sha256-Es8Xe7yHetAl9bAO83ecTuv9r0cueRL4fCvNyfOGQAg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix index 1a7747e2c2..ac95384fb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , graphviz +, appdirs , ifaddr , pythonOlder , mock @@ -14,17 +15,18 @@ buildPythonPackage rec { pname = "soco"; - version = "0.25.3"; + version = "0.26.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-CoAmpcXy4oHMk0X4iJ/XMbUnI2m3ZWl8QzobH677FrI="; + sha256 = "sha256-VOGdv3g11OzNeTlBwm8hRy6fThDKVKIlgQxR4b07y/8="; }; propagatedBuildInputs = [ + appdirs ifaddr requests xmltodict diff --git a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix index b0705346ab..e5a55cc9bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "5.9.8"; + version = "5.9.9"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "v${version}"; - sha256 = "087kyl2yacvh12i4x3357659mgq4xycv8a4y9rl3rj57kp5jc6ah"; + sha256 = "sha256-LskPz5KXOi7olb3+DUP9uEFESQeo6ec/ZLx9B/w6Ni0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix index 757c945f3f..2f70732caa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; postPatch = '' - sed -i 's/transformers>=3.4.0,<4.12.0/transformers/' setup.cfg + sed -i 's/transformers>=3.4.0,<4.13.0/transformers/' setup.cfg ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 05561e995a..80c66bccc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -64,6 +64,11 @@ buildPythonPackage rec { langcodes ] ++ lib.optional (pythonOlder "3.8") typing-extensions; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic~=1.2" + ''; + checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix index b11ca178fc..fae812319e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix @@ -12,6 +12,7 @@ , pytestCheckHook , pytest-astropy , astropy-helpers +, setuptools-scm }: buildPythonPackage rec { @@ -24,6 +25,12 @@ buildPythonPackage rec { sha256 = "1c0pp82wgl680w2vcwlrrz46sy83z1qs74w5bd691wg0512hv2jx"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ astropy casa-formats-io radio_beam joblib six dask ]; checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-copybutton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-copybutton/default.nix index 8d408d300c..259a7dde28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-copybutton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-copybutton/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "sphinx-copybutton"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-copybutton"; rev = "v${version}"; - sha256 = "sha256-vrEIvQeP7AMXSme1PBp0ox5k8Q1rz+1cbHIO+o17Jqc="; + sha256 = "sha256-W27kCU/8NHoBtiAyA+CgNa00j6ck3CAaq1hLLGo60Ro="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix index 6f721ad1a8..7f5ea8c424 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sphinx-jinja"; - version = "1.1.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0hz13vc65zi4zmay40nz8wzxickv1q9zzl6x03qc7rvvapz0c91p"; + sha256 = "e6614d986c0289cb85b016c25eb8cb9781ceb841e70bee639c5123f39ad90b38"; }; buildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index 75693f3657..19961cc2ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -8,12 +8,13 @@ , alabaster , docutils , imagesize +, importlib-metadata , jinja2 , packaging , pygments , requests -, setuptools , snowballstemmer +, sphinxcontrib-apidoc , sphinxcontrib-applehelp , sphinxcontrib-devhelp , sphinxcontrib-htmlhelp @@ -29,14 +30,14 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.3.1"; + version = "4.4.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Yj6cPZFG8ycbbZtMR+fsIAOX0brxroi6nYjP+WhnxA="; + sha256 = "sha256-Q4CqPO08AfR+CDB02al65A+FHRFUDUfFTba0u8YQx+8="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -54,7 +55,6 @@ buildPythonPackage rec { packaging pygments requests - setuptools snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp @@ -64,6 +64,11 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport + + # extra plugins which are otherwise not found by sphinx-build + sphinxcontrib-apidoc + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; checkInputs = [ @@ -114,6 +119,6 @@ buildPythonPackage rec { ''; homepage = "https://www.sphinx-doc.org"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = teams.sphinx.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix new file mode 100644 index 0000000000..c7bdb26b00 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-apidoc"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; + }; + + postPatch = '' + # break infite recursion, remove pytest 4 requirement + rm test-requirements.txt requirements.txt + ''; + + propagatedBuildInputs = [ + pbr + ]; + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with lib; { + description = "Sphinx extension for running sphinx-apidoc on each build"; + homepage = "https://github.com/sphinx-contrib/apidoc"; + license = licenses.bsd2; + maintainers = teams.openstack.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 9c3c16657f..ef7a50382c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 1f33c06b98..293f4c856e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -12,14 +12,13 @@ buildPythonPackage rec { sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 51084adf6e..901132176e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "Sphinx extension which renders HTML help files"; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index cd67732605..da630c6ee9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 9d16ede62a..4364fcb99d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index a238c0191a..85ed3cdc59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index 4c43ce2f16..4ddacc9119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6b19ea224f183dbff8ff0031bee35ae6b5b3a6eef4aa84cfab04e3bc3e304b91"; + sha256 = "574ee1bd03f7236b9f9dacae34936a0625cd67ccfe3df11fec69f26889a0b866"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix index 38558f0049..419ac6bbb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.2.0"; + version = "5.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cd04acc88426acee9c4ce6bb91f50c13fc161a437e68bca701243b3415ce9d08"; + sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 685bb829dd..05ef00dae0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.37.9"; + version = "0.38.2"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "4667edbdcb1ece011076b69772ef524bfbb17cc97e03f11ee6b85d98e7741d61"; + sha256 = "9e01d6d3fb52d3926fcd4ea4a13f3540701b751aced0316bff78264402c2ceb4"; }; 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 085195f5a7..1d6406c5db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.29"; + version = "1.4.31"; src = fetchPypi { inherit pname version; - sha256 = "sha256:+iutFOFHS6ZJz8lpwdLskV3T55Z380a7/gjpPvkCCzk="; + sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg="; }; propagatedBuildInputs = [ 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 362b6dadd0..07a7fa0448 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 @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.22.1"; + version = "3.23"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "35ebb4f7e2b09f1818b36e7da6dc62f1ca57e2c0d99a9cbc8151e634d75a7906"; + sha256 = "sha256-BNlOP/gWDERh4Rzth5zjeghHr7ozyAGeRJxoeE6baWY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix index 1c28d6a097..178617e18d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix @@ -1,22 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "sqlitedict"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; rev = version; - sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m"; + sha256 = "08fr81rz1fz35d35kravg7vl234aqagr9wqb09x6wi9lx9zkkh28"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest tests + preCheck = '' + mkdir tests/db ''; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Persistent, thread-safe dict"; homepage = "https://github.com/RaRe-Technologies/sqlitedict"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix index c5d20436a0..d0ac360244 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "srpenergy"; - version = "1.3.5"; + version = "1.3.6"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "lamoreauxlab"; repo = "srpenergy-api-client-python"; rev = version; - sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI="; + hash = "sha256-aZnqGtfklWgigac2gdkQv29Qy5HC34zGGY2iWr2cOMo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix index 90e4962d3e..3c53864ec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , paramiko -, pytest +, pytestCheckHook , mock }: @@ -15,12 +15,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; - checkInputs = [ pytest mock ]; + checkInputs = [ pytestCheckHook mock ]; # disable impure tests - checkPhase = '' - pytest -k 'not connect_via_proxy and not read_ssh_config' - ''; + disabledTests = [ + "test_get_keys" + "connect_via_proxy" + "read_ssh_config" + ]; meta = with lib; { description = "Pure python SSH tunnels"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix index 587572646a..f76ba96a5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sslyze"; - version = "5.0.0"; + version = "5.0.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-7kUriEMHcGCXKs42KVWxXvM+JEEWf/8tnuoGujHbqHY="; + hash = "sha256-8xtnE5oFxH3wo2Smt65/xGDHxivexN6ggUpyUg42Cjk="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 9612ac999c..1084a50be7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -12,7 +12,6 @@ , requests , aiosqlite , databases -, pytest-asyncio , pytestCheckHook , pythonOlder , trio @@ -58,7 +57,6 @@ buildPythonPackage rec { checkInputs = [ aiosqlite databases - pytest-asyncio pytestCheckHook trio typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix index 44cd64821d..ac3c173c09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-YHhGohA24D4O/Bj7JZTj8qaEGEZAupvxWcZYjWFTHmM="; + sha256 = "0qqyadhqsn66b7qrpfj08qc899pjwfa2byqqzh73xq1n22i4cy30"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix new file mode 100644 index 0000000000..7de42d5bc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, attrs +, cattrs +, fonttools +, fs +, pytestCheckHook +, ufo2ft +, ufoLib2 +}: + +buildPythonPackage rec { + pname = "statmake"; + version = "0.4.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "daltonmaag"; + repo = "statmake"; + rev = "v${version}"; + sha256 = "OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + cattrs + fonttools + # required by fonttools[ufo] + fs + ]; + + checkInputs = [ + pytestCheckHook + ufo2ft + ufoLib2 + ]; + + postPatch = '' + # https://github.com/daltonmaag/statmake/pull/41 + substituteInPlace pyproject.toml \ + --replace 'requires = ["poetry>=1.0.0"]' 'requires = ["poetry-core"]' \ + --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' + ''; + + meta = with lib; { + description = "Applies STAT information from a Stylespace to a variable font"; + homepage = "https://github.com/daltonmaag/statmake"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix index 173458a634..0f01870c41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.1"; + version = "0.13.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69"; + sha256 = "sha256-d9wpLJk5wDakdvF3D50Il2sFQ32qIpko2nMjEUfN59Q="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix index 2e90d3350d..b6eb0c2672 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.4.0"; + version = "21.5.0"; format = "flit"; # sdist is missing conftest.py @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = version; - sha256 = "sha256-uXFSrC1TvQV46uu0sadC3eMq7yk5TnrpQE8m6NSv1Bg="; + sha256 = "0bc5lj0732j0hjq89llgrncyzs6k3aaffvg07kr3la44w0hlrb4l"; }; checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix index 92cd344edb..4757cd3231 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.45"; + version = "1.1.49"; disabled = !isPy3k; src = fetchFromGitHub { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - sha256 = "1ggfizw27wpcagbbk15xpfrhq6b250cx4278b5d7y8s438g128cs"; + sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q"; }; propagatedBuildInputs = [ 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 1b6d1033c4..24678319b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.16"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7waY5AOONi+u056JRH9KcoBWSB4AlMw4QcMW0uoCARc="; + sha256 = "sha256-EI7m2SFa1eAtncMA0g1OmXumzub4UvE6ssGfUGtLO2Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix index 9a0cf1a30f..145b24e557 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "33f075dc853807e56e92d6dc404104c6ccc7fb5388d96ab943d7b349b1c924c7"; + sha256 = "c77a0702fafd367c0fdca08ca1b7e1ee10058bde3bae252f49a3836e51e54519"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix index 7114f0aeba..55cea70924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix @@ -7,14 +7,14 @@ buildPythonApplication rec { pname = "sybil"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "597d71e246690b9223c132f0ed7dcac470dcbe9ad022004a801e108a00dc3524"; + sha256 = "sha256-dpLtZueT5eea5qcM8s+GGRftSOr/DYrfgl5k2Fgg8lE="; }; checkInputs = [ @@ -22,9 +22,9 @@ buildPythonApplication rec { ]; disabledTests = [ - # Will be fixed with 3.0.0, https://github.com/simplistix/sybil/pull/27 - "test_future_imports" - "test_pytest" + # sensitive to output of other commands + "test_namespace" + "test_unittest" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix index 3440393060..beca0ef814 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "sha256-AVMZBhf15eZM9oMUFyiHYs866P1v5z1pbTvX2Qpjzfc="; + sha256 = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix index 4558b3afb2..b854e09c05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.1.0"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d64c9f6712918a3d90ec5d71b44b8bab1083e3609e4844ad2be80eb633e097ed"; + sha256 = "12d8686454c721de88d8ca5adf07e1f419ef6dbcecedf65e8950d4a329daf3a0"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix index 96016b3f0d..67a384f4b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.1.6"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "1dkmjc78mhgbikfz6mi6g63a36w6v29pdbb3pvgpicg0l649rsc9"; + sha256 = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix index 9e0b83bc92..abbf70df62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "tap.py"; - version = "3.0"; + version = "3.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA="; + sha256 = "3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1"; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix new file mode 100644 index 0000000000..e378227b2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "teamcity-messages"; + version = "1.30"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "JetBrains"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5C9ElCmTH+xSrFQ/x9IRJ89RfSd9cxzkETlOCzwyU8s="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit-tests/" + ]; + + pythonImportsCheck = [ + "teamcity" + ]; + + meta = with lib; { + description = "Python unit test reporting to TeamCity"; + homepage = "https://github.com/JetBrains/teamcity-messages"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} 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 e9cd3e84fe..6999655c5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "4.1.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fd6cafd66b01390d53a760349cf0b3123844ec6ae3d1043d7190473ea9459138"; + sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26"; }; disabled = pythonOlder "3.2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index 1daaac6ae7..760e9a0e9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,7 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch -, bazel_0_26 , buildBazelPackage , buildPythonPackage , python @@ -11,47 +9,33 @@ , tensorflow , six , numpy +, dm-tree +, keras , decorator , cloudpickle , gast , hypothesis , scipy +, pandas +, mpmath , matplotlib , mock , pytest }: let - version = "0.8.0"; + version = "0.15.0"; pname = "tensorflow_probability"; # first build all binaries and generate setup.py using bazel bazel-wheel = buildBazelPackage { - bazel = bazel_0_26; - name = "${pname}-${version}-py2.py3-none-any.whl"; - src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = version; - sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy"; + rev = "v" + version; + sha256 = "155fgmra90s08vjnp61qxdrpzq74xa3kdzhgdkavwgc25pvxn3mi"; }; - - patches = [ - (fetchpatch { - name = "gast-0.3.patch"; - url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch"; - sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a"; - excludes = ["testing/*"]; - }) - (fetchpatch { - name = "cloudpickle-1.2.patch"; - url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch"; - sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga"; - }) - ]; - nativeBuildInputs = [ # needed to create the output wheel in installPhase python @@ -64,7 +48,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8"; + sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm"; }; buildAttrs = { @@ -98,34 +82,31 @@ in buildPythonPackage { decorator cloudpickle gast + dm-tree + keras ]; # Listed here: - # https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58 + # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 checkInputs = [ hypothesis pytest scipy + pandas + mpmath matplotlib mock ]; - # actual checks currently fail because for some reason - # tf.enable_eager_execution is called too late. Probably because upstream - # intents these tests to be run by bazel, not plain pytest. - # checkPhase = '' - # # tests need to import from other test files - # export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH" - # py.test - # ''; + # Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available. + # But it seems not guaranteed that running the tests with pytest will even work, see + # https://github.com/tensorflow/probability/blob/c2a10877feb2c4c06a4dc58281e69c37a11315b9/CONTRIBUTING.md?plain=1#L69 + # Ideally, tests would be run using Bazel. For now, lets's do a... # sanity check - checkPhase = '' - python -c 'import tensorflow_probability' - ''; + pythonImportsCheck = [ "tensorflow_probability" ]; meta = with lib; { - broken = true; # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2 description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 123c339fea..ceebad2a47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , pythonOlder +, pythonAtLeast , numpy , wheel , werkzeug @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; version = "2.6.0"; format = "wheel"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { pname = "tensorboard"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix index cb528b5b4e..7b548b763f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/terminaltables/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "terminaltables"; - version = "3.1.7"; + version = "3.1.10"; src = fetchPypi { inherit pname version; - sha256 = "5dab2f33927c0a020b8011c81b92830ff9fd4ba701657da5d7bfdc41048360a6"; + sha256 = "ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix index f0c26292c8..1cc20cc2cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "test-tube"; - version = "0.7.5"; + version = "0.628"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "williamFalcon"; repo = pname; rev = version; - sha256 = "0zpvlp1ybp2dhgap8jsalpfdyg8ycjhlfi3xrdf5dqffqvh2yhp2"; + sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m"; }; checkInputs = [ 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 b582bf4bc7..be4cdd6ec0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -22,6 +22,9 @@ buildPythonPackage rec { sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0="; }; + # no longer compatible with sybil + # https://github.com/simplistix/testfixtures/issues/169 + doCheck = false; checkInputs = [ mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix index ee2e2bb2c9..2eae44aeeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "textacy"; version = "0.12.0"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix index ae9bda2b8b..e1bfdb5909 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "textfsm"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm"; + sha256 = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index 9524f7e449..55bf72aec7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, python , fetchPypi , pytestCheckHook , blis @@ -39,6 +40,11 @@ buildPythonPackage rec { sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic" + ''; + buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin [ @@ -73,12 +79,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # Cannot find cython modules. - doCheck = false; + # Add native extensions. + preCheck = '' + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - pytestFlagsArray = [ - "thinc/tests" - ]; + # avoid local paths, relative imports wont resolve correctly + mv thinc/tests tests + rm -r thinc + ''; pythonImportsCheck = [ "thinc" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index bdd6ad2411..b310defa45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.6.6"; + version = "0.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = version; - sha256 = "0b2kn1xyf7d994kz29dpqiaf8yzvx0axw4yqi854c54pl22ddgzl"; + sha256 = "0iz16sgr5dpwc1jvb6brcmgvvg0npjdd98q4wgkqmvg7qif92zls"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index 58bf190495..29f2ffbc49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -3,37 +3,21 @@ , fetchFromGitHub , pytestCheckHook , requests +, pytest +, pythonOlder }: python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.1.2"; + version = "22.2.2"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw"; + sha256 = "sha256-U2OvvS61t4RnWAA/mv84TWRj+/8SRRXrBR+fX3bakqw="; }; - meta = with lib; { - homepage = "https://timetagger.app"; - license = licenses.gpl3; - description = "Tag your time, get the insight"; - maintainers = with maintainers; [ matthiasbeyer ]; - }; - - checkInputs = [ - pytestCheckHook - requests - ]; - - preCheck = '' - # https://github.com/NixOS/nixpkgs/issues/12591 - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - propagatedBuildInputs = with python3Packages; [ asgineer itemdb @@ -44,4 +28,23 @@ python3Packages.buildPythonPackage rec { uvicorn ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = [ + pytestCheckHook + requests + pytest + ]; + + # fails with `No module named pytest` on python version 3.10 + doCheck = pythonOlder "3.10"; + + meta = with lib; { + homepage = "https://timetagger.app"; + license = licenses.gpl3Only; + description = "Tag your time, get the insight"; + maintainers = with maintainers; [ matthiasbeyer ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix index 0b9e6547de..33fe952ad2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , pythonOlder , regex +, setuptools-scm }: buildPythonPackage rec { @@ -20,6 +21,12 @@ buildPythonPackage rec { sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ regex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tmb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tmb/default.nix index 713cf61392..10a6e3b00d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tmb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tmb/default.nix @@ -2,28 +2,39 @@ , buildPythonPackage , fetchFromGitHub , requests +, pythonOlder }: buildPythonPackage rec { pname = "tmb"; - version = "0.1.1"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alemuro"; repo = pname; rev = version; - sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE="; + hash = "sha256-/syHSu9LKLDe3awrgSIHh0hV+raWqKd53f43WagHn9c="; }; - propagatedBuildInputs = [ requests ]; + VERSION = version; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "tmb" + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "tmb" ]; meta = with lib; { - homepage = "https://github.com/alemuro/tmb"; description = "Python library that interacts with TMB API"; + homepage = "https://github.com/alemuro/tmb"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix index 1bbac9ce9d..30c3f08f52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.2"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "1wgh231r16jyvaj1ch1pajvl9szflb4srs505pfdwdlqvz7rzww8"; + sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; }; nativeBuildInputs = [ 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 c593e1e4cb..551655eebf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix @@ -3,6 +3,12 @@ , callPackage , fetchFromGitHub , flit-core + +# important downstream dependencies +, flit +, black +, mypy +, setuptools-scm }: buildPythonPackage rec { @@ -41,6 +47,7 @@ buildPythonPackage rec { passthru.tests = { pytest = callPackage ./tests.nix { }; + inherit flit black mypy setuptools-scm; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix index fd6cec70f0..6c8455f060 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"; + sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1"; }; propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 4774e09f0b..7b6384966a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i"; + sha256 = "sha256-nJV0Jr6Uc+ALodAiekM6YpM6IbmIb4w+Jlc3bJRqayI="; }; nativeBuildInputs = [ libpng ninja which ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix index b4343b5d5f..3be82e40a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tornado"; version = "4.5.3"; - disabled = isPy27; + disabled = isPy27 || python.pythonAtLeast "3.10"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix index 8940a57196..2307073c32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.24.4"; + version = "3.24.5"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"; + sha256 = "67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index 606308f889..3973d68b6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { # pandas is not supported on i686 or risc-v lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; + pytestFlagsArray = [ + # pytest-asyncio 0.17.0 compat; https://github.com/tqdm/tqdm/issues/1289 + "--asyncio-mode=strict" + ]; + # Remove performance testing. # Too sensitive for on Hydra. disabledTests = [ 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 917aef54b6..814eb16402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.15.0"; + version = "4.16.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "05qwrs040sqxk5fi44rjx0s5ba4897iw8l7yk8f1xzv314df05fg"; + sha256 = "sha256-XF29JKIaOqZ/PdU+zu+wX7TAl1TKz+HcOutHDABc/PY="; }; nativeBuildInputs = [ packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix index 3420773372..1e510db972 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -6,6 +6,8 @@ , requests , yarl , pythonOlder +, fetchFromGitHub +, poetry-core }: buildPythonPackage rec { @@ -13,11 +15,25 @@ buildPythonPackage rec { version = "3.3.0"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "ef3a931fc1f1db74edf8660e475b9295e0904ee922030ef0e45b0c73f4be65ae"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Trim21"; + repo = "transmission-rpc"; + rev = "v${version}"; + sha256 = "sha256-Ys9trQMCHqxBSaTobWt8WZwi1F8HKTUKaIxvyo6ZPP0="; }; + # remove once upstream has tagged version with dumped typing-extensions + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'typing_extensions = ">=3.7.4.2,<4.0.0.0"' 'typing_extensions = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ six typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix index 3629b47e8a..f3271b9a3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix @@ -8,26 +8,31 @@ buildPythonPackage rec { pname = "treeo"; - version = "0.0.9"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; rev = version; - sha256 = "0jfqj5150braj4ybnifc6b8mp0w2j93li6bm20lcd7a19qs0lkk2"; + sha256 = "176r1kgsdlylvdrxmhnzni81p8m9cfnsn4wwn6fnmsgam2qbp76j"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'typing-extensions = "^3.10.0"' 'typing-extensions = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; - # These deps are not needed for the wheel, but required during the import. + # jax is not declared in the dependencies, but is necessary. propagatedBuildInputs = [ jax - jaxlib ]; + checkInputs = [ jaxlib ]; pythonImportsCheck = [ "treeo" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix index 1f4a55416d..7ed83adc64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , flax , hypothesis +, jaxlib , keras , lib , poetry-core @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "treex"; - version = "0.6.8"; + version = "0.6.9"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; rev = version; - sha256 = "0pi4c78vqhy7mh9ranssdxdjbqnvyagsfkx95k93bnvzgmnr2kxb"; + sha256 = "1yvlldmhji12h249j14ba44hnb9x1fhrj7rh1cx2vn0vxj5wpg7x"; }; postPatch = '' @@ -38,6 +39,8 @@ buildPythonPackage rec { poetry-core ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ einops flax 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 85c5e10e8c..bdbe718098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "21.5.0"; + version = "22.1.0"; src = fetchPypi { inherit pname version; - sha256 = "02ea86383fc4b57539c45a965eaa1e9fd28302cdf382d21da8430050c97be9b8"; + sha256 = "sha256-d1WBYEkZo9echFQBWYoP0HDKvG3oOEBHLY6fpxXy02w="; }; propagatedBuildInputs = [ 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 9032b7637c..d4da6ee692 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.42"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "d9a6e977989f1f8344b1f86dbce0511dc431733deb0ad21ff8375f6f47282b39"; + sha256 = "sha256-mPsV25oD8FlPSDOGHOX+nLCN/I6RS83l3efUCgavmHY="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix new file mode 100644 index 0000000000..a389135bc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttls/default.nix @@ -0,0 +1,46 @@ +{ lib +, aiohttp +, buildPythonPackage +, colour +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ttls"; + version = "1.4.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jschlyter"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zDMgH9o9obfuihX8pXj226T1eMiKx33xyYOGKjdB1wk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + colour + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "ttls" + ]; + + meta = with lib; { + description = "Module to interact with Twinkly LEDs"; + homepage = "https://github.com/jschlyter/ttls"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix index 38faa10a92..d4200bc66f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "ttp"; - version = "0.7.2"; + version = "0.8.3"; format = "setuptools"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = version; - sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk="; + sha256 = "0rnixz01dnxl1hmzh34v4w4c117ncldr33ws0m2hqhjf5n4kgrg3"; }; propagatedBuildInputs = [ @@ -57,6 +57,8 @@ buildPythonPackage rec { disabledTestPaths = [ # missing package n2g "test/pytest/test_N2G_formatter.py" + # missing test file + "test/pytest/test_extend_tag.py" ]; disabledTests = [ @@ -81,6 +83,10 @@ buildPythonPackage rec { "test_excel_formatter_update_using_result_kwargs" # missing package n2g "test_n2g_formatter" + # missing test files + "test_TTP_CACHE_FOLDER_env_variable_usage" + # requires additional network setup + "test_child_group_do_not_start_if_no_parent_started" ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tumpa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tumpa/default.nix index 236cfbb7ba..6309e8937a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tumpa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tumpa/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "tumpa"; - version = "0.1.1"; + version = "0.1.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; repo = "tumpa"; rev = "v${version}"; - sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq"; + sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix index a8a0fd0c99..425b7eddfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix @@ -26,7 +26,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov" "" + --replace "--cov" "" \ + --replace '"0.0.0"' '"${version}"' ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 12859fae86..ddc9454142 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.4.0"; + version = "7.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "sha256-gN9cVBhiO34uj2ZGqXrnlvOlSaGxry0tMxaTK4SYhjM="; + sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix index f5809b0a9b..82c157722d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.4.2"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"; + sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix new file mode 100644 index 0000000000..6ae66dba90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pyzmq +, twisted +}: + +buildPythonPackage rec { + pname = "txzmq"; + version = "1.0.0"; + + src = fetchPypi { + inherit version; + pname = "txZMQ"; + sha256 = "sha256-jWB9C/CcqUYAuOQvByHb5D7lOgRwGCNErHrOfljcYXc="; + }; + + propagatedBuildInputs = [ + pyzmq + twisted + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "txzmq" ]; + + meta = with lib; { + description = "Twisted bindings for ZeroMQ"; + homepage = "https://github.com/smira/txZMQ"; + license = licenses.mpl20; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix index 63e1502226..8b2ff2de51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.13.2"; + version = "2.13.3"; src = fetchPypi { inherit pname version; - sha256 = "7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"; + sha256 = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"; }; buildInputs = [ setuptools-scm ]; 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 e668f324fa..f8dc74c00f 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.3"; + version = "5.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "15d859bec0adca9edd948e94a5773c32710ee5dd4ad14ec983f08f979a821610"; + sha256 = "463c04b192108e2b3f409df8a3eaaf8d44e3e98965c11e473ed2a97da591798b"; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix index e56cbb62b3..afff438efe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-futures"; - version = "3.3.7"; + version = "3.3.8"; src = fetchPypi { inherit pname version; - sha256 = "d286db818fb67e3ce5c28acd9058c067329b91865acc443ac3cf91497fa36f05"; + sha256 = "6fe8ccc2c2af7ef2fdd9bf73eab6d617074f09f30ad7d373510b4043d39c42de"; }; meta = with lib; { 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 d4708e5870..254dbabc70 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 = "3.19.5"; + version = "3.19.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9e3d954de5f5693817514b8da3476daa22f035d2b8060217c78c3831a1a49c23"; + sha256 = "sha256-KveYV1TMFtD9Zpfk/aTol87721npYkqtZXLRwucAeHs="; }; 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 2149813591..06f92bdc41 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.27.6"; + version = "2.27.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xg3Ggem/rbXB0X9j0p9tE9Ke8ol9MMuceShbNKFlX9c="; + sha256 = "sha256-c2iXRTTSl5OUku/f2rIykwRAsR4iA/bfHwxA4yQqh+o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index 3812a1c64f..24ee2ce5b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.7"; + version = "57.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lnfZabAOwcFFUvW+KytHpvvqTQ7U3g/c7hir2qDMkmc="; + sha256 = "sha256-U273R0T44eS+T8cZiH+IbnTkzzx5K0oGmEMgvk30ULU="; }; # 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 4962f2d02e..e08450c6a3 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 @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UQ876qlUkrNUTWfoFYGvopA8dktwiJ/82yhubGJn0pc="; + hash = "sha256-bY/S6pCDbLQxEayKrnzYZOCYWTyT7M66kP5G1rewxz4="; }; # Module doesn't have tests 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 5224b57d6c..3e6eac4427 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.7"; + version = "1.26.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-z9H7vkuppgXtFIKUAIqsinuLdHJlHRzDV9UHrlli49I="; + hash = "sha256-q9LUhXg3SCsYNLSBfwWHZ43MUx28mr5M3k2ijO8/Uiw="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix new file mode 100644 index 0000000000..a3458b2f33 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, fonttools +, defcon +, compreffor +, booleanoperations +, cffsubr +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ufo2ft"; + version = "2.25.2"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "ooWIHvyMtrht4WcGPiacY8dfjPSb5uitHnTRTKvf2AA="; + }; + + patches = [ + # Use cu2qu from fonttools. + # https://github.com/googlefonts/ufo2ft/pull/461 + ./fonttools-cu2qu.patch + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + fonttools + defcon + compreffor + booleanoperations + cffsubr + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # Do not depend on skia. + "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_CFF_pathops" + "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_pathops" + "--deselect=tests/preProcessor_test.py::TTFPreProcessorTest::test_custom_filters_as_argument" + "--deselect=tests/preProcessor_test.py::TTFInterpolatablePreProcessorTest::test_custom_filters_as_argument" + ]; + + pythonImportsCheck = [ "ufo2ft" ]; + + meta = with lib; { + description = "Bridge from UFOs to FontTools objects"; + homepage = "https://github.com/googlefonts/ufo2ft"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch new file mode 100644 index 0000000000..892cd4abeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch @@ -0,0 +1,126 @@ +From 0b3631e91c93d56460929f40850f7d8a39a71bde Mon Sep 17 00:00:00 2001 +From: Simon Cozens +Date: Thu, 11 Feb 2021 09:43:41 +0000 +Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu + +--- + Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++-- + Lib/ufo2ft/preProcessor.py | 4 ++-- + requirements.txt | 1 - + setup.py | 1 - + tests/outlineCompiler_test.py | 2 +- + tests/preProcessor_test.py | 2 +- + 6 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py +index 87d81b1f..4b77144f 100644 +--- a/Lib/ufo2ft/filters/cubicToQuadratic.py ++++ b/Lib/ufo2ft/filters/cubicToQuadratic.py +@@ -1,7 +1,7 @@ + import logging + +-from cu2qu.pens import Cu2QuPointPen +-from cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR ++from fontTools.pens.cu2quPen import Cu2QuPointPen ++from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR + + from ufo2ft.filters import BaseFilter + from ufo2ft.fontInfoData import getAttrWithFallback +diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py +index 05ac47dc..c796df2e 100644 +--- a/Lib/ufo2ft/preProcessor.py ++++ b/Lib/ufo2ft/preProcessor.py +@@ -217,7 +217,7 @@ def __init__( + layerNames=None, + skipExportGlyphs=None, + ): +- from cu2qu.ufo import DEFAULT_MAX_ERR ++ from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR + + self.ufos = ufos + self.inplace = inplace +@@ -249,7 +249,7 @@ def __init__( + self.postFilters.append(post) + + def process(self): +- from cu2qu.ufo import fonts_to_quadratic ++ from fontTools.cu2qu.ufo import fonts_to_quadratic + + # first apply all custom pre-filters + for funcs, ufo, glyphSet in zip(self.preFilters, self.ufos, self.glyphSets): +diff --git a/setup.py b/setup.py +index 175429af..eef39ee1 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,6 @@ + tests_require=["pytest>=2.8"], + install_requires=[ + "fonttools[ufo]>=4.28.5", +- "cu2qu>=1.6.7", + "cffsubr>=0.2.8", + "booleanOperations>=0.9.0", + ], +diff --git a/tests/outlineCompiler_test.py b/tests/outlineCompiler_test.py +index 74319184..e7b15a23 100644 +--- a/tests/outlineCompiler_test.py ++++ b/tests/outlineCompiler_test.py +@@ -2,7 +2,7 @@ + import os + + import pytest +-from cu2qu.ufo import font_to_quadratic ++from fontTools.cu2qu.ufo import font_to_quadratic + from fontTools.ttLib import TTFont + from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS + +diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py +index 64196f92..87b23946 100644 +--- a/tests/preProcessor_test.py ++++ b/tests/preProcessor_test.py +@@ -2,7 +2,7 @@ + import os + + import pytest +-from cu2qu.ufo import CURVE_TYPE_LIB_KEY ++from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY + from fontTools import designspaceLib + + import ufo2ft + +From 27c5af88ec2c3314618ecbf65104050a53508bb0 Mon Sep 17 00:00:00 2001 +From: Simon Cozens +Date: Thu, 11 Feb 2021 09:49:28 +0000 +Subject: [PATCH 2/2] Sort the imports + +--- + Lib/ufo2ft/filters/cubicToQuadratic.py | 2 +- + tests/preProcessor_test.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py +index 4b77144f..5f28ea42 100644 +--- a/Lib/ufo2ft/filters/cubicToQuadratic.py ++++ b/Lib/ufo2ft/filters/cubicToQuadratic.py +@@ -1,7 +1,7 @@ + import logging + +-from fontTools.pens.cu2quPen import Cu2QuPointPen + from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR ++from fontTools.pens.cu2quPen import Cu2QuPointPen + + from ufo2ft.filters import BaseFilter + from ufo2ft.fontInfoData import getAttrWithFallback +diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py +index 87b23946..76ee495a 100644 +--- a/tests/preProcessor_test.py ++++ b/tests/preProcessor_test.py +@@ -2,8 +2,8 @@ + import os + + import pytest +-from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY + from fontTools import designspaceLib ++from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY + + import ufo2ft + from ufo2ft.constants import ( diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix new file mode 100644 index 0000000000..21894203d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, fonttools +, pytestCheckHook +, fs +}: + +buildPythonPackage rec { + pname = "ufoLib2"; + version = "0.13.1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs="; + }; + + propagatedBuildInputs = [ + attrs + fonttools + # required by fonttools[ufo] + fs + ]; + + checkInputs = [ + pytestCheckHook + ]; + +pythonImportsCheck = [ "ufoLib2" ]; + + meta = with lib; { + description = "Library to deal with UFO font sources"; + homepage = "https://github.com/fonttools/ufoLib2"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} 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 4d12af0689..0d7faf93f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "4.3.0"; + version = "5.1.0"; disabled = isPyPy || pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0"; + sha256 = "a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix index c132f50dbe..180baf0d4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix @@ -14,7 +14,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; checkInputs = [ nose numpy ]; - checkPhase = "python setup.py nosetests -sv"; + checkPhase = '' + nosetests -sv + ''; meta = with lib; { homepage = "https://pythonhosted.org/uncertainties/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest2/default.nix index ae8cab53b0..e044176242 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest2/default.nix @@ -3,6 +3,7 @@ , fetchPypi , six , traceback2 +, pythonAtLeast }: buildPythonPackage rec { @@ -16,14 +17,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ six traceback2 ]; - # # 1.0.0 and up create a circle dependency with traceback2/pbr + # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; postPatch = '' # argparse is needed for python < 2.7, which we do not support anymore. substituteInPlace setup.py --replace "argparse" "" - # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 + # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py # https://github.com/pypa/packaging/pull/36 sed -i 's/version=VERSION/version=str(VERSION)/' setup.py @@ -31,8 +32,9 @@ buildPythonPackage rec { meta = with lib; { description = "A backport of the new features added to the unittest testing framework"; - homepage = "https://pypi.python.org/pypi/unittest2"; + homepage = "https://pypi.org/project/unittest2/"; license = licenses.bsd0; + # AttributeError: module 'collections' has no attribute 'MutableMapping' + broken = pythonAtLeast "3.10"; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix index 356a290241..52b422c0e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.4.12"; + version = "0.5.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e668055d9c389aefd09203afb96a950a320095f225ef0a1aa611e592db92a71b"; + hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index ef262e057e..bf523046c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.1.5"; + version = "4.1.9"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "sha256-zsmAdqoWvFhRRRw4fdbRhhKkDV5oP/eYsfpA0AVqAnI="; + sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix index 91bc6e68eb..4c1a61b09f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -18,11 +18,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.7"; + version = "1.26.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SYfGVVT3otvzDBj9SHeO8SSvb6t3GjdxA9oFheIzbs4="; + hash = "sha256-Dnwz2aY+fd/LhngKrIe+/C+930bFjbtIfghV987sKDw="; }; propagatedBuildInputs = [ @@ -61,7 +62,9 @@ buildPythonPackage rec { export CI # Increases LONG_TIMEOUT ''; - pythonImportsCheck = [ "urllib3" ]; + pythonImportsCheck = [ + "urllib3" + ]; meta = with lib; { description = "Powerful, sanity-friendly HTTP client for Python"; 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 6ce92e9f3b..636409f1d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Cross-platform tool for adding locations to the user PATH"; homepage = "https://github.com/ofek/userpath"; license = [ licenses.asl20 licenses.mit ]; - maintainers = with maintainers; [ yevhenshymotiuk ]; + maintainers = with maintainers; [ yshym ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix index 57c6bf9253..4ce9228efe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.14.0"; + version = "0.16.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "164x92k3rs47ihkmwq5av396576dxp4rzv6557pwgc1ign2ikqy1"; + sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix index e871912adf..65fdfc297b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.11.7"; + version = "2022.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "0i1vfyhyvn908vz55agmfds3zwp6qpbpip055d995nx79ysxz0j9"; + sha256 = "sha256-EgykuIz/IGFy4GTZZYpY3D5QvsCmY4H9d9Wxbof3DyQ="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix index aebf40a40f..8c4bb49eba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix @@ -11,6 +11,11 @@ buildPythonPackage rec { sha256 = "1axv2214ykgv5adajv10v2zy5fr9v77db54rkik6ja29p66zl90n"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "get_version(pypi=True)" '"${version}"' + ''; + checkInputs = [ git ]; pythonImportsCheck = [ "versiontag" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index d51b3d7837..c463c37747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.10.0"; + version = "20.13.0"; src = fetchPypi { inherit pname version; - sha256 = "576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"; + sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix index 5967b9b9ab..47a9663325 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.9.4"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "8561e41bbcca5fadce4a8d974ca2f96cbe7710d835bfed6a55ed6d10900ef5d5"; + sha256 = "sha256-ISzVtQgkSZu84+LXQaray3nAt3GsVm+THGE1WXYCi8s="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix index d664cf1d27..ddf6ce54b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "1.0.5"; + version = "1.0.7"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f629dc0143656b06b64e2da1772deda67d37a3e048e74bd728de4a4f24bf877b"; + sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix index 2f950ecd6c..87c3d7fe30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.11.0"; + version = "9.0.1"; src = fetchPypi{ inherit pname version; - sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd"; + sha256 = "sha256-rDUgOjroY8S73+s+MWyBl86u+8XCH4O8KMCo9zUlqAs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix index e76d1f1102..4e40980d91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/default.nix @@ -1,11 +1,16 @@ -{ buildPythonPackage, django, waitress }: +{ lib, buildPythonPackage, django, waitress }: buildPythonPackage { pname = "waitress-django"; - version = "0.0.0"; + version = "1.0.0"; src = ./.; pythonPath = [ django waitress ]; doCheck = false; - meta.description = "A waitress WSGI server serving django"; + + meta = with lib; { + description = "A waitress WSGI server serving django"; + license = licenses.mit; + maintainers = with maintainers; [ basvandijk ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/setup.py b/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/setup.py index 07f7b326fd..16fde78f42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/setup.py +++ b/third_party/nixpkgs/pkgs/development/python-modules/waitress-django/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup( name = "waitress-django" - , version = "0.0.0" + , version = "1.0.0" , description = "A waitress WSGI server serving django" , author = "Bas van Dijk" , author_email = "v.dijk.bas@gmail.com" 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 f4d14ed2e8..6b10b30a19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -1,4 +1,5 @@ -{ bokeh +{ azure-core +, bokeh , buildPythonPackage , click , configparser @@ -11,6 +12,7 @@ , jsonschema , lib , matplotlib +, nbformat , pandas , pathtools , promise @@ -35,13 +37,13 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.9"; + version = "0.12.10"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - sha256 = "0704iv5dlsjs0gj6l4nx9hk9kzq46wlgd67ifw7i3qk6v4ljfs6y"; + sha256 = "198c6zx7xih74cw0dwfqw7s7b7whik7wv4nfq6x6xw0kw86r6hby"; }; # The wandb requirements.txt does not distinguish python2/3 dependencies. We @@ -74,10 +76,6 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # Tests that require docker access, not possible in the nix build environment. - "tests/launch/test_launch.py" - "tests/launch/test_launch_cli.py" - # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. "tests/test_cli.py" "tests/test_data_types.py" @@ -92,7 +90,6 @@ buildPythonPackage rec { "tests/test_metric_internal.py" "tests/test_mode_disabled.py" "tests/test_mp_full.py" - "tests/test_notebooks.py" "tests/test_public_api.py" "tests/test_redir.py" "tests/test_runtime.py" @@ -110,14 +107,19 @@ buildPythonPackage rec { # Fails and borks the pytest runner as well. "tests/wandb_test.py" + + # Tries to access /homeless-shelter + "tests/test_tables.py" ]; checkInputs = [ + azure-core bokeh flask jsonref jsonschema matplotlib + nbformat pandas pydantic pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix new file mode 100644 index 0000000000..ae870a37fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, six +, setuptools +, pytestCheckHook +, httpbin +, requests +, wsgiprox +, multidict +}: + +buildPythonPackage rec { + pname = "warcio"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "webrecorder"; + repo = "warcio"; + rev = "aa702cb321621b233c6e5d2a4780151282a778be"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 + sha256 = "sha256-wn2rd73wRfOqHu9H0GIn76tmEsERBBCQatnk4b/JToU="; + }; + + patches = [ + (fetchpatch { + name = "add-offline-option.patch"; + url = "https://github.com/webrecorder/warcio/pull/135/commits/2546fe457c57ab0b391764a4ce419656458d9d07.patch"; + sha256 = "sha256-3izm9LvAeOFixiIUUqmd5flZIxH92+NxL7jeu35aObQ="; + }) + ]; + + propagatedBuildInputs = [ + six + setuptools + ]; + + checkInputs = [ + pytestCheckHook + httpbin + requests + wsgiprox + multidict # Optional. Without this, one test in test/test_utils.py is skipped. + ]; + + pytestFlagsArray = [ "--offline" ]; + + pythonImportsCheck = [ "warcio" ]; + + meta = with lib; { + description = "Streaming WARC/ARC library for fast web archive IO"; + homepage = "https://github.com/webrecorder/warcio"; + license = licenses.asl20; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix index 1b62c918f3..d0a192fcc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix @@ -1,27 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, six +, fetchFromGitHub +, pythonOlder , jsonpatch , jsonschema -, jsonpointer +, six +, pytestCheckHook }: buildPythonPackage rec { pname = "warlock"; version = "1.3.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bcwaldon"; + repo = pname; + rev = version; + hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0="; }; - propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; + propagatedBuildInputs = [ + jsonpatch + jsonschema + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "jsonschema>=0.7,<4" "jsonschema" + sed -i "/--cov/d" pytest.ini + ''; + + pythonImportsCheck = [ + "warlock" + ]; meta = with lib; { - homepage = "https://github.com/bcwaldon/warlock"; description = "Python object model built on JSON schema and JSON patch"; + homepage = "https://github.com/bcwaldon/warlock"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warrant-lite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warrant-lite/default.nix new file mode 100644 index 0000000000..4d5d77c2e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/warrant-lite/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, boto3 +, envs +, python-jose +, requests +}: + +buildPythonPackage rec { + pname = "warrant-lite"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FunWoslZn3o0WHet2+LtggO3bbbe2ULMXW93q07GxJ4="; + }; + + propagatedBuildInputs = [ + boto3 + envs + python-jose + requests + ]; + + postPatch = '' + # requirements.txt is not part of the source + substituteInPlace setup.py \ + --replace "parse_requirements('requirements.txt')," "[]," + ''; + + # Tests require credentials + doCheck = false; + + pythonImportsCheck = [ + "warrant_lite" + ]; + + meta = with lib; { + description = "Module for process SRP requests for AWS Cognito"; + homepage = "https://github.com/capless/warrant-lite"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} 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 dff14d15b9..4a99f048d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , buildPythonPackage , libiconv -, llvm_11 , libffi , libxml2 , ncurses @@ -21,7 +20,7 @@ let , extraBuildInputs ? [ ] }: buildPythonPackage rec { inherit pname; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; @@ -30,7 +29,7 @@ let owner = "wasmerio"; repo = "wasmer-python"; rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + hash = "sha256-nOeOhQ1XY+9qmLGURrI5xbgBUgWe5XRpV38f73kKX2s="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -74,26 +73,26 @@ rec { wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; + cargoHash = "sha256-twoog8LjQtoli+TlDipSuB7yLFkXQJha9BqobqgZW3Y="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI="; + cargoHash = "sha256-IqeMOY6emhIC7ekH8kIOZCr3JVkjxUg/lQli+ZZpdq4="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A="; - extraNativeBuildInputs = [ llvm_11 ]; + cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA="; + extraNativeBuildInputs = [ rustPlatform.rust.rustc.llvm ]; extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; }; wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8="; + cargoHash = "sha256-4nZHMCNumNhdGPOmHXlJ5POYP7K+VPjwhEUMgzGb/Rk="; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix index dd84096246..063f26e476 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wazeroutecalculator/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "wazeroutecalculator"; - version = "0.13"; + version = "0.14"; src = fetchPypi { pname = "WazeRouteCalculator"; inherit version; - sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg="; + sha256 = "01a6e8d7d896279fd342fd7fcb86c2b9bf97503d95e8b1a926867d504c4836ab"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix index 9ddb0631f5..27c7521cef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "54.0"; + version = "54.1"; disabled = !isPy3k; format = "pyproject"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - sha256 = "0aeda9a045c7881289420cac917cc57115b1243e476187338e66d593dd000853"; + sha256 = "sha256-+lfbhi4GvQHF59gtrTmbO5lSo5gnAjwXvumxwGH/G70="; }; patches = [ 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 e92b47d209..31cedc7b40 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.0.1"; + version = "8.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614"; + sha256 = "f1f0b7f054a22263cf750529fc0926709ca47da9a2c417d423ad88d9fa6a5d33"; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix index 9622f10168..116f45f16d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "21861f8645eb5725d1becfe86d7e7ae1a31d98b72556f9d44fcc5100976353cf"; + sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix index 2e13d95c38..7d6f78902d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix @@ -23,11 +23,25 @@ buildPythonPackage rec { # Tests fail on Darwin with `OSError: AF_UNIX path too long` doCheck = !stdenv.isDarwin; - # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. patchPhase = '' + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ tests/legacy/test_protocol.py + + # Disables tests relying on tight timeouts to avoid failures like: + # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout + # ping_1_again, ping_2 = tuple(self.protocol.pings) + # ValueError: too many values to unpack (expected 2) + for t in \ + test_keepalive_ping_stops_when_connection_closing \ + test_keepalive_ping_does_not_crash_when_connection_lost \ + test_keepalive_ping \ + test_keepalive_ping_not_acknowledged_closes_connection \ + test_keepalive_ping_with_no_ping_timeout \ + ; do + sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py + done ''; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix index 999d256059..8ec42598ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix @@ -2,26 +2,25 @@ , buildPythonPackage , fetchPypi , isPy27 -, nose , webob , six , beautifulsoup4 , waitress -, mock , pyquery , wsgiproxy2 , pastedeploy +, pytestCheckHook }: buildPythonPackage rec { - version = "2.0.35"; + version = "3.0.0"; pname = "webtest"; disabled = isPy27; # paste.deploy is not longer a valid import src = fetchPypi { pname = "WebTest"; inherit version; - sha256 = "sha256-qsFotbK08gCvTjWGfPMWcSIQ49XbgcHL3/OHImR7sIc="; + sha256 = "54bd969725838d9861a9fa27f8d971f79d275d94ae255f5c501f53bb6d9929eb"; }; postPatch = '' @@ -36,8 +35,7 @@ buildPythonPackage rec { ]; checkInputs = [ - nose - mock + pytestCheckHook pastedeploy wsgiproxy2 pyquery 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 0e00a08145..a843aa5c05 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 @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.21.0"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-wagFjVXTjYFryaUiVeqU+T9ya+NzUFMX3uPlRZGe1v0="; + sha256 = "sha256-WrKJy4CxRJ/X599+95mfCQIhVcsLPnSPNtv3oAISSfU="; }; propagatedBuildInputs = [ @@ -32,6 +32,8 @@ buildPythonPackage rec { substituteInPlace pytest.ini \ --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" + substituteInPlace requirements.txt \ + --replace "weconnect[Images]~=0.33.0" "weconnect" ''; checkInputs = [ 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 70da78edb6..8af5acb700 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.28.0"; + version = "0.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-J7T62L6wT9rkl/Ukf2y5kBbJEdzh2XnGgCgedkxVEmA="; + sha256 = "sha256-Rx9OTx3GNIIRo7jIDIp8i6vGUFwn1keg5ifXqzewr4I="; }; propagatedBuildInputs = [ @@ -40,6 +40,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," + substituteInPlace requirements.txt \ + --replace "pillow~=9.0.0" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix new file mode 100644 index 0000000000..ae7ce1f2b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi +, itsdangerous, hypothesis +, pytestCheckHook, requests +, pytest-timeout +, isPy3k + }: + +buildPythonPackage rec { + pname = "Werkzeug"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + }; + + propagatedBuildInputs = [ itsdangerous ]; + checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; + + postPatch = '' + # ResourceWarning causes tests to fail + rm tests/test_routing.py + ''; + + disabledTests = [ + "test_save_to_pathlib_dst" + "test_cookie_maxsize" + "test_cookie_samesite_attribute" + "test_cookie_samesite_invalid" + "test_range_parsing" + "test_content_range_parsing" + "test_http_date_lt_1000" + "test_best_match_works" + "test_date_to_unix" + "test_easteregg" + + # Seems to be a problematic test-case: + # + # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg)) + # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]> + # E + # E Traceback (most recent call last): + # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers + # E return Headers(result) + # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> + "test_basic_routing" + "test_merge_slashes_match" + "test_merge_slashes_build" + "TestMultiPart" + "TestHTTPUtility" + ] ++ lib.optionals stdenv.isDarwin [ + "test_get_machine_id" + ]; + + meta = with lib; { + homepage = "https://palletsprojects.com/p/werkzeug/"; + description = "A WSGI utility library for Python"; + license = licenses.bsd3; + maintainers = [ ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix index 1b899b5989..62298b0d6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.36.2"; + version = "0.37.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "13bj49psan1s1fxfrq613dm2l7jvrg2dpgb36lz81z3b1h7zig6j"; + sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs="; name = "${pname}-${version}-source"; extraPostFetch = '' cd $out @@ -37,7 +37,7 @@ buildPythonPackage rec { pipInstallFlags = [ "--ignore-installed" ]; meta = with lib; { - homepage = "https://bitbucket.org/pypa/wheel/"; + homepage = "https://github.com/pypa/wheel"; description = "A built-package format for Python"; longDescription = '' This library is the reference implementation of the Python wheel packaging standard, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix index 6bd22c56b9..d4f6913105 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.3"; + version = "0.1.4"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "1pcn2jwqfvp67wz19lcpwnw0dkbc61bnbkzxlmac1yf2pz9ndn6l"; + sha256 = "sha256-L8fSf9AhmWbRvLKvf0aowKoal+5dG1SJXcA7Ssrhj6o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix index ef69283e6d..b287581964 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix @@ -2,25 +2,34 @@ , buildPythonPackage , fetchFromGitHub , inetutils +, pythonOlder }: buildPythonPackage rec { pname = "whois"; - version = "0.9.13"; + version = "0.9.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "DannyCork"; repo = "python-whois"; rev = version; - sha256 = "0y2sfs6nkr2j2crrn81wkfdzn9aphb3iaddya5zd2midlgdqq7bw"; + sha256 = "1df4r2pr356y1c2ys6pzdl93fmx9ci4y75xphc95xn27zvqbpvix"; }; - # whois is needed - propagatedBuildInputs = [ inetutils ]; + propagatedBuildInputs = [ + # whois is needed + inetutils + ]; # tests require network access doCheck = false; - pythonImportsCheck = [ "whois" ]; + + pythonImportsCheck = [ + "whois" + ]; meta = with lib; { description = "Python module/library for retrieving WHOIS information"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix index ea69a22c27..3b88afa7e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.11.0"; + version = "0.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "02mc9dbz7lvk7d8aaimggm3vg99bc42njsv8sfchvc9amvdi94qy"; + sha256 = "sha256-n+TIzlnyPeSywTQr7wlGNezsbQ2+S/WYt1H95+Id2Rw="; }; nativeBuildInputs = [ 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 6fd356e69e..35be8ba260 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 @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , peewee , wtforms , python @@ -15,6 +16,14 @@ buildPythonPackage rec { sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15"; }; + patches = [ + (fetchpatch { + name = "fix-wtforms3.patch"; + url = "https://github.com/coleifer/wtf-peewee/commit/b1764f4474c73a9a2b34ae6b7db61274f5252a7f.patch"; + sha256 = "0maz3fm9bi8p80nk9sdb34xq55xq8ihm51y7k0m8ck9aaypvwbig"; + }) + ]; + propagatedBuildInputs = [ peewee wtforms diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix index c916f8d7ec..ca339b7a44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.0.2"; + version = "6.0.3"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "sha256-P8mUkAO3usFCE+E9cna2x1iA2uyHVPX9FHDpX+kTFWQ="; + sha256 = "1qvg3bwqzqxlzlixz2di3si7siy0ismq93wd57r8cqmxl54gva6h"; }; checkInputs = [ pytest ]; 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 781f59fa3c..b2bfeea8f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.15"; + version = "0.19.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-k/fLUuBjXScTvlvoBLZIVPEqNGIPI04FBeTBadp5uiY="; + sha256 = "sha256-LJ7MmKCWx+n7caud0pN4+7f9H4XzwuAAn9u86X/FACo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix index cfb72680fa..edb4761af3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix @@ -7,30 +7,39 @@ , python , mock , nose +, pytestCheckHook , util-linux }: buildPythonPackage rec { pname = "xlib"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; rev = version; - sha256 = "sha256-zOG1QzRa5uN36Ngv8i5s3mq+VIoRzxFj5ltUbKdonJ0="; + sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; }; - checkPhase = '' - ${python.interpreter} runtests.py - ''; - - checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ]; nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ xorg.libX11 ]; propagatedBuildInputs = [ six ]; doCheck = !stdenv.isDarwin; + checkInputs = [ + pytestCheckHook + mock + nose + util-linux + xorg.xauth + xorg.xorgserver + ]; + + disabledTestPaths = [ + # requires x session + "test/test_xlib_display.py" + ]; meta = with lib; { description = "Fully functional X client library for Python programs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index 26b51d1a4a..5ba54f2031 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.0"; + version = "3.12.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "25deadb9ee95f0dc71376a60e9c1e34636b5016c1952ad5597a6246495e34464"; + sha256 = "sha256-xIStWb03CygnqB92AXf0uxMLw7pLhSE3mLQ8l1J6dZM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix index 201a1636f1..e9a8ae0323 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "v${version}"; - sha256 = "11i7vh61a5xfv32zm7rkigl010wzd6snag6sf7w38256j95nnb05"; + sha256 = "sha256-LcHXw4rZhQ942EhiGrRTf3MpT7G5OFSX8QbpxVjvTTo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index d83b031fe4..c19a145b49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.19"; + version = "1.1.20"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i6UFsSY2DQ4jB316fy5cZ+2C93TTmvyB4Caxj3syPdo="; + sha256 = "sha256-0wcvlgKlWhj9jZ53c+uEk9F28+m7BwsmlwTRlBMPoho="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix index fec15464bd..37fedb46d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.10"; + version = "1.4.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R7ZcG4FStESPDWnFD6WIDD8sugvil9ybVK0J2qQC+zU="; + sha256 = "sha256-Dx7jxhO3aGCT1Mq6QDsvZLDcC7EY3dX2ltM0tLxSW8Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index db27afcfe6..eb7b3bb45e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.68"; + version = "0.1.69"; src = fetchFromGitHub { owner = "ranaroussi"; repo = pname; rev = version; - sha256 = "sha256-ubOC56DUViClARzMSRtDFrtxhilmVkhKMx9SxLbYFiA="; + sha256 = "1077p01982wgbl8v74f8mqca0y6hmh6qr3gg7m3f1a30lgpljms3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix index 35f470e319..f7298f4b8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.1"; + version = "1.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c7afe70e1ac8e871341d7fb15f5246aac35fd80fec10d7a96d46df2aad608bd0"; + sha256 = "sha256-PeWi1eygUSgUXZ68bUJ44IoffNDme06JNR9ns6njqMU="; }; propagatedBuildInputs = [ httpx ]; 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 0ff3212f48..91c58192b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "yowsup"; - version = "3.2.3"; + version = "3.3.0"; # The Python 2.x support of this package is incompatible with `six==1.11`: # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486 @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "tgalal"; repo = "yowsup"; rev = "v${version}"; - sha256 = "0wb8yl685nr1i3vx89hwan5m6a482x8g48f5ksvdlph538p720pm"; + sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index 92d9a4a848..54ebc888f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.6"; + version = "3.7.7"; src = fetchPypi { inherit version pname; - sha256 = "e8d8a7828e4994545bf57059bd0a0d431d387d31cc4af2eb5eeb93ef28c2d827"; + sha256 = "415f4a673009fe9a5ef67b61c4469ddf14b73857b6d40f02d6b74f02ad935147"; }; buildInputs = [ openssl bzip2 ]; 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 12e0279eb3..319cd7cce0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.1"; + version = "0.38.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-8bJEH+m+83rkKdN5GjD4THs1CUy/wstoBFiXR7kHKtw="; + sha256 = "sha256-pLTqnIbe7rTZrQFe//0/h5Tyx0GzJW+q9mUuDNifo/0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix index 3862a8e757..c2e707347b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix @@ -5,12 +5,16 @@ , pathpy , pytestCheckHook , setuptools-scm +, pythonAtLeast }: buildPythonPackage rec { pname = "zetup"; version = "0.2.64"; + # https://github.com/zimmermanncode/zetup/issues/4 + disabled = pythonAtLeast "3.10"; + src = fetchPypi { inherit pname version; sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix index 5ebb17dd49..b44a385fd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.7.4"; + version = "0.8.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = version; - sha256 = "0xl8qgljvmypi602f52m89iv9pcrzsdal3jw619vrcavp40rc04d"; + sha256 = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix index 338dd93150..d350e20408 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.2.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; - rev = version; - sha256 = "0a5axflkk0wv0rdnrh8l2rgj8gh2pfkg5lrvr8x4yxxiifawrafc"; + rev = "v${version}"; + sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0"; }; disabled = !isPy3k; 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 dc30128c9e..0f64df2a56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -1,26 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm , more-itertools +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "zipp"; - version = "3.6.0"; + version = "3.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"; + sha256 = "9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ more-itertools ]; + propagatedBuildInputs = [ + more-itertools + ]; # Prevent infinite recursion with pytest doCheck = false; + pythonImportsCheck = [ + "zipp" + ]; + meta = with lib; { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix index 0b5d3103b6..e1cba0ebc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zope-deferredimport"; - version = "4.3.1"; + version = "4.4"; src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1"; + sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add"; }; propagatedBuildInputs = [ zope_proxy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 5b18c09f15..5430569727 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.33.0"; + version = "0.34.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-0hAksizQSIOg+hbSq/OZqFqlBBdpa0bSf+puWfD9TSg="; + sha256 = "sha256-hqq/CYlM9ZahDiH3iFLFzfE22CB19WQnFIDt+gCrEXU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix new file mode 100644 index 0000000000..f93d32d392 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +}: + +buildPythonPackage rec { + pname = "coverage"; + version = "5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; + }; + + # No tests in archive + doCheck = false; + checkInputs = [ mock ]; + + meta = { + description = "Code coverage measurement for python"; + homepage = "https://coverage.readthedocs.io/"; + license = lib.licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pygtk/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pygtk/default.nix index 938b55630c..465d711ec6 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/pygtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pygtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango -, buildPythonPackage, libglade ? null, isPy3k }: +, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "pygtk"; @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango - ] ++ lib.optional (libglade != null) libglade; + ]; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { installPhase = "installPhase"; - checkPhase = lib.optionalString (libglade == null) + checkPhase = '' sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ tests/common.py diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix new file mode 100644 index 0000000000..d51032a154 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# since this is a dependency of pytest, we need to avoid +# circular dependencies +, jinja2 +, railroad-diagrams +}: + +let + pyparsing = buildPythonPackage rec { + pname = "pyparsing"; + version = "2.4.7"; + + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; + }; + + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + jinja2 + railroad-diagrams + ]; + + checkPhase = '' + python -m unittest + ''; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + }; + }; +in + pyparsing diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index edddcf7076..500bbe91aa 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -321,13 +321,13 @@ let Biostrings = [ pkgs.zlib ]; bnpmr = [ pkgs.gsl ]; cairoDevice = [ pkgs.gtk2.dev ]; - Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ]; + Cairo = with pkgs; [ libtiff libjpeg cairo.dev xlibsWrapper fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; - devEMF = with pkgs; [ xorg.libXft.dev x11 ]; + devEMF = with pkgs; [ xorg.libXft.dev xlibsWrapper ]; diversitree = with pkgs; [ gsl fftw ]; exactextractr = [ pkgs.geos ]; EMCluster = [ pkgs.lapack ]; @@ -346,7 +346,7 @@ let haven = with pkgs; [ libiconv zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl ]; - imager = [ pkgs.x11 ]; + imager = [ pkgs.xlibsWrapper ]; iBMQ = [ pkgs.gsl ]; igraph = with pkgs; [ gmp libxml2.dev ]; JavaGD = [ pkgs.jdk ]; @@ -644,7 +644,7 @@ let PING = [ pkgs.gsl ]; RcppAlgos = [ pkgs.gmp.dev ]; RcppBigIntAlgos = [ pkgs.gmp.dev ]; - HilbertVisGUI = [ pkgs.gnome2.gtkmm.dev ]; + HilbertVisGUI = [ pkgs.gtkmm2.dev ]; textshaping = with pkgs; [ harfbuzz.dev freetype.dev fribidi libpng ]; DropletUtils = [ pkgs.zlib.dev ]; RMariaDB = [ pkgs.libmysqlclient.dev ]; @@ -1114,7 +1114,7 @@ let patchShebangs configure ''; - R_MAKEVARS_SITE = lib.optionalString (pkgs.system == "aarch64-linux") + R_MAKEVARS_SITE = lib.optionalString (pkgs.stdenv.system == "aarch64-linux") (pkgs.writeText "Makevars" '' CXX14PICFLAGS = -fPIC ''); 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 3306648368..ecf98d75ce 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.2.24"; - source.sha256 = "1x3czmqhlyb593ap7mxkk47idi2jnbnrpwj8xlsjdpi7iair9y62"; + version = "2.3.6"; + source.sha256 = "1531z805j3gls2x0pqp2bp1vv1rf5k7ynjl4qk72h8lpm1skqk9r"; dontPatchShebangs = true; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 0d501bd9ad..b0be71102c 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -118,9 +118,7 @@ else source = Bundler::Source::Path.new(options) end spec = source.specs.search_all(name).first -Bundler.rubygems.with_build_args build_flags do - source.install(spec) -end +source.install(spec, :build_args => build_flags) msg = spec.post_install_message if msg diff --git a/third_party/nixpkgs/pkgs/development/tools/air/default.nix b/third_party/nixpkgs/pkgs/development/tools/air/default.nix index 712f7ad1ca..52decaeb5a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/air/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.27.8"; + version = "1.27.9"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - sha256 = "sha256-CVx4TDDAVIrJ3lnD2AIuxhmTV+/sIA0viX20zFkznNc="; + sha256 = "sha256-8VuCZoAV54TG8MiF6n5O8ZStGujfJ/7w95BYhe5/7dE="; }; - vendorSha256 = "sha256-dloXz1hiKAQUmSQv1rLbE5vYrZpKAcwakC71AFXWZqM="; + vendorSha256 = "sha256-u/v6RnzBU+zQEy3jjVITjUQiU7AT3wZoeeRFF+KqOvI="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix index 784a872333..080a8362ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = @@ -83,10 +83,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "sha256-XV+SPZD7IirLJDqwn/eV8/Wf8m3dSSW0DF3IcBPcixA="; + sha256 = "sha256-vj0Ze+Tn8jgq1mIVZWq2q768vW6fNXHB28gMcB9bWHU="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "sha256-rq8SLtj0rb35vcvPsCzhDGR93EjHoU6KAhEjs2WIA6o="; + sha256 = "sha256-ZuPyZFD3/VRP/GegcKqXZm3bveQB/Xr5E39eQktDCJI="; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix index d354b71fc9..2d8348bfc9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w="; + hash = "sha256-M3BYj1SKQKjEqP9cxaVlh7UeleDbcx6JN+UI6Ez+QJ8="; }; - cargoSha256 = "sha256-XcXllex7UEufV5URhH7aqln1tNxwaiAETO3fUKmHf7s="; + cargoHash = "sha256-botAoLNg/qTh+cjPXcjo/Ol2Vktj/c5130k5falEuLY="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix index aba1c59b97..ac46bd4c41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix @@ -30,8 +30,8 @@ let src = fetchFromGitHub { owner = "abathur"; repo = "binlore"; - rev = "v0.1.3"; - hash = "sha256-+rgv8gAQ3ptOpL/EhbKr/jq+k/4Lpn06/2qON+Ps2wE="; + rev = "v0.1.4"; + hash = "sha256-+N0Bqyaj/mAwrcgFtUI8czmKo3VW6J8ZRxaPEghp7QM="; }; /* binlore has one one more yallbacks responsible for diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix index bcbda8ad7e..dc7cccd9dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl }: -let - name = "cccc"; +stdenv.mkDerivation rec { + pname = "cccc"; version = "3.1.4"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz"; sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index ef92148a31..98b492a9b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.763"; + version = "2.0.820"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-KqxFFRKOCDzlGVKYMp3YNWMKGdxXT9f6xwaCc5XIruk="; + hash = "sha256-qvYg4tXq9RTYj+pbxg0fZRkTGP8/pk22K9wqMNxVHTo="; }; nativeBuildInputs = with py.pkgs; [ @@ -96,6 +96,8 @@ buildPythonApplication rec { "TestSarifReport" # Will probably be fixed in one of the next releases "test_valid_cyclonedx_bom" + "test_record_relative_path_with_direct_oberlay" + "test_record_relative_path_with_direct_prod2_oberlay" # Requires prettytable release which is only available in staging "test_skipped_check_exists" "test_record_relative_path_with_relative_dir" 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 7491b58927..33dc9267ea 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.7.3"; + version = "2.7.5"; 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-wvN9NODw8JV30mDGhs7qlCoyp3Z3bJSGUfQ6+GtE5kE="; + sha256 = "sha256-qTLpvb0yPB0+hR0Kkb7d3APlwdkkn6uNM0A80nPmjB4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix index b8abad44f2..158f6545b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "The ERESI Reverse Engineering Software Interface"; - license = lib.licenses.gpl2; - homepage = "http://www.eresi-project.org/"; + license = lib.licenses.gpl2Only; + homepage = "https://github.com/thorkill/eresi"; # Formerly http://www.eresi-project.org/ platforms = lib.platforms.linux; }; } 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 26c7b6dd0b..a1eec36204 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix @@ -10,12 +10,12 @@ let in stdenv.mkDerivation rec { - name = "ikos"; + pname = "ikos"; version = "3.0"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; - repo = name; + repo = "ikos"; rev = "v${version}"; sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix index 6b238fb926..5ce79a0924 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }: -let - name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; - -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation { + pname = "qcachegrind"; + version = kcachegrind.version; src = kcachegrind.src; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index c50f75c154..a55a5f09b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.5.4"; + version = "5.6.0"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-zELmNpbT1JCt0UAzHwzcTDN9QZTLQY0+rG9zVRWxiFg="; + sha256 = "sha256-AhO7Ev/4M9dtogNIMWOc03ARD5H2gdlRXR4Qpnkf7bw="; }; preBuild = '' @@ -67,10 +67,6 @@ stdenv.mkDerivation rec { done ''; - postInstall = '' - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; - WITHOUT_PULL = "1"; makeFlags = [ "GITTAP=${version}" 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 5f0c7bffe9..62026d5278 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix @@ -1,46 +1,42 @@ -{ stdenv, lib, fetchurl, makeWrapper, bison, gcc -, withISpin ? true, tk, swarm, graphviz }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, bison, gcc, tk, swarm, graphviz }: let - binPath = lib.makeBinPath [ gcc ]; - ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ]; + binPath = lib.makeBinPath [ gcc graphviz tk swarm ]; +in -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "spin"; - version = "6.4.9"; - url-version = lib.replaceChars ["."] [""] version; + version = "6.5.2"; - src = fetchurl { - # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. - # Dropbox mirror from developers: - # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa - # (note that this URL doesn't work aross versions and hash should come from official site) - url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AABtxFePMJmPxsxSvU5cpxh8a/spin${url-version}.tar.gz?raw=1"; - sha256 = "07b7wk3qyfnp4pgwicqd33l7i1krzyihx0cf9zkv81ywaklf5vll"; + src = fetchFromGitHub { + owner = "nimble-code"; + repo = "Spin"; + rev = "version-${version}"; + sha256 = "sha256-drvQXfDZCZRycBZt/VNngy8zs4XVJg+d1b4dQXVcyFU="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bison ]; - sourceRoot = "Spin/Src${version}"; + sourceRoot = "source/Src"; - installPhase = '' - install -Dm644 ../Man/spin.1 $out/share/man/man1/spin.1 + preBuild = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; - install -Dm755 spin $out/bin/spin - wrapProgram $out/bin/spin \ - --prefix PATH : ${binPath} - '' + lib.optionalString withISpin '' - install -Dm755 ../iSpin/ispin.tcl $out/bin/ispin - wrapProgram $out/bin/ispin \ - --prefix PATH ':' "$out/bin:${ibinPath}" + enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/spin --prefix PATH : ${binPath} ''; meta = with lib; { description = "Formal verification tool for distributed software systems"; homepage = "https://spinroot.com/"; - license = licenses.free; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub siraben ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 951e95b147..869d7e464a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ltxFduUr+poi4tEjViQXCbe+j3fUdvBG8CTaM7VdpK0="; }; - vendorSha256 = "sha256-iZdWCSkdKG0SXcUtZ0DgDGk25vESlv2dSbcK1gUVTV8="; + vendorSha256 = "sha256-xEmDOP2DbTZ8bpK4OCabIpOwORB8EOJZkHCxL5wBeEU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 75d1b3035e..c6e9ca3912 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.63.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-khAVb+uwr3qyAWjvMjPG//+FKQJ9qoVwmhsej++IQhs="; + sha256 = "sha256-pJyITEIngSWTDGfCcm8Z6YD6Pkbum0Vk71hqWk+CnUc="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix index 17263d1766..4e62ff5b9e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.2.0"; pname = "yallback"; src = fetchFromGitHub { owner = "abathur"; repo = "yallback"; rev = "v${version}"; - hash = "sha256-FaPqpxstKMhqLPFLIdenHgwzDE3gspBbJUSY95tblgI="; + hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE="; }; buildInputs = [ coreutils bashInteractive ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix b/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix new file mode 100644 index 0000000000..e93dfe8454 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "appthreat-depscan"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "AppThreat"; + repo = "dep-scan"; + rev = "v${version}"; + hash = "sha256-hRmTx0qs/QnDLl4KhGbKw5Mucq4wQCaCIkeObrZlJSI="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appthreat-vulnerability-db + defusedxml + pyyaml + rich + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov depscan" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Assertion Error + "test_query_metadata2" + ]; + + pythonImportsCheck = [ + "depscan" + ]; + + meta = with lib; { + description = "Tool to audit dependencies based on known vulnerabilities and advisories"; + homepage = "https://github.com/AppThreat/dep-scan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix index a52a6ca817..f6842dacec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix @@ -4,7 +4,6 @@ , nix-update-script , meson , ninja -, python3 , rustPlatform , pkg-config , glib @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { pname = "ashpd-demo"; - version = "0.0.1-alpha"; + version = "0.2.2"; src = let @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { owner = "bilelmoussaoui"; repo = "ashpd"; rev = version; - sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY="; }; in "${share}/ashpd-demo"; @@ -38,14 +37,13 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc @@ -70,13 +68,6 @@ stdenv.mkDerivation rec { # included by libspa-sys requires BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; - postPatch = '' - patchShebangs build-aux/meson_post_install.py - # https://github.com/bilelmoussaoui/ashpd/pull/32 - substituteInPlace build-aux/meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - passthru = { updateScript = nix-update-script { attrPath = pname; @@ -86,7 +77,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for playing with XDG desktop portals"; homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; - broken = true; # requires older libadwaita license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 444bc39bdd..0bbe2056be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,11 +44,12 @@ python3.pkgs.buildPythonApplication rec { --replace "dateparser~=1.0" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "Flask~=1.1.2" "Flask~=2.0" \ - --replace "PyYAML~=5.3" "PyYAML" \ + --replace "PyYAML~=5.3" "PyYAML #" \ --replace "regex==" "regex #" \ --replace "requests==" "requests #" \ --replace "typing_extensions==" "typing-extensions #" \ - --replace "tzlocal==3.0" "tzlocal" \ + --replace "tzlocal==3.0" "tzlocal #" \ + --replace "tomlkit==0.7.2" "tomlkit #" \ --replace "watchdog==" "watchdog #" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index e10a455c09..5b0dd03494 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -12,7 +12,7 @@ let ]; in buildBazelPackage rec { - name = "bazel-watcher-${version}"; + pname = "bazel-watcher"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix index 5146073178..67c132bd9e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix @@ -5,19 +5,20 @@ , git , testVersion , buf +, installShellFiles }: buildGoModule rec { pname = "buf"; - version = "1.0.0-rc11"; + version = "1.0.0-rc12"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V6xaGnSoKuJC59uZLW8uSLqwseJHvLGjrvhzE8o9fho="; + sha256 = "sha256-UqyWQdlCDTSjW348f87W7g2kwB5nzIOviSE5/1T1soY="; }; - vendorSha256 = "sha256-442NHTREM2zC8VA7zAV35YSwX1lM/BXnx6p8a+avzps="; + vendorSha256 = "sha256-qBgGZTok3G0Pgku76uiV9bZperhiSNoWSrzxrHe4QXw="; patches = [ # Skip a test that requires networking to be available to work. @@ -26,7 +27,7 @@ buildGoModule rec { ./skip_test_requiring_dotgit.patch ]; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf installShellFiles ]; # Required for TestGitCloner checkInputs = [ git ]; @@ -42,6 +43,7 @@ buildGoModule rec { installPhase = '' runHook preInstall + # Binaries mkdir -p "$out/bin" # Only install required binaries, don't install testing binaries for FILE in \ @@ -51,6 +53,16 @@ buildGoModule rec { cp "$GOPATH/bin/$FILE" "$out/bin/" done + # Completions + installShellCompletion --cmd buf \ + --bash <($GOPATH/bin/buf bash-completion) \ + --fish <($GOPATH/bin/buf fish-completion) \ + --zsh <($GOPATH/bin/buf zsh-completion) + + # Man Pages + mkdir man && $GOPATH/bin/buf manpages man + installManPage man/* + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 9c64b4a078..dd3b2ae2bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk="; }; - vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo="; + vendorSha256 = "sha256-UhES+jJil6+JmGH27p/LC/b5rZfHC4RIjA9nCFeB7Ao="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index f03f42be38..6168c4a477 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -114,10 +114,10 @@ stdenv'.mkDerivation rec { bashTools = callPackage ./bash-tools-test.nix {}; }; - name = "bazel-${version}"; + pname = "bazel"; src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index d9c93c2265..3c71c8cc08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -613,6 +613,10 @@ stdenv.mkDerivation rec { # runtime dependencies. echo "${python27}" >> $out/nix-support/depends echo "${python3}" >> $out/nix-support/depends + # The string literal specifying the path to the bazel-rc file is sometimes + # stored non-contiguously in the binary due to gcc optimisations, which leads + # Nix to miss the hash when scanning for dependencies + echo "${bazelRC}" >> $out/nix-support/depends '' + lib.optionalString stdenv.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 6a8792910b..72c971d133 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -660,6 +660,10 @@ stdenv.mkDerivation rec { postFixup = '' mkdir -p $out/nix-support echo "${defaultShellPath}" >> $out/nix-support/depends + # The string literal specifying the path to the bazel-rc file is sometimes + # stored non-contiguously in the binary due to gcc optimisations, which leads + # Nix to miss the hash when scanning for dependencies + echo "${bazelRC}" >> $out/nix-support/depends '' + lib.optionalString stdenv.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 5c57776a91..47abc7ec76 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.22.1"; + version = "3.22.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-DpmCKVSdez82hwPSDiSOfuH4U5ENQnBKqHkYwhPqgsA="; + sha256 = "sha256-PBxHi5ZQsQfUUsW9VFxy4vrU43wJuJoZhLmi9G32rO0="; }; patches = [ 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 d45f15b59e..59d9441a59 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 rec { pname = "sbt"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-YChr8bh1sx4pVfimmYiM0mEumv2U0DzeCi5x79dJL/w="; + sha256 = "sha256-Y3Y3tsTm+gSrYs02QGHjKxJICwkAHNIzA99is2+t1EA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix index 33f9811ab8..979cbae99a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.0.9"; + version = "0.1.0"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "sha256-1KwJuapqGhMEIMwrJp2LKlpYFtl+OP9DyaMtge9ZedI="; + sha256 = "sha256-YoMwtaif7q7Ht8fWRQRGeP03Pl5KTIUk8fGGKhelc68="; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "sha256-IDXO+MgFlnT7VPugcQr/IGLZeD/vWFqJ0D0zVIbTtk4="; + sha256 = "sha256-YjMdhuo9hQCGtq1qYFKUY8S6nz8dpZt+PsngbF6r/C8="; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 04ab489da1..ec3f4de5e1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.23.1"; + version = "1.24.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-vAuUA51E1pufn3YvNe4yfqJHXo14iUEA5MzP3/ah+8I="; + sha256 = "sha256-Dl1ZTYzwZ3tl5k9uPnnKHObmTP6Xsw0P1LdPqCfd/d0="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix index c10e5e7f45..ea3968c384 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-dtDciyQyTYhgYwqRCcxV0kAbPMl3KXhDM0BelPTWymA="; }; - vendorSha256 = "sha256-mIXt3rWXQ6lVbV4hT7KRK7VZ4iFuDX6kZjgoE1WvJxI="; + vendorSha256 = "sha256-0BvZ7xLOr7htp3HVgRt3CzCxx2P62RXKhbzbWtGMLc0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix index 094aa5fe02..4570faa96f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo="; + sha256 = "sha256-rS1/LQ5R3WY9ot1pgtN+6t/ZChr9SxPzrsNio7WWNqQ="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix index d5aded2d8e..98d9eb7936 100644 --- a/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-oBX1MSniVwXvq4Cy9uR3YqxaeSxeWg38oBlCiBy6z/8="; }; - vendorSha256 = "sha256-rlwph9oQXgesLHjrtD+H4zvT2ekTeqZFgRBjXoyFltM="; + vendorSha256 = "sha256-+O0EQRbqLCMBlaI2mejAId2/KFdPWkJ/i7B81tQykzk="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix index 9e0e40b69f..93af8815fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix @@ -1,8 +1,9 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - pname = "chef-dk"; - version = "4.13.3"; + name = "chef-dk-4.13.3"; + # Do not change this to pname & version until underlying issues with Ruby + # packaging are resolved ; see https://github.com/NixOS/nixpkgs/issues/70171 inherit ruby; gemdir = ./.; diff --git a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix new file mode 100644 index 0000000000..9664a75703 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix @@ -0,0 +1,42 @@ +{ stdenv, autoPatchelfHook, fetchurl, lib }: + +stdenv.mkDerivation rec { + pname = "confluent-cli"; + version = "2.4.0"; + + # To get the latest version: + # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 + src = fetchurl (if stdenv.hostPlatform.isDarwin then { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_darwin_amd64.tar.gz"; + sha256 = "1xkf7p9cn37k8j57cgbzxhqgnmchf86jyiza91bf6ddvm6jsm2gd"; + } else { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_linux_amd64.tar.gz"; + sha256 = "1wvy7x56cc7imycf0d83mxcqzdvv56cc0zbp913xgghjn9dl2z7a"; + }); + + nativeBuildInputs = [ autoPatchelfHook ]; + + dontStrip = stdenv.isDarwin; + + installPhase = '' + mkdir -p $out/{bin,share/doc/confluent-cli} + cp confluent $out/bin/ + cp LICENSE $out/share/doc/confluent-cli/ + cp -r legal $out/share/doc/confluent-cli/ + ''; + + meta = with lib; { + description = "Confluent CLI"; + homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; + license = licenses.unfree; + maintainers = with maintainers; [ rguevara84 ]; + + # TODO: There's support for i686 systems but I do not have any such system + # to build it locally on, it's also unfree so I cannot rely on ofborg to + # build it. Get the list of supported system by looking at the list of + # files in the S3 bucket: + # + # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=confluent-cli/archives/1.25.0/&delimiter=/%27 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index a1d1453cb1..f200cd742d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-8/eZz5ejw5bahCYwz825HI+oZ6D1odeTpMIJh0TcGMY="; }; - vendorSha256 = "sha256-rYWo0t6iUI6DVsjHJg2fUv2tv3jovndi12prKzLaMlI="; + vendorSha256 = "sha256-wvOtBK3lRK7XwgeClywowgrZLohltSTGdoB+j3NRmkE="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 897b191cdd..b6375f1c28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,7 +2,7 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep, nixosTests }: buildGoModule rec { - name = "buildkite-agent-${version}"; + pname = "buildkite-agent"; version = "3.33.3"; src = fetchFromGitHub { 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 1b95903c60..67433ab5d8 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 @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.286.0"; + version = "2.287.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-a3Kh65NTpVlKUer59rna7NWIQSxh1edU9MwguakzydI="; + hash = "sha256-4SPrtX3j8blWTYnSkD2Z7IecZvI4xdAqHRJ1lBM0aAo="; }; nativeBuildInputs = [ @@ -77,9 +77,6 @@ stdenv.mkDerivation rec { ./patches/use-get-directory-for-diag.patch # Don't try to install systemd service ./patches/dont-install-systemd-service.patch - # Prevent the runner from starting a self-update for new versions - # (upstream issue: https://github.com/actions/runner/issues/485) - ./patches/prevent-self-update.patch ]; postPatch = '' @@ -90,7 +87,7 @@ stdenv.mkDerivation rec { # Disable specific tests substituteInPlace src/dir.proj \ --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'" + "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'" # We don't use a Git checkout substituteInPlace src/dir.proj \ @@ -137,18 +134,21 @@ stdenv.mkDerivation rec { doCheck = true; - disabledTests = [ - # Self-updating is patched out, hence this test will fail - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_ValidateHash" - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" - ] ++ map - # Online tests - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") - [ + # Fully qualified name of disabled tests + disabledTests = + [ "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" ] + ++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [ + "Cancel_CloneHashTask_WhenNotNeeded" + "CloneHash_RuntimeAndExternals" + "DownloadRetry" + "FallbackToFullPackage" + "NoUpdateOnOldVersion" + "NotUseExternalsRuntimeTrimmedPackageOnHashMismatch" + "UseExternalsRuntimeTrimmedPackage" + "UseExternalsTrimmedPackage" + "ValidateHash" + ] + ++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [ "CompositeActionWithActionfile_CompositeContainerNested" "CompositeActionWithActionfile_CompositePrestepNested" "CompositeActionWithActionfile_MaxLimit" @@ -178,11 +178,15 @@ stdenv.mkDerivation rec { "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" "RepositoryActionWithWrapperActionfile_PreSteps" "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" - ] ++ map - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") - [ + ] + ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [ "EnsureDotnetsdkBashDownloadScriptUpToDate" "EnsureDotnetsdkPowershellDownloadScriptUpToDate" + ] + ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ] + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" + "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" ]; checkInputs = [ git ]; @@ -194,6 +198,8 @@ stdenv.mkDerivation rec { ln -s ${nodejs-12_x} _layout/externals/node12 ln -s ${nodejs-16_x} _layout/externals/node16 + printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}' + # BUILDCONFIG needs to be "Debug" dotnet msbuild \ -t:test \ @@ -290,6 +296,9 @@ stdenv.mkDerivation rec { name = "create-deps-file"; runtimeInputs = [ dotnetSdk nuget-to-nix ]; text = '' + # Disable telemetry data + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + rundir=$(pwd) printf "\n* Setup workdir\n" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch deleted file mode 100644 index da73cd75a0..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8b77c9c61058842e031dd176df2b9c79bc2c0e28 Mon Sep 17 00:00:00 2001 -From: Vincent Haupert -Date: Sun, 12 Sep 2021 19:52:21 +0200 -Subject: [PATCH] Use a fake version to prevent self-update - ---- - src/Runner.Listener/MessageListener.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs -index 71e5e43..29945e0 100644 ---- a/src/Runner.Listener/MessageListener.cs -+++ b/src/Runner.Listener/MessageListener.cs -@@ -65,7 +65,7 @@ namespace GitHub.Runner.Listener - { - Id = _settings.AgentId, - Name = _settings.AgentName, -- Version = BuildConstants.RunnerPackage.Version, -+ Version = "2.999.9", - OSDescription = RuntimeInformation.OSDescription, - }; - string sessionName = $"{Environment.MachineName ?? "RUNNER"}"; --- -2.32.0 - diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 3041a03173..47b52e5f70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "gocd-agent-${version}-${rev}"; + pname = "gocd-agent"; version = "19.3.0"; rev = "8959"; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 4b3f61cf4b..a55d3a2efe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "gocd-server-${version}-${rev}"; + pname = "gocd-server"; version = "19.3.0"; rev = "8959"; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix index 05f96c0695..3c48506a6b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -25,12 +25,12 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ohwgiles"; repo = "laminar"; rev = version; - sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk="; + sha256 = "sha256-PLnfiWpelgKhs4FNry60sm6/QdhYs76FnZ/ZcRmb4Ok="; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix index 44445f8675..f137cbd078 100644 --- a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, cmake +, libiconv +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.3"; + version = "0.3.8"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw="; + sha256 = "sha256-sNVl+bbCj3vPYz4wKOaAHeaPCCubG4XvXZ+AZijhFJE="; }; - cargoSha256 = "sha256-RuClZ+ChP7d40e9nr1Lg8R0F7rbFbBse79V9Y1AQn3o="; + cargoSha256 = "sha256-FHiX9XpNjBFfs9fwi3Wzq7bAwRi7e/sqtji5WWPA5Qo="; - nativeBuildInputs = [ openssl perl pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "A Conventional commit cli"; diff --git a/third_party/nixpkgs/pkgs/development/tools/corgi/default.nix b/third_party/nixpkgs/pkgs/development/tools/corgi/default.nix index e39e42c40a..ce003457e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/corgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/corgi/default.nix @@ -1,16 +1,15 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "corgi-${rev}"; - rev = "v0.2.4"; + pname = "corgi"; + version = "0.2.4"; goPackagePath = "github.com/DrakeW/corgi"; src = fetchFromGitHub { - inherit rev; - owner = "DrakeW"; repo = "corgi"; + rev = "v${version}"; sha256 = "0h9rjv1j129n1ichwpiiyspgim1273asi3s6hgizvbc75gbbb8fn"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/beekeeper-studio/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/beekeeper-studio/default.nix index 74c5f35dc2..c00c2e99a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/beekeeper-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/beekeeper-studio/default.nix @@ -2,13 +2,13 @@ let pname = "beekeeper-studio"; - version = "2.1.4"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "1aik88wi9axv66axjmmjmlna1sp0pz92z8i2x6pq3bs0gcs4i1q3qxxbrfc14ynbpa65knimfhwzrrshchnijgdazx3qjzh8jwzfiwl"; + sha512 = "sha512:1zv4fclac94fzzhgqmjgc5pllxcxajjx6yjf3zblj53cc7m4sp4ydjx3wh4db57j75x8vh7xc3q1xpq6q3sj1dafnap0j0icfi6wznk"; }; appimageContents = appimageTools.extractType2 { @@ -32,9 +32,9 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows"; homepage = "https://www.beekeeperstudio.io"; - changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v2.1.4"; + changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ milogert ]; + maintainers = with maintainers; [ milogert alexnortung ]; platforms = [ "x86_64-linux" ]; }; } 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 6090bc1d75..4ac007f088 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 @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ThN1uvofIvV5Dt6dqxLpekTRy9pV4xb0bkVNRcfNJ2c="; }; - vendorSha256 = "sha256-OQGpWWerUv2asjpjMLAkgeb0Q+lMAsDXjFCh0I4ze20="; + vendorSha256 = "sha256-bz21YeEONXD08HD1/8vn+NfGniXkGo7/8bQXLpRFmaM="; postConfigure = '' export CGO_ENABLED=0 diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 5348d0be88..ae25f26566 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-XNxy8CnhO3rQi3VHr7nikFNXvY2eM30jR0ngNc0FV3E="; + sha256 = "sha256-j7u8TidiuaA5SbXoD+p23wwTsePi6/hzNdVS5IJMEh0="; }; - vendorSha256 = "sha256-Qe3fwyEf/NiGmUSha/zZHRBR1okw2vE97u7tybqiWNI="; + vendorSha256 = "sha256-t8ga2KrahzdDBu33vv1ETB6hVoNpdxjPfiYuvLR2m5g="; doCheck = false; 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 f312b522ad..2d1548bd86 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-Cg85NdbbZs0tkBy2kq5ZRKDuQwLIixdhggOBSFpUM04="; + hash = "sha256-KNYxHBtPRsxEFrBJsfz5G7ZRZpVQxOph9UUKKhbHA9Y="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index 9c24d35cbf..be29a0457e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,17 +2,20 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6xMdOqLfD3NQksmcD7rlTW3xoW2Fi6OmwbpjIj9A/tw="; + sha256 = "sha256-p1SU0wnB2XftuPMbm47EbJ2aZGV9amlk0y7FI0QOBkk="; }; vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; + # Temporary fix of bug: https://github.com/timescale/timescaledb-tune/issues/95 + patches = [ ./fixMinMaxConn.diff ]; + meta = with lib; { description = "A tool for tuning your TimescaleDB for better performance"; homepage = "https://github.com/timescale/timescaledb-tune"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff new file mode 100644 index 0000000000..3a0110476c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff @@ -0,0 +1,13 @@ +diff --git a/pkg/pgtune/misc.go b/pkg/pgtune/misc.go +index 1fceb6e..3e76be5 100644 +--- a/pkg/pgtune/misc.go ++++ b/pkg/pgtune/misc.go +@@ -35,7 +35,7 @@ const ( + // If you want to lower this value, consider that Patroni will not accept anything less than 25 as + // a valid max_connections and will replace it with 100, per + // https://github.com/zalando/patroni/blob/00cc62726d6df25d31f9b0baa082c83cd3f7bef9/patroni/postgresql/config.py#L280 +- minMaxConns = 25 ++ minMaxConns = 20 + ) + + // MaxConnectionsDefault is the recommended default value for max_connections. diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix index 2eb11b2ffc..d8b99eb287 100644 --- a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-zoFWiqrKdTh6XDrKx2mQe3NqK03so6MqIX0sSQHQa5U="; }; - vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c="; + vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix index 61d8ea77f3..31174ea7a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QLJB2WcnguknEMdgwJzltp++mJCL4cFOWU568aTk0sc="; }; - vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg="; + vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; ldflags = [ "-s -w" diff --git a/third_party/nixpkgs/pkgs/development/tools/deis/default.nix b/third_party/nixpkgs/pkgs/development/tools/deis/default.nix deleted file mode 100644 index 8286435d9a..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/deis/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "deis"; - version = "1.13.4"; - rev = "v${version}"; - - goPackagePath = "github.com/deis/deis"; - subPackages = [ "client" ]; - - postInstall = '' - if [ -f "$out/bin/client" ]; then - mv "$out/bin/client" "$out/bin/deis" - fi - ''; - - src = fetchFromGitHub { - inherit rev; - owner = "deis"; - repo = "deis"; - sha256 = "0hndzvlgpfm83c4i1c88byv8j9clagswa79nny8wrw33dx90dym1"; - }; - - preBuild = '' - export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace - ''; - - meta = with lib; { - homepage = "https://deis.io"; - description = "A command line utility used to interact with the Deis open source PaaS"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix deleted file mode 100644 index 67245a5ebb..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/deisctl/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "deis"; - version = "1.13.3"; - rev = "v${version}"; - - goPackagePath = "github.com/deis/deis"; - subPackages = [ "deisctl" ]; - - src = fetchFromGitHub { - inherit rev; - owner = "deis"; - repo = "deis"; - sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p"; - }; - - preBuild = '' - export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace - ''; - - meta = with lib; { - homepage = "https://deis.io"; - description = "A command-line utility used to provision and operate a Deis cluster"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 9f31ebb0af..a06cc0f1c4 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.68.0"; + version = "1.69.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-3W6jDMT4UUtSND9bJJEexQ9LrqxL4oZtpucdcM1McdE="; + sha256 = "sha256-Bm6Xrgp/6/NpIndCVRDamKndBbCANnW5j3vOVRVxnE4="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/dstp/default.nix b/third_party/nixpkgs/pkgs/development/tools/dstp/default.nix index c0a7f79eae..7e3dafc5b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dstp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dstp/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "dstp"; version = "0.4.0"; diff --git a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix index 3e228badbd..3edbc57ecd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-0/pn+Ld7o4gBnddA+uMzBhrFnov1XoqpRGkTT/vNH3Y="; }; - vendorSha256 = "sha256-9FkRazgZlzwvimsbqWCYJLxwRRlHa0i/jPPuf+AGSOA="; + vendorSha256 = "sha256-ITg+qEdk4/mWytzBbybYEc2Tw4ibvGUOB/FMu475dSk="; subPackages = [ "cmd/dyff" diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index c6cc57e14c..2d3a7b6192 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-a2NNpQvbhMY66nbk4RAXFb/o1qR5OXPm93ujzS2cxp4="; + sha256 = "sha256-QrlxH9ihWAVzf9lh3CcVCqFPLmn7bM2pNZUqxnHD2WA="; }; - vendorSha256 = "sha256-0wyefhY/KR79K9DDI4/8EaA/DFI1rf6wxsBIAZo+rUI="; + vendorSha256 = "sha256-pI5aBBUJoAmeJ2Kr0eqP9O/tGhgHCBjINL3406LQ9Dc="; ldflags = [ "-s" "-w" @@ -37,6 +37,6 @@ buildGoModule rec { homepage = "https://earthly.dev/"; changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; license = licenses.bsl11; - maintainers = with maintainers; [ matdsoupe ]; + maintainers = with maintainers; [ zoedsoupe ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix b/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix index 1a2fd8ec0f..197105ee64 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-k4YzG4M+r6BHc4DdAMXoUvVDTJqmzr8vIL1J6kbJBeY="; }; - vendorSha256 = "sha256-uq0gcpFzAcz1HMwI1ZjHykWU93bV2U5kxC/G+J4ob7Q="; + vendorSha256 = "sha256-bI1W6KdXIq5HsoXDOq93Le2vePAAgvqy/lXm/N1F+yU="; postInstall = '' mv $out/bin/{cmd,ec2-metadata-mock} diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index e5fdce7cf2..b2204775f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -15,6 +15,7 @@ , libxkbcommon , libappindicator-gtk3 , libxshmfence +, libglvnd }@args: let @@ -22,7 +23,7 @@ let in rec { - electron = electron_16; + electron = electron_17; electron_7 = mkElectron "7.3.3" { x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; @@ -80,43 +81,53 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.8" { - armv7l-linux = "94cf65f1454ea26017d80cd98a9fd3d9c9767d2a2ba7030d29d674d643814d59"; - aarch64-linux = "5579b20438e5637f0ec8e0f07a46d5359691bfd631290372d538217c1904e07b"; - x86_64-linux = "054f2a83a1361ea25438b609a681adb8c8dec8a2f03fd5b3605b10818799ea01"; - i686-linux = "87cb2af357ba568fb56c99aea0a25714501fbacd02ce27c9ba55e3db8deb5535"; - x86_64-darwin = "d8fa0254c4a5fe61f5a047f9cb6968a2dbc817cbd10cac1fd9c9d362608bc58d"; - aarch64-darwin = "8e59ea97744791f7edaf3ff4c2fa1a144f9737c165c29ee0f0d13175a2140399"; - headers = "0s253jdmfyfgb5mwslqd50g623fwj3dgsgsq4cn3pl5qfpmcm26x"; + electron_13 = mkElectron "13.6.9" { + armv7l-linux = "e70cf80ac17850f3291c19a89235c59a7a6e0c791e7965805872ce584479c419"; + aarch64-linux = "cb570f77e46403a75b99740c41b297154f057dc3b9aa75fd235dccc5619972cf"; + x86_64-linux = "5e29701394041ba2acd8a9bb042d77967c399b8fe007d7ffbd1d3e6bfdb9eb8a"; + i686-linux = "7c31b60ee0e1d9966b8cf977528ace91e10ce25bb289a46eabbcf6087bee50e6"; + x86_64-darwin = "3393f0e87f30be325b76fb2275fe2d5614d995457de77fe00fa6eef2d60f331e"; + aarch64-darwin = "8471777eafc6fb641148a9c6acff2ea41c02a989d4d0a3a460322672d85169df"; + headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc"; }; - electron_14 = mkElectron "14.2.4" { - armv7l-linux = "d644d2df745a9809794929762db1faa56b77f519ccc0d430dd2238235739ace3"; - aarch64-linux = "1f198a61a5f67954f568e49879e390c94ef9cb05545664e24bac513e05dea0d9"; - x86_64-linux = "faf6c0501811e3dec056f536e53f0ec087345b852e7de47ae86ea175cc070a2f"; - i686-linux = "1f9baa2f3aa1cd935cc29f67aa273c8b1b65da144af3894bd855ce02a6730fc1"; - x86_64-darwin = "4a3c146da911162c7081e280f2c311c41f132e1d3274bc3676ed71cc9392dc5d"; - aarch64-darwin = "279cc3c04c7db9f3361b09f442750f4d18c8b2c7f633bca17aa9fb3656bfb74c"; - headers = "1zkf1j82psbj9mw8zb9ghl9y6bkw77cxqzkp3q1bbn6wvj41lvyh"; + electron_14 = mkElectron "14.2.5" { + armv7l-linux = "d6f7e2fe6088f57ecd455035e0815c20dd1d84b4cbf669e5fa355b96f36eaf2e"; + aarch64-linux = "c8a1a7c5c04462bbe6e148587a72b002ab4bb90aecb9686546b22580c0f9fa52"; + x86_64-linux = "5820ea6c9cfe02096a75df43cab7cdfe5947d6d90207e98c563bd50c400f8110"; + i686-linux = "8099fc3b137e80c5e65493dea2cf3dfb923e86693f3b082429f6fd949560f540"; + x86_64-darwin = "258eb29426a5f275c49284be6818f856ffc29d04fa9cef6fafcdcd207092281d"; + aarch64-darwin = "38a19828c1d7ff5fb49c5db5a706482f4afbae9fecaedaf9ebea0a5765bf952d"; + headers = "172h9ba1s531y3s751inwsia6kr39412yivqkpdc58jmn47nmgb8"; }; - electron_15 = mkElectron "15.3.5" { - armv7l-linux = "c5540cd94711a31fe0098da982d4a25ed1b606e0d4213c9f7863826b2c8e7eaf"; - aarch64-linux = "6550387135605b64b8549b1034eae672a8f94419032dacbaff7b92934cc0508d"; - x86_64-linux = "3b61eaa48f3c5f1983a24152e6b12f39c3a29abb52d17c13891c16a25e3c209a"; - i686-linux = "30d6de074bebe985bb07f20788a8378c7fa1ded564e3c1e8183b0113ba76b282"; - x86_64-darwin = "fe2c138bb11b3db07d02c1cbf7838765036ac2552582f9ce2265ffe6609ea2e1"; - aarch64-darwin = "7c887b8ae24ad7ca9585a001f29108919bc39d27c3818012aeefb8072e23178d"; - headers = "0fkvwlnxjy8dwfnxhgk6i4qayhmg7dbqmd9nfi94a7kdbwp714r5"; + electron_15 = mkElectron "15.3.6" { + armv7l-linux = "4c105be3dc38ea8899f9fe58c05dfbf20e0d43e9b35ca815c43329d17b714d36"; + aarch64-linux = "3d06de32f02e38039c3c9deb418e3b9dbcda30f387f27e54fb1f1be068b80989"; + x86_64-linux = "5a9a3e37e92ad67d2a4ebb5ac85cb817d682fe2ca0b37b924d7f40085d246cc9"; + i686-linux = "32ff47793c8123fa6220ff9e7c524e3b89c0411e94bdb4d9391038cc58449b5f"; + x86_64-darwin = "faff636a6deedc3b7a3c900aef187baaeec2b83ccc405c56e3ea18d68894b82c"; + aarch64-darwin = "ae7350a7daa6eb2d21fa001c38217bc46a3894f843962c5cca192b837cc9d81c"; + headers = "1mbffk26kdn1id809sdg1kdhrf285zm9ls40b5zaflcljvqg3i2x"; }; - electron_16 = mkElectron "16.0.7" { - armv7l-linux = "8a8567c745ab1c2b1de19305da0a0036ba100b27e1fc4eb014aca325aff3193e"; - aarch64-linux = "6d27cc9acc3f580118cdd685d629d39c2a1fc094376b719fa0100a7446f8fede"; - x86_64-linux = "544cd6d48262f24c8a82d2e8079b20889ec5e83959404fdda9ad00c86e9efa70"; - i686-linux = "8b79ce5fbc704eb03c34d4b96765314074a687ae3165cab21f84f77fee36d755"; - x86_64-darwin = "e5c825d4cfc1dabd066986fa1cae3ee880f222b053c760b700b24899fb02d4db"; - aarch64-darwin = "9fa9dc44e5d71de7a999b3db07a583e0a04252747486c16955232eba498b259d"; - headers = "0r4gd2v9rzrg1msxw62rq1s93ifrjj4yb4gfcma5mbj88m3v5p63"; + electron_16 = mkElectron "16.0.8" { + armv7l-linux = "be3a598d5f7c677c11831b78a8a82d95132ea760bb643e526426b91fdf27aff7"; + aarch64-linux = "465cd93d69ea2e3273339d48bef58e7359b692da5535bff5882e803c22535ec5"; + x86_64-linux = "25767a94d4b0927616ed5008889cd65bb073c7005209671b34045f91d698c857"; + i686-linux = "1cedf35f501ea1512fe9ae5cae47a72e093b6eb7297f76b726551e4a33a593a5"; + x86_64-darwin = "a3c5e5368165304fc9392e3a5b59480965cf0f91f7d889257e6a622f48051cbf"; + aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a"; + headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4"; + }; + + electron_17 = mkElectron "17.0.0" { + armv7l-linux = "29b31c5e77d4d6d9e1a4340fdf08c28ae6698ea9e20d636cec8a59dc758815ef"; + aarch64-linux = "e7bf2ec09b8a7018ba417fc670a15594fb8f3e930626485f2423e9a89e2dcbd0"; + x86_64-linux = "dc74e28719a79f05dd741cda8c22c2bb164dec178c6d560af085910b37cf000b"; + i686-linux = "6f6fe5fa0452e871abe82dbd25d7cf92ab7011995b3b2b15d04d8691ddc9e9de"; + x86_64-darwin = "c35d81af3a3f156059a53436d7874a46770cbf6e4e5087f7caee269e66abb636"; + aarch64-darwin = "7dc5eabc7e582a031d5bd079eeadc9582f5605446085b4cbd1dc7e7c9e978c45"; + headers = "1i3sx1xy62i4f68zbsz1a7jgqw7shx0653w9fyvcdly2nraxldil"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index f70767a059..08edf8a309 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -15,11 +15,12 @@ , libxkbcommon , libappindicator-gtk3 , libxshmfence +, libglvnd }: version: hashes: let - name = "electron-${version}"; + pname = "electron"; meta = with lib; { description = "Cross platform desktop application shell"; @@ -28,7 +29,7 @@ let maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; - knownVulnerabilities = optional (versionOlder version "13.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "14.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -54,7 +55,7 @@ let "Unsupported system: ${platform.system}"; common = platform: { - inherit name version meta; + inherit pname version meta; src = fetcher version (get tags platform) (get hashes platform); passthru.headers = headersFetcher version hashes.headers; }; @@ -64,6 +65,7 @@ let ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] ++ optionals (! versionOlder version "12.0.0") [ libxshmfence ] + ++ optionals (! versionOlder version "17.0.0") [ libglvnd ] ); linux = { diff --git a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix new file mode 100644 index 0000000000..ba30aa97e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "ent-go"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "ent"; + repo = "ent"; + rev = "v${version}"; + sha256 = "sha256-TG08GRo1gNxC5iHt/Md5WVWaEQ1m2mUDGqpuxw8Pavg="; + }; + + vendorSha256 = "sha256-n5dS78SSBAEgE4/9jMZZhbOQZ3IGi9n3ErA0ioP9Tsg="; + + subPackages = [ "cmd/ent" ]; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd ent \ + --bash <($out/bin/ent completion bash) \ + --fish <($out/bin/ent completion fish) \ + --zsh <($out/bin/ent completion zsh) + ''; + + meta = with lib; { + description = "An entity framework for Go"; + downloadPage = "https://github.com/ent/ent"; + license = licenses.asl20; + homepage = "https://entgo.io/"; + maintainers = with maintainers; [ superherointj ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 4995fbe1c3..9970fb77cb 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.14.11"; + version = "0.14.13"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-hS+LJfYB+nH5z/UA6RKdqA8qc1jT9Gskt6LufHCiqv8="; + sha256 = "sha256-DBu6j8UjbRVMoT0j/WwtVlJ+k3VwVKFbX2tdUs0neDs="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/evans/default.nix b/third_party/nixpkgs/pkgs/development/tools/evans/default.nix index bfe58a8dd0..29dadf2430 100644 --- a/third_party/nixpkgs/pkgs/development/tools/evans/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ftt3lnwLk2Zx1DxDmZx2hBqXcxzqUb6I/gEdQJuFsCc="; + sha256 = "sha256-F9URMwQaSAQZaiZ95rDZqe8+YcJ9aMInSTIgQ7JLyOw="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-WclmINHcgRtbRSZGv+lOgwuImHKVC9cfK8C+f9JBcts="; + vendorSha256 = "sha256-ICGnjI9sFwt81rZCnap/rggfSs4+pZNmLouoTY7CYKw="; meta = with lib; { description = "More expressive universal gRPC client"; diff --git a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix index 8356410010..236404e947 100644 --- a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix @@ -10,14 +10,14 @@ in buildGoModule rec { pname = "faas-cli"; # When updating version change rev. - version = "0.14.1"; - rev = "d94600d2d2be52a66e0a15c219634f3bcac27318"; + version = "0.14.2"; + rev = "b1c09c0243f69990b6c81a17d7337f0fd23e7542"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "132m9kv7a4vv65n8y3sq1drks6n1pci9fhvq0s637imf2vxccxqr"; + sha256 = "sha256-OdFd4q5IHu4FjNArcqVt4dNyLWegR4GdAyyCzgNIU+Q="; }; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix index cafcc859b5..066375e2c9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix @@ -1,11 +1,11 @@ { lib -, buildGo117Module +, buildGoModule , fetchFromGitHub , fq , testVersion }: -buildGo117Module rec { +buildGoModule rec { pname = "fq"; version = "0.0.3"; diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix index fb6a4f4962..715c237f49 100644 --- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2fXefYvcclcxMeX6JtHjoVNRwJTsUAhxet646BDPHic="; + sha256 = "sha256-apX4MFzeR7+5gWauw5HXPK0c7N4uTSqkE2vqnYB5LJs="; }; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix index 0566f0276f..e6c5c1ebf5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,21 +2,36 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-a3AZ/7UfB9qjMK9yWHSaBRnDA/5FmIGGxXAvNhcfKCc="; + sha256 = "sha256-iAXqPbNBNNR6PGhIjrDqTYUu0XYgvS5aM8n68qQNurQ="; }; vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI="; - doCheck = false; + + # integration tests expect more file changes + # types tests are missing CodeLocation + excludedPackages = "\\(integration\\|types\\)"; meta = with lib; { - description = "BDD Testing Framework for Go"; - homepage = "https://github.com/onsi/ginkgo"; + homepage = "https://onsi.github.io/ginkgo/"; + changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md"; + description = "A Modern Testing Framework for Go"; + longDescription = '' + Ginkgo is a testing framework for Go designed to help you write expressive + tests. It is best paired with the Gomega matcher library. When combined, + Ginkgo and Gomega provide a rich and expressive DSL + (Domain-specific Language) for writing tests. + + Ginkgo is sometimes described as a "Behavior Driven Development" (BDD) + framework. In reality, Ginkgo is a general purpose testing framework in + active use across a wide variety of testing contexts: unit tests, + integration tests, acceptance test, performance tests, etc. + ''; license = licenses.mit; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ saschagrunert jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix b/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix index 487edcde99..cba623dec7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8="; }; - vendorSha256 = "sha256-2x5rQGEp6ARP2nggE+tvXDRY7AkKCEUXTLEPWDJMCnI="; + vendorSha256 = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix index 06ae299381..f966833224 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bw84HQxrI8cSBEM1cxXmWCPqKZa5oGsob2iuUsiAZ+A="; + sha256 = "sha256-sahInHXv1GtylsY8kpw1dDjKiENmq4myx+7mq60vJAI="; }; - vendorSha256 = "sha256-ZNRJZQ7DwT/+scsbSud/IpSX06veOtJ5Aszj0RbS870="; + vendorSha256 = "sha256-KLV6ABo1K+KtAzAQ4FcFiK1LAZEsKup+BtgjRJfonAY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/third_party/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix index f610b19d79..fca346b78c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix @@ -24,6 +24,8 @@ buildGoModule rec { mv $out/bin/gocode $out/bin/gocode-gomod ''; + doCheck = false; # fails on go 1.17 + meta = with lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix b/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix index d11cf60932..096af41ba9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix @@ -1,28 +1,25 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { - pname = "gocyclo-unstable"; - version = "2015-02-08"; - rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7"; - - goPackagePath = "github.com/alecthomas/gocyclo"; +buildGoModule rec { + pname = "gocyclo"; + version = "0.4.0"; src = fetchFromGitHub { - inherit rev; - - owner = "alecthomas"; + owner = "fzipp"; repo = "gocyclo"; - sha256 = "094rj97q38j53lmn2scshrg8kws8c542yq5apih1ahm9wdkv8pxr"; + rev = "v${version}"; + sha256 = "1s9m5m5p76wcxi5n4diz891kd5db4ll21fsh9fnvvf9w7yrmgdw2"; }; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; - homepage = "https://github.com/alecthomas/gocyclo"; + homepage = "https://github.com/fzipp/gocyclo"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gokart/default.nix b/third_party/nixpkgs/pkgs/development/tools/gokart/default.nix index 7722e0b36a..f7d0857580 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gokart/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gokart/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gokart"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ="; + sha256 = "sha256-HsjLNY5Z5UidsLDWSP+1bu3jrfn3oAERPrPV/AkTH8I="; }; - vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd"; + vendorSha256 = "sha256-S3RukCKAJnPH1KGVdnkgAJQKEDTZYpcMMdoQ4OnHZVg="; # Would need files to scan which are not shipped by the project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index d541393a89..ae813c0f6e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; modRoot = "gopls"; - vendorSha256 = "sha256-nKjJjtVHk/RLIHI/5v8tO4RcaLLZhr0A6llYGsB0ifQ="; + vendorSha256 = "sha256-8osb5C5G58x9KWCxqiepmN6J0jp+q6aR+As/pJeeTKM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix index faa2e60aca..d0d5025b31 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotests/default.nix @@ -1,25 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gotests"; - version = "1.5.3"; - rev = "v${version}"; - - goPackagePath = "github.com/cweill/gotests"; - excludedPackages = "testdata"; - goDeps = ./deps.nix; + version = "1.6.0"; src = fetchFromGitHub { - inherit rev; owner = "cweill"; repo = "gotests"; - sha256 = "1c0hly31ax0wk01zdx0l0yl40xybaizjfb3gjxia2z0mgx330dq9"; + rev = "v${version}"; + sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw="; }; - meta = { + vendorSha256 = "sha256-WMeHZN3s+8pIYEVaSLjI3Bz+rPTWHr1AkZ8lydjBwCw="; + + # tests are broken in nix environment + doCheck = false; + + meta = with lib; { description = "Generate Go tests from your source code"; homepage = "https://github.com/cweill/gotests"; - maintainers = with lib.maintainers; [ vdemeester ]; - license = lib.licenses.asl20; + maintainers = with maintainers; [ vdemeester ]; + license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gotests/deps.nix b/third_party/nixpkgs/pkgs/development/tools/gotests/deps.nix deleted file mode 100644 index df411303d9..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/gotests/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "23463209683dad3f2b9cc7f7c2663e1847c59017"; - sha256 = "1shzfl4zixhj78v4f6y04bcmfl705yr5q8hp72ndbbma0mh09g8f"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/gron/default.nix b/third_party/nixpkgs/pkgs/development/tools/gron/default.nix index b8242cc3cd..a5247a3f80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gron/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy"; + vendorSha256 = "sha256-Evn5R/LzripRgG0zOVP/DJrtjwNRwgKapsRdtZaZhlU="; meta = with lib; { description = "Make JSON greppable!"; diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 2b5f6c4da8..f8f1f85b27 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,5 +1,10 @@ -{ lib, supportedGhcVersions ? [ "884" "8107" "902" ], stdenv, haskellPackages -, haskell }: +{ lib +, stdenv +, supportedGhcVersions ? [ "884" "8107" "902" ] + ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ "921" ] +, haskellPackages +, haskell +}: # # The recommended way to override this package is # diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/server.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/server.nix index 47a9c550fa..b8e5aa281e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/server.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -3,7 +3,8 @@ let hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); in stdenv.mkDerivation { - name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}"; + pname = "hyper-haskell-server-with-packages"; + version = hyperHaskellEnv.version; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix index 205cf4e33d..bf21200878 100644 --- a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.59.0"; + version = "7.59.2"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "0whkm8xi918m4y0wjdbma42kl4cc6chakjn5chi75aqd5y3qanpp"; + sha256 = "dbb69d4b5df99ff47ed0f6f1f58d968b3b144b13deee1b33c82fef7ef4006903"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix index 13532c48d4..b4c682bbd2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/sawjap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (sawja) src version; - sourceRoot = "source/test"; + prePatch = "cd test"; buildInputs = [ ocaml findlib sawja ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index b9020f2cc0..7f89961f9f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.1"; + version = "2.1.2"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-LXMPdzIOFPzFUx3uufx+2UeJ6mg/9kJXGews4KU3rrU="; + sha256 = "sha256-khbXzdsC0PA10HEu/dIFQ87+QbKpctmTUTt/zEuxV6c="; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/development/tools/jless/default.nix b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix new file mode 100644 index 0000000000..563002e9fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "jless"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "PaulJuliusMartinez"; + repo = "jless"; + rev = "v${version}"; + sha256 = "sha256-gBqyo/N/qF6HCTUrSKNVLiL1fc/JTfip1kNpNCBzRT8="; + }; + + cargoSha256 = "sha256-PbX61RVbrI2kTuyXK+LhQdJDvNo3KjIQH5eBbL6iUBM="; + + meta = with lib; { + description = "A command-line pager for JSON data"; + homepage = "https://github.com/PaulJuliusMartinez/jless"; + license = licenses.mit; + maintainers = with maintainers; [ jfchevrette ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 79c726c279..410660cb45 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,15 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.10.5"; + version = "0.10.7"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-PbWV8It/ubDbZooJdt/KWihnp221Pexs0U6zMa8KSMw="; + sha256 = "sha256-53dyy/jpmQCjOoZ9Wvec0iQMWKVVrt1WQDCGhXH53Mg="; }; - cargoSha256 = "sha256-VRfk6566SNmvCxtD9EdDxDdBvQuEfjPVggXzt4VoYRg="; + + cargoSha256 = "sha256-cDwuhOJ5/SFCQKJqmN6rPYahW/ctjE0hFr6SpgVzyis="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix b/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix index 9cd1c97616..8f0aecba34 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15"; + vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix index 341df436e2..a08b10c195 100644 --- a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vt8/hYsThBoAxMglF8pjdVphmkbHXsuzaHFJhnGXdU4="; + sha256 = "sha256-j1rVkI5hXYtY0jtP+i/yRw1sS3iN3KyVI4gV9fNdj/E="; }; - vendorSha256 = "sha256-3m+mN90Edb/yMgVmkokRQrDM2EdB7cb2opL0QZJ8L+U="; + vendorSha256 = "sha256-oYIUeHMEK55mCkf5cb5ECCU5y6tUZAM258sINrBl9kM="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix index d14ba45010..82a130181e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "kubepug"; version = "1.3.2"; 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 0d7ff5a546..8d759457fa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -94,7 +94,8 @@ stdenv.mkDerivation { # indeed GHC will refuse to compile with a binutils suffering from it. See # this comment for more information: # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch; + lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch + ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch; outputs = [ "out" "info" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/windres-locate-gcc.patch b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/windres-locate-gcc.patch new file mode 100644 index 0000000000..721667c62c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/windres-locate-gcc.patch @@ -0,0 +1,19 @@ +diff --git a/binutils/resrc.c b/binutils/resrc.c +index a875c3a4..0411d047 100644 +--- a/binutils/resrc.c ++++ b/binutils/resrc.c +@@ -521,7 +521,13 @@ read_rc_file (const char *filename, const char *preprocessor, + + cpp_pipe = 0; + +- if (dash) ++ /* Nixpkgs specific : look first at the prefixed path ++ ( there should be no gcc in the binutils folder ) */ ++ if (slash && dash) { ++ cpp_pipe = look_for_default(cmd, slash + 1, dash - slash, preprocargs, filename); ++ } ++ ++ if (dash && ! cpp_pipe) + { + /* First, try looking for a prefixed gcc in the windres + directory, with the same prefix as windres */ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 31ea03a2f8..5eec86d024 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -19,11 +19,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.71.0"; + version = "1.72.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "8LsYkzNy98qQ9niXrRCkL47Ouyd33ZICnSXx29WIWl4="; + sha256 = "FczlRevMn3VGCW+mtIqjGMNZKjsqzCGW3DQLQG7dJ8c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix index 0e92d373c0..e8136be0eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cgdb"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { url = "https://cgdb.me/files/${pname}-${version}.tar.gz"; - sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; + sha256 = "sha256-DTi1JNN3JXsQa61thW2K4zBBQOHuJAhTQ+bd8bZYEfE="; }; buildInputs = [ ncurses readline flex texinfo ]; 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 77fe16c442..5e7d4e348f 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 @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-IsFvUWNuQsECh47M6wDpuyDYXrKKaZp2SSmEGFryzM0="; }; - vendorSha256 = "sha256-efrjHwHobML/t2lDSFx+UyAOca9dHjZHcAxkFzJqWEo="; + vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 7bf32a13ce..4841c48d0e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,28 +2,20 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.01.22-01.31.09"; + version = "2022.02.01-16.53.14"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-xQSOJRKKjX3AfQsYe4UNhFlLgWPkoY8NOPXCO1oc3BI="; + sha256 = "sha256-VyDnDlK40Sj/0cethclnRlKc5tOentAEUzjDOqbItpo="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-le0+ZmGyhM/UfGUV05FHyx5PlARxL/T2aC8UhiPYjxw"; + sha256 = "sha256-gIG8sjf55aRo4xI/RFrxhzLSD6RHzn/YGG9+gWrXcgE="; }; - # https://github.com/clojure-lsp/clojure-lsp/blob/2022.01.22-01.31.09/cli/graalvm/native-unix-compile.sh#L18-L27 - # Needs to be inject on `nativeImageBuildArgs` inside shell environment, - # otherwise we can't expand to the value set in `mktemp -d` call - preBuild = '' - export DTLV_LIB_EXTRACT_DIR="$(mktemp -d)" - nativeImageBuildArgs+=("-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR") - ''; - extraNativeImageBuildArgs = [ "--no-fallback" "--native-image-info" @@ -68,8 +60,5 @@ buildGraalvmNativeImage rec { homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; maintainers = with maintainers; [ ericdallo babariviere ]; - # Depends on datalevin that is x86_64 only - # https://github.com/juji-io/datalevin/blob/bb7d9328f4739cddea5d272b5cd6d6dcb5345da6/native/src/java/datalevin/ni/Lib.java#L86-L102 - broken = !stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix index cf2a522760..2763a1eaa2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "direvent-${version}"; + pname = "direvent"; version = "5.2"; src = fetchurl { - url = "mirror://gnu/direvent/${name}.tar.gz"; + url = "mirror://gnu/direvent/direvent-${version}.tar.gz"; sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613"; }; 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 6de12a8452..f5fb8e8eeb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix @@ -6,10 +6,10 @@ }: let - name = "distcc"; + pname = "distcc"; version = "2021-03-11"; distcc = stdenv.mkDerivation { - name = "${name}-${version}"; + inherit pname version; src = fetchFromGitHub { owner = "distcc"; repo = "distcc"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/epm/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/epm/default.nix index 8f5921783e..b83bb8d332 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/epm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/epm/default.nix @@ -1,26 +1,40 @@ -{lib, stdenv, fetchFromGitHub, rpm}: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, rpm +}: stdenv.mkDerivation rec { pname = "epm"; - version = "4.4"; + version = "5.0.0"; src = fetchFromGitHub { - repo = "epm"; - owner = "michaelrsweet"; + owner = "jimjag"; + repo = pname; rev = "v${version}"; - sha256 = "0kaw7v2m20qirapkps4dna6nf9xibnwljvvv0l9vpvi920kw7j7p"; + hash = "sha256-o4B5lWBeve+U70FDgF1DrtNrXxaEY4etkPpwbqF7fmc="; }; + patches = [ + # Makefile fix: INSTALL command + (fetchpatch { + url = "https://github.com/jimjag/epm/commit/dc5fcd6fa6e3a74baa28be060769a2b47f9368e7.patch"; + sha256 = "1gfyz493w0larin841xx3xalb7m3sp1r2vv1xki6rz35ybrnb96c"; + }) + # Makefile fix: man pages filenames and docdir target + (fetchpatch { + url = "https://github.com/jimjag/epm/commit/96bb48d4d7b463a09d5a25debfb51c88dcd7398c.patch"; + sha256 = "11aws0qac6vyy3w5z39vkjy4symmfzxfq9qgbgkk74fvx9vax42a"; + }) + ]; + buildInputs = [ rpm ]; - preInstall = '' - sed -i 's/README/README.md/' Makefile - ''; - meta = with lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = "https://www.msweet.org/projects.php?Z2"; - license = licenses.gpl2; + homepage = "https://jimjag.github.io/epm/"; + license = licenses.asl20; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix index f4225a901e..fef4d7d405 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-75L8fcmZbG7PbZrF4cScRQjqbuu5eTnLIaDGzgF57/0="; }; - vendorSha256 = "sha256-hxB+TZfwn16JXGRXZNB6HdDa62JQIQMaYpDzjOcLjFg="; + vendorSha256 = "sha256-YsSOw3G5ufxBn8Wu5J8md2Aaqhl0VJa7uB6ZzSPWo/A="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix index ae757f0d80..03044fe5c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }: stdenv.mkDerivation rec { - basename = "kconfig-frontends"; + pname = "kconfig-frontends"; version = "4.11.0.1"; - name = "${basename}-${version}"; src = fetchurl { sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; - url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; + url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz"; }; nativeBuildInputs = [ bison flex gperf pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.upstream b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.upstream deleted file mode 100644 index e69de1fe88..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://luarocks.org/releases/ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index dbcd49dcfb..504b79c500 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "macdylibbundler"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { owner = "auriamg"; repo = "macdylibbundler"; rev = version; - sha256 = "02w04qvaf9v8yw8bgncx5qj3jx08xdfa855isvq92q27hsb8m8hv"; + sha256 = "0j4ij48jf5izgymzxxaakf6vc50w9q0761yir6nfj1n6qlnrlidf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix index c357d47fe6..1ca9c2c511 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib }: +{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }: stdenv.mkDerivation rec { pname = "pahole"; @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ elfutils zlib libbpf ]; + buildInputs = [ elfutils zlib libbpf ] + ++ lib.optional stdenv.hostPlatform.isMusl [ + argp-standalone + musl-obstack + ]; # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ]; 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 740015dbe9..e628058675 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; + pname = "patchelf"; version = "2021-11-16"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix b/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix index 28894743dd..c05581f559 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix @@ -1,14 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -let baseName = "premake"; +stdenv.mkDerivation rec { + pname = "premake"; version = "3.7"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/sourceforge/premake/${baseName}-src-${version}.zip"; + url = "mirror://sourceforge/sourceforge/premake/premake-src-${version}.zip"; sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/premake/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/premake/default.nix index 192a774620..35c651f4a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/premake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/premake/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, unzip }: -let baseName = "premake"; +stdenv.mkDerivation rec { + pname = "premake"; version = "4.3"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${baseName}/${baseName}-${version}-src.zip"; + url = "mirror://sourceforge/premake/premake-${version}-src.zip"; sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index b39ab68f06..5a532d79f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PneUN59ddYvhVIXqZeDCh0tWADkRTU9Dj0HNf0V8s3g="; + sha256 = "sha256-IBAJePrqliriOkZRWLAU7hllpGr4DVs8rzD2yyOXZzM="; }; - vendorSha256 = "sha256-NI5pzKfUTjXqDukeQ1wFN/D0TBeXfDPGL69oEL7reCE="; + vendorSha256 = "sha256-6TBurIWct6k4X+0lZ9FYgTc+DQgTpEIS7HUr0V7n++I="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index a6f195c12a..b3fd7a54ec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg="; }; - vendorSha256 = "sha256-7LRq1lG3DT1WQ0+78EEeQqCCrx6n6qTCUcYUuKSfvVE="; + vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index 8d8f1e1627..b379df09a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -18,7 +18,7 @@ in with lib; stdenv.mkDerivation { - name = "texinfo-${optionalString interactive "interactive-"}${version}"; + pname = "texinfo${optionalString interactive "-interactive"}"; inherit version; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index 64d299db15..af10523e3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { - name = "${product}-${version}"; - product = "uncrustify"; + pname = "uncrustify"; version = "0.72.0"; src = fetchFromGitHub { - owner = product; - repo = product; - rev = name; + owner = "uncrustify"; + repo = "uncrustify"; + rev = "uncrustify-${version}"; sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix index 6c1a900999..e443ca7751 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }: +{ lib, stdenv, buildPackages, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }: stdenv.mkDerivation rec { pname = "universal-ctags"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ]; buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index a63822428b..6de56fb470 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G+mVZS3ZRuBd00xfBqrTvmHOykFk63nJlucxv01nr3k="; + sha256 = "sha256-L/io0kMYkFVSmOiH6sM/CoibE1rPRwDM0fFddw6kM+4="; }; buildInputs = [ zlib openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix index 36a1c7f755..1c3da92273 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml ]; + # build fails otherwise + enableParallelBuilding = false; + preBuild = '' mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index acf1730af1..97a769628f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -55,6 +55,9 @@ stdenv.mkDerivation rec { buildInputs = [ which ocaml ocamlbuild ]; + # build fails otherwise + enableParallelBuilding = false; + dontAddPrefix = true; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index c55aae7878..30962eeba3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-site-${version}.tbz"; - sha256 = "sha256-uOfMUH+5eLRfb9yDnysyAdLB5hHkqOlyyMjP2FIudEc="; + sha256 = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y"; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix index 497a8ce91c..e7abf32eae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix @@ -36,15 +36,21 @@ stdenv.mkDerivation rec { export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi } - createOcamlDestDir () { + exportOcamlDestDir () { export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" + } + createOcamlDestDir () { if test -n "''${createFindlibDestdir-}"; then mkdir -p $OCAMLFIND_DESTDIR fi } + # run for every buildInput addEnvHooks "$targetOffset" addOCamlPath - preConfigureHooks+=(createOcamlDestDir) + # run before installPhase, even without buildInputs, and not in nix-shell + preInstallHooks+=(createOcamlDestDir) + # run even in nix-shell, and even without buildInputs + addEnvHooks "$hostOffset" exportOcamlDestDir ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 3375e5ac5a..c67d05c150 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -7,7 +7,7 @@ buildDunePackage { inherit (js_of_ocaml-compiler) version src meta useDune2; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.02"; propagatedBuildInputs = [ ocamlbuild ]; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix index d47d8a5cc3..5834685218 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }: -let - version = "1.99.21"; -in -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocp-build-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-ocp-build"; + version = "1.99.21"; src = fetchFromGitHub { owner = "OCamlPro"; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh index 4e4291a556..46cbb06951 100755 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl +#!nix-shell -I nixpkgs=../../../../.. -i bash -p dotnet-sdk_6 jq xmlstarlet curl set -euo pipefail cat << EOL @@ -18,7 +18,7 @@ mapfile -t repos < <( done ) -msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ +dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ -p:RestoreNoCache=true -p:RestoreForce=true \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2 @@ -48,7 +48,7 @@ do sha256=$(nix-prefetch-url "$url" 2>/dev/null) cat << EOL { - name = "$package"; + pname = "$package"; version = "$version"; src = fetchurl { url = "$url"; 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 e2d3b236cd..7fd1fff89d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchFromGitHub , fetchurl -, mono6 -, msbuild , dotnetCorePackages , makeWrapper , unzip @@ -11,11 +9,10 @@ let - dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; deps = map (package: stdenv.mkDerivation (with package; { - pname = name; - inherit version src; + inherit pname version src; buildInputs = [ unzip ]; unpackPhase = '' @@ -41,7 +38,7 @@ let installPhase = '' runHook preInstall - package=$out/lib/dotnet/${name}/${version} + package=$out/lib/dotnet/${pname}/${version} mkdir -p $package cp -r . $package echo "{}" > $package/.nupkg.metadata @@ -68,21 +65,21 @@ let in stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.15"; + version = "1.38.0"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "070wqs667si3f78fy6w4rrfm8qncnabg0yckjhll0yv1pzbj9q42"; + sha256 = "00V+7Z1IoCSuSM0RClM81IslzCzC/FNYxHIKtnI9QDg="; }; - nativeBuildInputs = [ makeWrapper msbuild ]; + nativeBuildInputs = [ makeWrapper dotnet-sdk ]; buildPhase = '' runHook preBuild - HOME=$(pwd)/fake-home msbuild -r \ + HOME=$(pwd)/fake-home dotnet msbuild -r \ -p:Configuration=Release \ -p:RestoreConfigFile=${nuget-config} \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj @@ -92,18 +89,10 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r bin/Release/OmniSharp.Stdio.Driver/net472 $out/src - cp bin/Release/OmniSharp.Host/net472/SQLitePCLRaw* $out/src - mkdir $out/src/.msbuild - ln -s ${msbuild}/lib/mono/xbuild/* $out/src/.msbuild/ - rm $out/src/.msbuild/Current - mkdir $out/src/.msbuild/Current - ln -s ${msbuild}/lib/mono/xbuild/Current/* $out/src/.msbuild/Current/ - ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin - - makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ - --suffix PATH : ${dotnet-sdk}/bin \ - --add-flags "$out/src/OmniSharp.exe" + cp -r bin/Release/OmniSharp.Stdio.Driver/net6.0 $out/src + makeWrapper $out/src/OmniSharp $out/bin/omnisharp \ + --prefix DOTNET_ROOT : ${dotnet-sdk} \ + --suffix PATH : ${dotnet-sdk}/bin ''; meta = with lib; { 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 305246ce98..47af76fdd4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -1,22 +1,22 @@ { fetchurl }: [ { - name = "cake.scripting.abstractions"; - version = "0.6.4"; + pname = "cake.scripting.abstractions"; + version = "0.8.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg"; - sha256 = "14fcixlj2xazf6cb46gw8jgbsz89c6s8fnhvppxs8q12pygmkx0l"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.8.1/cake.scripting.abstractions.0.8.1.nupkg"; + sha256 = "0hrr7a3z1qddfm21pp21wr94q2f85w5kq1gavn5dylajiaqz505c"; }; } { - name = "cake.scripting.transport"; - version = "0.6.4"; + pname = "cake.scripting.transport"; + version = "0.8.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg"; - sha256 = "08cwj572mvmlagj5jry11j2l2fqc6yl4sw0szvql4ard9cx7j51n"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.8.1/cake.scripting.transport.0.8.1.nupkg"; + sha256 = "0pfpgyr62r74s9h4i3kdxb92d21x14pmvwa1bfk3v2s5qdb3fxj8"; }; } { - name = "dotnet.script.dependencymodel"; + pname = "dotnet.script.dependencymodel"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.1.0/dotnet.script.dependencymodel.1.1.0.nupkg"; @@ -24,7 +24,7 @@ }; } { - name = "dotnet.script.dependencymodel.nuget"; + pname = "dotnet.script.dependencymodel.nuget"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.1.0/dotnet.script.dependencymodel.nuget.1.1.0.nupkg"; @@ -32,7 +32,7 @@ }; } { - name = "humanizer.core"; + pname = "humanizer.core"; version = "2.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/humanizer.core/2.2.0/humanizer.core.2.2.0.nupkg"; @@ -40,7 +40,7 @@ }; } { - name = "icsharpcode.decompiler"; + pname = "icsharpcode.decompiler"; version = "7.1.0.6543"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.1.0.6543/icsharpcode.decompiler.7.1.0.6543.nupkg"; @@ -48,7 +48,7 @@ }; } { - name = "mcmaster.extensions.commandlineutils"; + pname = "mcmaster.extensions.commandlineutils"; version = "3.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/3.1.0/mcmaster.extensions.commandlineutils.3.1.0.nupkg"; @@ -56,7 +56,7 @@ }; } { - name = "mediatr"; + pname = "mediatr"; version = "8.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/mediatr/8.1.0/mediatr.8.1.0.nupkg"; @@ -64,47 +64,31 @@ }; } { - name = "messagepack"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-arm64"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepack/2.1.152/messagepack.2.1.152.nupkg"; - sha256 = "1ks1w6pn96zm8nhz3ff6qdrmf0abppglwaa6vw83kj3d2qw74sw1"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-arm64/6.0.0/microsoft.aspnetcore.app.runtime.win-arm64.6.0.0.nupkg"; + sha256 = "0k2011d3jbfblfm4qspwjyv5pg1xqac408vblshgmf4sz7hlyzb3"; }; } { - name = "messagepackanalyzer"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-x64"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepackanalyzer/2.1.152/messagepackanalyzer.2.1.152.nupkg"; - sha256 = "18iacmw5v3dp8lma9c0rh5jh8g1hkxnkq78kx7n00wkwxa58badx"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x64/6.0.0/microsoft.aspnetcore.app.runtime.win-x64.6.0.0.nupkg"; + sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }; } { - name = "messagepack.annotations"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-x86"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepack.annotations/2.1.152/messagepack.annotations.2.1.152.nupkg"; - sha256 = "196swfxaz7l26hiyfv1mix0y80amhlq48krc4g5p9894wx1az3c3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x86/6.0.0/microsoft.aspnetcore.app.runtime.win-x86.6.0.0.nupkg"; + sha256 = "0l64rphcqjwlbsxvfc8albzs494xyhl3bgw6ll68h3imhml193k5"; }; } { - name = "microsoft.aspnetcore.app.ref"; - version = "3.1.10"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; - sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; - }; - } - { - name = "microsoft.bcl.asyncinterfaces"; - version = "1.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; - }; - } - { - name = "microsoft.bcl.asyncinterfaces"; + pname = "microsoft.bcl.asyncinterfaces"; version = "1.1.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.1/microsoft.bcl.asyncinterfaces.1.1.1.nupkg"; @@ -112,7 +96,7 @@ }; } { - name = "microsoft.bcl.asyncinterfaces"; + pname = "microsoft.bcl.asyncinterfaces"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg"; @@ -120,23 +104,31 @@ }; } { - name = "microsoft.build"; - version = "16.10.0"; + pname = "microsoft.bcl.asyncinterfaces"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg"; - sha256 = "1ran3fp016wvj8d2ahv0cmwhm6hjjh64w82s7cy52s7qffrgjk46"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/6.0.0/microsoft.bcl.asyncinterfaces.6.0.0.nupkg"; + sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }; } { - name = "microsoft.build.framework"; - version = "16.10.0"; + pname = "microsoft.build"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg"; - sha256 = "17a8qxgq0jzxpjannhxkcg0941b64yb7z0yq75gz6hsq9ln3agja"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/17.0.0/microsoft.build.17.0.0.nupkg"; + sha256 = "166brl88y8xn9llc0hmn911k6y74gapmk1mrnfxbv73qj77jxsn1"; }; } { - name = "microsoft.build.locator"; + pname = "microsoft.build.framework"; + version = "17.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/17.0.0/microsoft.build.framework.17.0.0.nupkg"; + sha256 = "08c257dmfa6n41lq4fxb34khi8jbwlqfy1168x7h7zsbh3wss7yq"; + }; + } + { + pname = "microsoft.build.locator"; version = "1.4.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg"; @@ -144,15 +136,15 @@ }; } { - name = "microsoft.build.tasks.core"; - version = "16.10.0"; + pname = "microsoft.build.tasks.core"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg"; - sha256 = "0yc3p4bksxmbq1n8wfqgn6b6x9ccyzq229f0mn08z4jfima3cnxg"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/17.0.0/microsoft.build.tasks.core.17.0.0.nupkg"; + sha256 = "087mn3rz5plnj7abjqk2di5is35mmfgmdjf0kcdn7jld8rbhk5hx"; }; } { - name = "microsoft.build.tasks.git"; + pname = "microsoft.build.tasks.git"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.git/1.0.0/microsoft.build.tasks.git.1.0.0.nupkg"; @@ -160,15 +152,15 @@ }; } { - name = "microsoft.build.utilities.core"; - version = "16.10.0"; + pname = "microsoft.build.utilities.core"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg"; - sha256 = "1rh3gzrz8mmzilvs33cxngv0a805nb47s615rvj4xk5igm384w14"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/17.0.0/microsoft.build.utilities.core.17.0.0.nupkg"; + sha256 = "0b7kylnvdqs81nmxdw7alwij8b19wm00iqicb9gkiklxjfyd8xav"; }; } { - name = "microsoft.codeanalysis.analyzers"; + pname = "microsoft.codeanalysis.analyzers"; version = "3.3.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg"; @@ -176,7 +168,7 @@ }; } { - name = "microsoft.codeanalysis.analyzerutilities"; + pname = "microsoft.codeanalysis.analyzerutilities"; version = "3.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; @@ -184,87 +176,95 @@ }; } { - name = "microsoft.codeanalysis.common"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.common"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-4.21427.11/microsoft.codeanalysis.common.4.0.0-4.21427.11.nupkg"; - sha256 = "15q6a2z3ms2vyrfk4y7biniygy0brr3ddb8mn700zg4sl84vphcz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-6.21526.21/microsoft.codeanalysis.common.4.0.0-6.21526.21.nupkg"; + sha256 = "0sv5hxadf9pbclssc9kq2cnvfkrnb0f2f4gmqhp2cy4xkr9fjn92"; }; } { - name = "microsoft.codeanalysis.csharp"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0x3l774higkpbbk4f1naf57c039g8qvvdvb3963m7g54qn4zhvdh"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.4.0.0-6.21526.21.nupkg"; + sha256 = "0cgp6rjw0lj3hr19sg5xvb5g29amrnng6y23rzcv5knw7a6zavs7"; }; } { - name = "microsoft.codeanalysis.csharp.features"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp.features"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.features.4.0.0-4.21427.11.nupkg"; - sha256 = "0w0wrssv0ix4z9609a34k6a5kc4p85gy76p676fdg6hyf6pzd78m"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.features.4.0.0-6.21526.21.nupkg"; + sha256 = "1a8xhrc4g2xlhmangcj0hv9872fw3zv1bcq52b54vczm6aym39pj"; }; } { - name = "microsoft.codeanalysis.csharp.scripting"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp.scripting"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.scripting.4.0.0-4.21427.11.nupkg"; - sha256 = "0lmfbkxqp8p52wg2lsyxpavabk318s6ci02cxzgmxydc2pd9r70v"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.scripting.4.0.0-6.21526.21.nupkg"; + sha256 = "1mlf75v2nabfi9hwx9q2d14mcxlz3n8gdkczpyvvyfh3f72pl4x3"; }; } { - name = "microsoft.codeanalysis.csharp.workspaces"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp.workspaces"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.workspaces.4.0.0-4.21427.11.nupkg"; - sha256 = "0j5c9v4nfahvnasz895czk1cp46b2d98px1gdar2ik9c5630vxwi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-6.21526.21/microsoft.codeanalysis.csharp.workspaces.4.0.0-6.21526.21.nupkg"; + sha256 = "04r6crnqml1c8mabsfrjzxc6bq6ndc9wwqwy8zsal80gwa54yj3v"; }; } { - name = "microsoft.codeanalysis.externalaccess.omnisharp"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.externalaccess.omnisharp"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0qy8xiv1j8awmbbgy16b2y9rhymxhx8kcmfylhxi1ryqql4mrpg2"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-6.21526.21/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-6.21526.21.nupkg"; + sha256 = "1f7wp5829wz8nrafqwlr74p3xgw86591cl2d9dnhs8cp9p6y5ah9"; }; } { - name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0mp1gkfdrdjcryqdj76ilpmjh0w8z4h313djjplcawwk76369mnc"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-6.21526.21/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-6.21526.21.nupkg"; + sha256 = "1mc9h0svsqdrmr8bk1zgvjn1awc06mwhsp34q8grcb6n1w641hsp"; }; } { - name = "microsoft.codeanalysis.features"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.features"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-4.21427.11/microsoft.codeanalysis.features.4.0.0-4.21427.11.nupkg"; - sha256 = "03vclmmxch3jrjamr9lg899s9wsfxw9yf53p9yfwvcr8wml4cwpz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-6.21526.21/microsoft.codeanalysis.features.4.0.0-6.21526.21.nupkg"; + sha256 = "0bg93pzv89v0s74mn52ng4cz2ys2bk8z96b3ml06r9wa3piz08la"; }; } { - name = "microsoft.codeanalysis.scripting.common"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.scripting.common"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-4.21427.11/microsoft.codeanalysis.scripting.common.4.0.0-4.21427.11.nupkg"; - sha256 = "15fkbw651v9lliqdmg1k61dqzasrssahyhrhwg24m111rgh86fbn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-6.21526.21/microsoft.codeanalysis.scripting.common.4.0.0-6.21526.21.nupkg"; + sha256 = "0s5h10zj2qyfs0a09agdba06vc09pcq2wamr7pf8dx415vkjswyj"; }; } { - name = "microsoft.codeanalysis.workspaces.common"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.workspaces.common"; + version = "4.0.0-6.21526.21"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-4.21427.11/microsoft.codeanalysis.workspaces.common.4.0.0-4.21427.11.nupkg"; - sha256 = "0k4qjkkg4mllizialzm463ssm3faqcqjnw19kbcnrzm5cd72i7cy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-6.21526.21/microsoft.codeanalysis.workspaces.common.4.0.0-6.21526.21.nupkg"; + sha256 = "0kp2l72zpfydfqv5cm8wqvk86wpgh946j8sw9hvhm3xwzflchl7b"; }; } { - name = "microsoft.csharp"; + pname = "microsoft.csharp"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }; + } + { + pname = "microsoft.csharp"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; @@ -272,7 +272,7 @@ }; } { - name = "microsoft.diasymreader"; + pname = "microsoft.diasymreader"; version = "1.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.3.0/microsoft.diasymreader.1.3.0.nupkg"; @@ -280,7 +280,7 @@ }; } { - name = "microsoft.dotnet.platformabstractions"; + pname = "microsoft.dotnet.platformabstractions"; version = "3.1.6"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg"; @@ -288,23 +288,23 @@ }; } { - name = "microsoft.extensions.caching.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.caching.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg"; - sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/6.0.0/microsoft.extensions.caching.abstractions.6.0.0.nupkg"; + sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }; } { - name = "microsoft.extensions.caching.memory"; - version = "5.0.0"; + pname = "microsoft.extensions.caching.memory"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg"; - sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/6.0.0/microsoft.extensions.caching.memory.6.0.0.nupkg"; + sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; }; } { - name = "microsoft.extensions.configuration"; + pname = "microsoft.extensions.configuration"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.0.0/microsoft.extensions.configuration.2.0.0.nupkg"; @@ -312,15 +312,15 @@ }; } { - name = "microsoft.extensions.configuration"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg"; - sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/6.0.0/microsoft.extensions.configuration.6.0.0.nupkg"; + sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }; } { - name = "microsoft.extensions.configuration.abstractions"; + pname = "microsoft.extensions.configuration.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.0.0/microsoft.extensions.configuration.abstractions.2.0.0.nupkg"; @@ -328,15 +328,15 @@ }; } { - name = "microsoft.extensions.configuration.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg"; - sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/6.0.0/microsoft.extensions.configuration.abstractions.6.0.0.nupkg"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }; } { - name = "microsoft.extensions.configuration.binder"; + pname = "microsoft.extensions.configuration.binder"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.0.0/microsoft.extensions.configuration.binder.2.0.0.nupkg"; @@ -344,47 +344,47 @@ }; } { - name = "microsoft.extensions.configuration.binder"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.binder"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg"; - sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/6.0.0/microsoft.extensions.configuration.binder.6.0.0.nupkg"; + sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }; } { - name = "microsoft.extensions.configuration.commandline"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.commandline"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg"; - sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/6.0.0/microsoft.extensions.configuration.commandline.6.0.0.nupkg"; + sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }; } { - name = "microsoft.extensions.configuration.environmentvariables"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.environmentvariables"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg"; - sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/6.0.0/microsoft.extensions.configuration.environmentvariables.6.0.0.nupkg"; + sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }; } { - name = "microsoft.extensions.configuration.fileextensions"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.fileextensions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg"; - sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/6.0.0/microsoft.extensions.configuration.fileextensions.6.0.0.nupkg"; + sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }; } { - name = "microsoft.extensions.configuration.json"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.json"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg"; - sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/6.0.0/microsoft.extensions.configuration.json.6.0.0.nupkg"; + sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }; } { - name = "microsoft.extensions.dependencyinjection"; + pname = "microsoft.extensions.dependencyinjection"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/2.0.0/microsoft.extensions.dependencyinjection.2.0.0.nupkg"; @@ -392,15 +392,15 @@ }; } { - name = "microsoft.extensions.dependencyinjection"; - version = "5.0.0"; + pname = "microsoft.extensions.dependencyinjection"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg"; - sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/6.0.0/microsoft.extensions.dependencyinjection.6.0.0.nupkg"; + sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }; } { - name = "microsoft.extensions.dependencyinjection.abstractions"; + pname = "microsoft.extensions.dependencyinjection.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.0.0/microsoft.extensions.dependencyinjection.abstractions.2.0.0.nupkg"; @@ -408,47 +408,47 @@ }; } { - name = "microsoft.extensions.dependencyinjection.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.dependencyinjection.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg"; - sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/6.0.0/microsoft.extensions.dependencyinjection.abstractions.6.0.0.nupkg"; + sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }; } { - name = "microsoft.extensions.dependencymodel"; - version = "5.0.0"; + pname = "microsoft.extensions.dependencymodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg"; - sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/6.0.0/microsoft.extensions.dependencymodel.6.0.0.nupkg"; + sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }; } { - name = "microsoft.extensions.fileproviders.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.fileproviders.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg"; - sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/6.0.0/microsoft.extensions.fileproviders.abstractions.6.0.0.nupkg"; + sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }; } { - name = "microsoft.extensions.fileproviders.physical"; - version = "5.0.0"; + pname = "microsoft.extensions.fileproviders.physical"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg"; - sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/6.0.0/microsoft.extensions.fileproviders.physical.6.0.0.nupkg"; + sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }; } { - name = "microsoft.extensions.filesystemglobbing"; - version = "5.0.0"; + pname = "microsoft.extensions.filesystemglobbing"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg"; - sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/6.0.0/microsoft.extensions.filesystemglobbing.6.0.0.nupkg"; + sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }; } { - name = "microsoft.extensions.logging"; + pname = "microsoft.extensions.logging"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.0.0/microsoft.extensions.logging.2.0.0.nupkg"; @@ -456,15 +456,15 @@ }; } { - name = "microsoft.extensions.logging"; - version = "5.0.0"; + pname = "microsoft.extensions.logging"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg"; - sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/6.0.0/microsoft.extensions.logging.6.0.0.nupkg"; + sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }; } { - name = "microsoft.extensions.logging.abstractions"; + pname = "microsoft.extensions.logging.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.0.0/microsoft.extensions.logging.abstractions.2.0.0.nupkg"; @@ -472,7 +472,7 @@ }; } { - name = "microsoft.extensions.logging.abstractions"; + pname = "microsoft.extensions.logging.abstractions"; version = "2.1.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg"; @@ -480,31 +480,31 @@ }; } { - name = "microsoft.extensions.logging.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.logging.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg"; - sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/6.0.0/microsoft.extensions.logging.abstractions.6.0.0.nupkg"; + sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }; } { - name = "microsoft.extensions.logging.configuration"; - version = "5.0.0"; + pname = "microsoft.extensions.logging.configuration"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg"; - sha256 = "1kmjax24w0ph362jr64rr6f8pyn6ayq39k502q9yrgr7zgrv65pa"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/6.0.0/microsoft.extensions.logging.configuration.6.0.0.nupkg"; + sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }; } { - name = "microsoft.extensions.logging.console"; - version = "5.0.0"; + pname = "microsoft.extensions.logging.console"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg"; - sha256 = "162akclrhk5r62fza8yr30p5824inwmrpq2s510c3a64v76v9cqz"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/6.0.0/microsoft.extensions.logging.console.6.0.0.nupkg"; + sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }; } { - name = "microsoft.extensions.options"; + pname = "microsoft.extensions.options"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.0.0/microsoft.extensions.options.2.0.0.nupkg"; @@ -512,15 +512,15 @@ }; } { - name = "microsoft.extensions.options"; - version = "5.0.0"; + pname = "microsoft.extensions.options"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg"; - sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/6.0.0/microsoft.extensions.options.6.0.0.nupkg"; + sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }; } { - name = "microsoft.extensions.options.configurationextensions"; + pname = "microsoft.extensions.options.configurationextensions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/2.0.0/microsoft.extensions.options.configurationextensions.2.0.0.nupkg"; @@ -528,15 +528,15 @@ }; } { - name = "microsoft.extensions.options.configurationextensions"; - version = "5.0.0"; + pname = "microsoft.extensions.options.configurationextensions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg"; - sha256 = "1085yrfgc70am43v8i5rxh14kal3bhdd5q85vgny5qp7y1rw0xyw"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/6.0.0/microsoft.extensions.options.configurationextensions.6.0.0.nupkg"; + sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }; } { - name = "microsoft.extensions.primitives"; + pname = "microsoft.extensions.primitives"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.0.0/microsoft.extensions.primitives.2.0.0.nupkg"; @@ -544,23 +544,63 @@ }; } { - name = "microsoft.extensions.primitives"; - version = "5.0.0"; + pname = "microsoft.extensions.primitives"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg"; - sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/6.0.0/microsoft.extensions.primitives.6.0.0.nupkg"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }; } { - name = "microsoft.netcore.app.ref"; - version = "3.1.0"; + pname = "microsoft.netcore.app.host.win-arm64"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; - sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-arm64/6.0.0/microsoft.netcore.app.host.win-arm64.6.0.0.nupkg"; + sha256 = "1cbqpyha0ys7f6pm90mxmr0f070imhqfnn9kgvi3hqszbv9fv808"; }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.app.host.win-x64"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x64/6.0.0/microsoft.netcore.app.host.win-x64.6.0.0.nupkg"; + sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; + }; + } + { + pname = "microsoft.netcore.app.host.win-x86"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x86/6.0.0/microsoft.netcore.app.host.win-x86.6.0.0.nupkg"; + sha256 = "19fyd762mhgjw6zr65hms0gi32pg0iinsrzz88i00n75y6cmyg36"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-arm64"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-arm64/6.0.0/microsoft.netcore.app.runtime.win-arm64.6.0.0.nupkg"; + sha256 = "0jd3h6q09v4wfam9dbl6yfkjy6b7y1wn87gqv2gzf088q9hfc1mc"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-x64"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x64/6.0.0/microsoft.netcore.app.runtime.win-x64.6.0.0.nupkg"; + sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-x86"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x86/6.0.0/microsoft.netcore.app.runtime.win-x86.6.0.0.nupkg"; + sha256 = "0p0y3njb618l4ihbsh033jhd8yn1sp8gfhwn722my2166saisjg5"; + }; + } + { + pname = "microsoft.netcore.platforms"; version = "1.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; @@ -568,7 +608,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; @@ -576,7 +616,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.0.0/microsoft.netcore.platforms.2.0.0.nupkg"; @@ -584,7 +624,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; @@ -592,7 +632,15 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; + version = "3.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.0.0/microsoft.netcore.platforms.3.0.0.nupkg"; + sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; + }; + } + { + pname = "microsoft.netcore.platforms"; version = "3.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg"; @@ -600,7 +648,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; @@ -608,7 +656,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; @@ -616,7 +664,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies"; + pname = "microsoft.netframework.referenceassemblies"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; @@ -624,7 +672,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies.net472"; + pname = "microsoft.netframework.referenceassemblies.net472"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; @@ -632,7 +680,7 @@ }; } { - name = "microsoft.net.stringtools"; + pname = "microsoft.net.stringtools"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg"; @@ -640,7 +688,7 @@ }; } { - name = "microsoft.sourcelink.common"; + pname = "microsoft.sourcelink.common"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.common/1.0.0/microsoft.sourcelink.common.1.0.0.nupkg"; @@ -648,7 +696,7 @@ }; } { - name = "microsoft.sourcelink.github"; + pname = "microsoft.sourcelink.github"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.github/1.0.0/microsoft.sourcelink.github.1.0.0.nupkg"; @@ -656,31 +704,23 @@ }; } { - name = "microsoft.testplatform.objectmodel"; - version = "16.9.4"; + pname = "microsoft.testplatform.objectmodel"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg"; - sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.0.0/microsoft.testplatform.objectmodel.17.0.0.nupkg"; + sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }; } { - name = "microsoft.testplatform.translationlayer"; - version = "16.9.4"; + pname = "microsoft.testplatform.translationlayer"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg"; - sha256 = "0y5w2zflvq06jim2i6d49qi45ix0b8vlyf024w29n5g1lb570qf0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/17.0.0/microsoft.testplatform.translationlayer.17.0.0.nupkg"; + sha256 = "08c6d9aiicpj8hsjb77rz7d2vmw7ivkcc0l1vgdgxddzjhjpy0pi"; }; } { - name = "microsoft.visualstudio.debugger.contracts"; - version = "17.2.0-beta.21417.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21417.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21417.1.nupkg"; - sha256 = "14v8d0hp6p1jn4i6b12r6vx4cvxycpb37a0zh0amz0qkg4afr12d"; - }; - } - { - name = "microsoft.visualstudio.sdk.embedinteroptypes"; + pname = "microsoft.visualstudio.sdk.embedinteroptypes"; version = "15.0.12"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.sdk.embedinteroptypes/15.0.12/microsoft.visualstudio.sdk.embedinteroptypes.15.0.12.nupkg"; @@ -688,7 +728,7 @@ }; } { - name = "microsoft.visualstudio.setup.configuration.interop"; + pname = "microsoft.visualstudio.setup.configuration.interop"; version = "1.14.114"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.14.114/microsoft.visualstudio.setup.configuration.interop.1.14.114.nupkg"; @@ -696,7 +736,7 @@ }; } { - name = "microsoft.visualstudio.setup.configuration.interop"; + pname = "microsoft.visualstudio.setup.configuration.interop"; version = "1.16.30"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; @@ -704,7 +744,7 @@ }; } { - name = "microsoft.visualstudio.threading"; + pname = "microsoft.visualstudio.threading"; version = "16.7.56"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.7.56/microsoft.visualstudio.threading.16.7.56.nupkg"; @@ -712,7 +752,7 @@ }; } { - name = "microsoft.visualstudio.threading.analyzers"; + pname = "microsoft.visualstudio.threading.analyzers"; version = "16.7.56"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.7.56/microsoft.visualstudio.threading.analyzers.16.7.56.nupkg"; @@ -720,7 +760,7 @@ }; } { - name = "microsoft.visualstudio.validation"; + pname = "microsoft.visualstudio.validation"; version = "15.5.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg"; @@ -728,7 +768,7 @@ }; } { - name = "microsoft.win32.primitives"; + pname = "microsoft.win32.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; @@ -736,7 +776,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"; @@ -744,7 +784,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.6.0/microsoft.win32.registry.4.6.0.nupkg"; @@ -752,7 +792,7 @@ }; } { - name = "microsoft.win32.systemevents"; + pname = "microsoft.win32.systemevents"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/4.7.0/microsoft.win32.systemevents.4.7.0.nupkg"; @@ -760,7 +800,7 @@ }; } { - name = "nerdbank.streams"; + pname = "nerdbank.streams"; version = "2.6.81"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg"; @@ -768,7 +808,7 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; version = "1.6.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; @@ -776,7 +816,15 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg"; + sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + }; + } + { + pname = "netstandard.library"; version = "2.0.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; @@ -784,7 +832,7 @@ }; } { - name = "newtonsoft.json"; + pname = "newtonsoft.json"; version = "11.0.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg"; @@ -792,15 +840,15 @@ }; } { - name = "newtonsoft.json"; - version = "12.0.3"; + pname = "newtonsoft.json"; + version = "13.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.3/newtonsoft.json.12.0.3.nupkg"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg"; + sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }; } { - name = "newtonsoft.json"; + pname = "newtonsoft.json"; version = "9.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; @@ -808,15 +856,7 @@ }; } { - name = "nuget.common"; - version = "5.10.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.10.0/nuget.common.5.10.0.nupkg"; - sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx"; - }; - } - { - name = "nuget.common"; + pname = "nuget.common"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.2.0/nuget.common.5.2.0.nupkg"; @@ -824,15 +864,15 @@ }; } { - name = "nuget.configuration"; - version = "5.10.0"; + pname = "nuget.common"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.10.0/nuget.configuration.5.10.0.nupkg"; - sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.common/6.0.0/nuget.common.6.0.0.nupkg"; + sha256 = "0vbvmx2zzg54fv6617afi3z49cala70qj7jfxqnldjbc1z2c4b7r"; }; } { - name = "nuget.configuration"; + pname = "nuget.configuration"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.2.0/nuget.configuration.5.2.0.nupkg"; @@ -840,15 +880,15 @@ }; } { - name = "nuget.dependencyresolver.core"; - version = "5.10.0"; + pname = "nuget.configuration"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.10.0/nuget.dependencyresolver.core.5.10.0.nupkg"; - sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/6.0.0/nuget.configuration.6.0.0.nupkg"; + sha256 = "1qnrahn4rbb55ra4zg9c947kbm9wdiv344f12c3b4c5i7bfmivx3"; }; } { - name = "nuget.dependencyresolver.core"; + pname = "nuget.dependencyresolver.core"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.2.0/nuget.dependencyresolver.core.5.2.0.nupkg"; @@ -856,7 +896,15 @@ }; } { - name = "nuget.frameworks"; + pname = "nuget.dependencyresolver.core"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/6.0.0/nuget.dependencyresolver.core.6.0.0.nupkg"; + sha256 = "04w7wbfsb647apqrrzx3gj2jjlg09wdzmxj62bx43ngr34i4q83n"; + }; + } + { + pname = "nuget.frameworks"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.0.0/nuget.frameworks.5.0.0.nupkg"; @@ -864,15 +912,7 @@ }; } { - name = "nuget.frameworks"; - version = "5.10.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.10.0/nuget.frameworks.5.10.0.nupkg"; - sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2"; - }; - } - { - name = "nuget.frameworks"; + pname = "nuget.frameworks"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.2.0/nuget.frameworks.5.2.0.nupkg"; @@ -880,15 +920,15 @@ }; } { - name = "nuget.librarymodel"; - version = "5.10.0"; + pname = "nuget.frameworks"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.10.0/nuget.librarymodel.5.10.0.nupkg"; - sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.0.0/nuget.frameworks.6.0.0.nupkg"; + sha256 = "11p6mhh36s3vmnylfzw125fqivjk1xj75bvcxdav8n4sbk7d3gqs"; }; } { - name = "nuget.librarymodel"; + pname = "nuget.librarymodel"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.2.0/nuget.librarymodel.5.2.0.nupkg"; @@ -896,15 +936,15 @@ }; } { - name = "nuget.packaging"; - version = "5.10.0"; + pname = "nuget.librarymodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.10.0/nuget.packaging.5.10.0.nupkg"; - sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/6.0.0/nuget.librarymodel.6.0.0.nupkg"; + sha256 = "0pg4m6v2j5vvld7s57fvx28ix7wlah6dakhi55qpavmkmnzp6g3f"; }; } { - name = "nuget.packaging"; + pname = "nuget.packaging"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.2.0/nuget.packaging.5.2.0.nupkg"; @@ -912,23 +952,23 @@ }; } { - name = "nuget.packaging.core"; - version = "5.10.0"; + pname = "nuget.packaging"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.10.0/nuget.packaging.core.5.10.0.nupkg"; - sha256 = "1frxwwl583qwsj84rjgvd7il6icgxzxxps6yng75qx8ppf99dsr6"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/6.0.0/nuget.packaging.6.0.0.nupkg"; + sha256 = "0vlcda74h6gq3q569kbbz4n3d26vihxaldvvi2md3phqf8jpvhjb"; }; } { - name = "nuget.projectmodel"; - version = "5.10.0"; + pname = "nuget.packaging.core"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.10.0/nuget.projectmodel.5.10.0.nupkg"; - sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/6.0.0/nuget.packaging.core.6.0.0.nupkg"; + sha256 = "1kk7rf7cavdicxb4bmwcgwykr53nrk38m6r49hvs85jhhvg9jmyf"; }; } { - name = "nuget.projectmodel"; + pname = "nuget.projectmodel"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.2.0/nuget.projectmodel.5.2.0.nupkg"; @@ -936,15 +976,15 @@ }; } { - name = "nuget.protocol"; - version = "5.10.0"; + pname = "nuget.projectmodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.10.0/nuget.protocol.5.10.0.nupkg"; - sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/6.0.0/nuget.projectmodel.6.0.0.nupkg"; + sha256 = "1fldxlw88jqgy0cfgfa7drqpxf909kfchcvk4nxj7vyhza2q715y"; }; } { - name = "nuget.protocol"; + pname = "nuget.protocol"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.2.0/nuget.protocol.5.2.0.nupkg"; @@ -952,15 +992,15 @@ }; } { - name = "nuget.versioning"; - version = "5.10.0"; + pname = "nuget.protocol"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.10.0/nuget.versioning.5.10.0.nupkg"; - sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/6.0.0/nuget.protocol.6.0.0.nupkg"; + sha256 = "16rs9hfra4bly8jp0lxsg0gbpi9wvxh7nrxrdkbjm01vb0azw823"; }; } { - name = "nuget.versioning"; + pname = "nuget.versioning"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.2.0/nuget.versioning.5.2.0.nupkg"; @@ -968,7 +1008,15 @@ }; } { - name = "omnisharp.extensions.jsonrpc"; + pname = "nuget.versioning"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/6.0.0/nuget.versioning.6.0.0.nupkg"; + sha256 = "0xxrz0p9vd2ax8hcrdxcp3h6gv8qcy6mngp49dvg1ijjjr1jb85k"; + }; + } + { + pname = "omnisharp.extensions.jsonrpc"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc/0.19.0/omnisharp.extensions.jsonrpc.0.19.0.nupkg"; @@ -976,7 +1024,7 @@ }; } { - name = "omnisharp.extensions.jsonrpc.generators"; + pname = "omnisharp.extensions.jsonrpc.generators"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.generators/0.19.0/omnisharp.extensions.jsonrpc.generators.0.19.0.nupkg"; @@ -984,7 +1032,7 @@ }; } { - name = "omnisharp.extensions.languageprotocol"; + pname = "omnisharp.extensions.languageprotocol"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol/0.19.0/omnisharp.extensions.languageprotocol.0.19.0.nupkg"; @@ -992,7 +1040,7 @@ }; } { - name = "omnisharp.extensions.languageserver"; + pname = "omnisharp.extensions.languageserver"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver/0.19.0/omnisharp.extensions.languageserver.0.19.0.nupkg"; @@ -1000,7 +1048,7 @@ }; } { - name = "omnisharp.extensions.languageserver.shared"; + pname = "omnisharp.extensions.languageserver.shared"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver.shared/0.19.0/omnisharp.extensions.languageserver.shared.0.19.0.nupkg"; @@ -1008,7 +1056,143 @@ }; } { - name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.any.system.collections"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }; + } + { + pname = "runtime.any.system.diagnostics.tools"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }; + } + { + pname = "runtime.any.system.diagnostics.tracing"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }; + } + { + pname = "runtime.any.system.globalization"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }; + } + { + pname = "runtime.any.system.globalization.calendars"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }; + } + { + pname = "runtime.any.system.io"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }; + } + { + pname = "runtime.any.system.reflection"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }; + } + { + pname = "runtime.any.system.reflection.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }; + } + { + pname = "runtime.any.system.reflection.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }; + } + { + pname = "runtime.any.system.resources.resourcemanager"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }; + } + { + pname = "runtime.any.system.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }; + } + { + pname = "runtime.any.system.runtime.handles"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }; + } + { + pname = "runtime.any.system.runtime.interopservices"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }; + } + { + pname = "runtime.any.system.text.encoding"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }; + } + { + pname = "runtime.any.system.text.encoding.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }; + } + { + pname = "runtime.any.system.threading.tasks"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }; + } + { + pname = "runtime.any.system.threading.timer"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }; + } + { + pname = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1016,7 +1200,7 @@ }; } { - name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1024,7 +1208,7 @@ }; } { - name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1032,7 +1216,7 @@ }; } { - name = "runtime.native.system"; + pname = "runtime.native.system"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; @@ -1040,7 +1224,7 @@ }; } { - name = "runtime.native.system.io.compression"; + pname = "runtime.native.system.io.compression"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; @@ -1048,7 +1232,7 @@ }; } { - name = "runtime.native.system.net.http"; + pname = "runtime.native.system.net.http"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"; @@ -1056,7 +1240,7 @@ }; } { - name = "runtime.native.system.security.cryptography.apple"; + pname = "runtime.native.system.security.cryptography.apple"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; @@ -1064,7 +1248,7 @@ }; } { - name = "runtime.native.system.security.cryptography.openssl"; + pname = "runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1072,7 +1256,7 @@ }; } { - name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1080,7 +1264,7 @@ }; } { - name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1088,7 +1272,7 @@ }; } { - name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; + pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; @@ -1096,7 +1280,7 @@ }; } { - name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1104,7 +1288,7 @@ }; } { - name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1112,7 +1296,7 @@ }; } { - name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1120,7 +1304,7 @@ }; } { - name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1128,7 +1312,7 @@ }; } { - name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1136,7 +1320,95 @@ }; } { - name = "sqlitepclraw.bundle_green"; + pname = "runtime.win10-arm64.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win10-arm64.runtime.native.system.io.compression/4.3.0/runtime.win10-arm64.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1jrmrmqscn8cn2n3piar8n85gfsra7vlai23w9ldzprh0y4dw3v1"; + }; + } + { + pname = "runtime.win7.system.private.uri"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7.system.private.uri/4.3.0/runtime.win7.system.private.uri.4.3.0.nupkg"; + sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m"; + }; + } + { + pname = "runtime.win7-x64.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x64.runtime.native.system.io.compression/4.3.0/runtime.win7-x64.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5"; + }; + } + { + pname = "runtime.win7-x86.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x86.runtime.native.system.io.compression/4.3.0/runtime.win7-x86.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "08ppln62lcq3bz2kyxqyvh98payd5a7w8fzmb53mznkcfv32n55b"; + }; + } + { + pname = "runtime.win.microsoft.win32.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.microsoft.win32.primitives/4.3.0/runtime.win.microsoft.win32.primitives.4.3.0.nupkg"; + sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; + }; + } + { + pname = "runtime.win.system.console"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.console/4.3.0/runtime.win.system.console.4.3.0.nupkg"; + sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; + }; + } + { + pname = "runtime.win.system.diagnostics.debug"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.diagnostics.debug/4.3.0/runtime.win.system.diagnostics.debug.4.3.0.nupkg"; + sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; + }; + } + { + pname = "runtime.win.system.io.filesystem"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.io.filesystem/4.3.0/runtime.win.system.io.filesystem.4.3.0.nupkg"; + sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; + }; + } + { + pname = "runtime.win.system.net.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.primitives/4.3.0/runtime.win.system.net.primitives.4.3.0.nupkg"; + sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; + }; + } + { + pname = "runtime.win.system.net.sockets"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.sockets/4.3.0/runtime.win.system.net.sockets.4.3.0.nupkg"; + sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; + }; + } + { + pname = "runtime.win.system.runtime.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.runtime.extensions/4.3.0/runtime.win.system.runtime.extensions.4.3.0.nupkg"; + sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; + }; + } + { + pname = "sqlitepclraw.bundle_green"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.bundle_green/2.0.4/sqlitepclraw.bundle_green.2.0.4.nupkg"; @@ -1144,7 +1416,7 @@ }; } { - name = "sqlitepclraw.core"; + pname = "sqlitepclraw.core"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.0.4/sqlitepclraw.core.2.0.4.nupkg"; @@ -1152,7 +1424,7 @@ }; } { - name = "sqlitepclraw.lib.e_sqlite3"; + pname = "sqlitepclraw.lib.e_sqlite3"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.lib.e_sqlite3/2.0.4/sqlitepclraw.lib.e_sqlite3.2.0.4.nupkg"; @@ -1160,7 +1432,7 @@ }; } { - name = "sqlitepclraw.provider.dynamic_cdecl"; + pname = "sqlitepclraw.provider.dynamic_cdecl"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.dynamic_cdecl/2.0.4/sqlitepclraw.provider.dynamic_cdecl.2.0.4.nupkg"; @@ -1168,7 +1440,7 @@ }; } { - name = "sqlitepclraw.provider.e_sqlite3"; + pname = "sqlitepclraw.provider.e_sqlite3"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.e_sqlite3/2.0.4/sqlitepclraw.provider.e_sqlite3.2.0.4.nupkg"; @@ -1176,7 +1448,7 @@ }; } { - name = "system.appcontext"; + pname = "system.appcontext"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; @@ -1184,7 +1456,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; @@ -1192,7 +1464,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; @@ -1200,15 +1472,7 @@ }; } { - name = "system.buffers"; - version = "4.5.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }; - } - { - name = "system.buffers"; + pname = "system.buffers"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; @@ -1216,7 +1480,7 @@ }; } { - name = "system.codedom"; + pname = "system.codedom"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; @@ -1224,7 +1488,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg"; @@ -1232,7 +1496,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg"; @@ -1240,7 +1504,7 @@ }; } { - name = "system.collections.concurrent"; + pname = "system.collections.concurrent"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; @@ -1248,7 +1512,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; @@ -1256,7 +1520,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.7.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.1/system.collections.immutable.1.7.1.nupkg"; @@ -1264,7 +1528,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; @@ -1272,7 +1536,15 @@ }; } { - name = "system.componentmodel.composition"; + pname = "system.componentmodel.annotations"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/5.0.0/system.componentmodel.annotations.5.0.0.nupkg"; + sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; + }; + } + { + pname = "system.componentmodel.composition"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.composition/4.5.0/system.componentmodel.composition.4.5.0.nupkg"; @@ -1280,7 +1552,7 @@ }; } { - name = "system.composition"; + pname = "system.composition"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition/1.0.31/system.composition.1.0.31.nupkg"; @@ -1288,7 +1560,7 @@ }; } { - name = "system.composition.attributedmodel"; + pname = "system.composition.attributedmodel"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/1.0.31/system.composition.attributedmodel.1.0.31.nupkg"; @@ -1296,7 +1568,7 @@ }; } { - name = "system.composition.convention"; + pname = "system.composition.convention"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.convention/1.0.31/system.composition.convention.1.0.31.nupkg"; @@ -1304,7 +1576,7 @@ }; } { - name = "system.composition.hosting"; + pname = "system.composition.hosting"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.hosting/1.0.31/system.composition.hosting.1.0.31.nupkg"; @@ -1312,7 +1584,7 @@ }; } { - name = "system.composition.runtime"; + pname = "system.composition.runtime"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.runtime/1.0.31/system.composition.runtime.1.0.31.nupkg"; @@ -1320,7 +1592,7 @@ }; } { - name = "system.composition.typedparts"; + pname = "system.composition.typedparts"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/1.0.31/system.composition.typedparts.1.0.31.nupkg"; @@ -1328,7 +1600,7 @@ }; } { - name = "system.configuration.configurationmanager"; + pname = "system.configuration.configurationmanager"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; @@ -1336,7 +1608,7 @@ }; } { - name = "system.console"; + pname = "system.console"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg"; @@ -1344,7 +1616,15 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }; + } + { + pname = "system.diagnostics.debug"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; @@ -1352,7 +1632,7 @@ }; } { - name = "system.diagnostics.diagnosticsource"; + pname = "system.diagnostics.diagnosticsource"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; @@ -1360,15 +1640,31 @@ }; } { - name = "system.diagnostics.diagnosticsource"; - version = "5.0.0"; + pname = "system.diagnostics.diagnosticsource"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg"; - sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/6.0.0/system.diagnostics.diagnosticsource.6.0.0.nupkg"; + sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }; } { - name = "system.diagnostics.tools"; + pname = "system.diagnostics.process"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }; + } + { + pname = "system.diagnostics.tools"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }; + } + { + pname = "system.diagnostics.tools"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; @@ -1376,7 +1672,7 @@ }; } { - name = "system.diagnostics.tracing"; + pname = "system.diagnostics.tracing"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; @@ -1384,7 +1680,7 @@ }; } { - name = "system.drawing.common"; + pname = "system.drawing.common"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.drawing.common/4.7.0/system.drawing.common.4.7.0.nupkg"; @@ -1392,7 +1688,15 @@ }; } { - name = "system.formats.asn1"; + pname = "system.dynamic.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }; + } + { + pname = "system.formats.asn1"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.formats.asn1/5.0.0/system.formats.asn1.5.0.0.nupkg"; @@ -1400,7 +1704,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; @@ -1408,7 +1712,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; @@ -1416,7 +1720,7 @@ }; } { - name = "system.globalization.calendars"; + pname = "system.globalization.calendars"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; @@ -1424,7 +1728,7 @@ }; } { - name = "system.globalization.extensions"; + pname = "system.globalization.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; @@ -1432,7 +1736,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg"; @@ -1440,7 +1744,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg"; @@ -1448,7 +1752,7 @@ }; } { - name = "system.io.compression"; + pname = "system.io.compression"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; @@ -1456,7 +1760,7 @@ }; } { - name = "system.io.compression.zipfile"; + pname = "system.io.compression.zipfile"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; @@ -1464,7 +1768,15 @@ }; } { - name = "system.io.filesystem"; + pname = "system.io.filesystem"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }; + } + { + pname = "system.io.filesystem"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; @@ -1472,7 +1784,15 @@ }; } { - name = "system.io.filesystem.primitives"; + pname = "system.io.filesystem.primitives"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }; + } + { + pname = "system.io.filesystem.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; @@ -1480,7 +1800,7 @@ }; } { - name = "system.io.pipelines"; + pname = "system.io.pipelines"; version = "4.7.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/4.7.3/system.io.pipelines.4.7.3.nupkg"; @@ -1488,7 +1808,7 @@ }; } { - name = "system.io.pipelines"; + pname = "system.io.pipelines"; version = "5.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg"; @@ -1496,7 +1816,15 @@ }; } { - name = "system.linq"; + pname = "system.linq"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }; + } + { + pname = "system.linq"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg"; @@ -1504,7 +1832,15 @@ }; } { - name = "system.linq.expressions"; + pname = "system.linq.expressions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }; + } + { + pname = "system.linq.expressions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; @@ -1512,7 +1848,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg"; @@ -1520,7 +1856,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg"; @@ -1528,7 +1864,7 @@ }; } { - name = "system.net.http"; + pname = "system.net.http"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; @@ -1536,7 +1872,23 @@ }; } { - name = "system.net.primitives"; + pname = "system.net.http"; + version = "4.3.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.4/system.net.http.4.3.4.nupkg"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }; + } + { + pname = "system.net.nameresolution"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }; + } + { + pname = "system.net.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; @@ -1544,7 +1896,7 @@ }; } { - name = "system.net.sockets"; + pname = "system.net.sockets"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; @@ -1552,7 +1904,7 @@ }; } { - name = "system.net.websockets"; + pname = "system.net.websockets"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg"; @@ -1560,7 +1912,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; @@ -1568,7 +1920,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; @@ -1576,7 +1928,15 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; + version = "4.0.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }; + } + { + pname = "system.objectmodel"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; @@ -1584,7 +1944,15 @@ }; } { - name = "system.reactive"; + pname = "system.private.uri"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }; + } + { + pname = "system.reactive"; version = "4.4.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg"; @@ -1592,7 +1960,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; @@ -1600,7 +1968,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; @@ -1608,7 +1976,7 @@ }; } { - name = "system.reflection.dispatchproxy"; + pname = "system.reflection.dispatchproxy"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.dispatchproxy/4.5.1/system.reflection.dispatchproxy.4.5.1.nupkg"; @@ -1616,7 +1984,15 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }; + } + { + pname = "system.reflection.emit"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; @@ -1624,15 +2000,15 @@ }; } { - name = "system.reflection.emit"; - version = "4.6.0"; + pname = "system.reflection.emit.ilgeneration"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.6.0/system.reflection.emit.4.6.0.nupkg"; - sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; @@ -1640,15 +2016,15 @@ }; } { - name = "system.reflection.emit.ilgeneration"; - version = "4.6.0"; + pname = "system.reflection.emit.lightweight"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.6.0/system.reflection.emit.ilgeneration.4.6.0.nupkg"; - sha256 = "0jxc26k5q0rwrldi30bfbrfw4jh3kvribzwc8ryzr24kmhr3vv96"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; @@ -1656,15 +2032,15 @@ }; } { - name = "system.reflection.emit.lightweight"; - version = "4.6.0"; + pname = "system.reflection.extensions"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg"; - sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; @@ -1672,7 +2048,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "1.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; @@ -1680,7 +2056,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; @@ -1688,7 +2064,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; @@ -1696,7 +2072,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; @@ -1704,7 +2080,15 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }; + } + { + pname = "system.reflection.typeextensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; @@ -1712,7 +2096,7 @@ }; } { - name = "system.resources.extensions"; + pname = "system.resources.extensions"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; @@ -1720,7 +2104,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; @@ -1728,7 +2112,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; @@ -1736,7 +2120,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; @@ -1744,7 +2128,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; @@ -1752,7 +2136,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.4.0/system.runtime.compilerservices.unsafe.4.4.0.nupkg"; @@ -1760,7 +2144,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.5.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg"; @@ -1768,7 +2152,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg"; @@ -1776,15 +2160,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; - version = "4.7.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg"; - sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; - }; - } - { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.7.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; @@ -1792,7 +2168,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; @@ -1800,7 +2176,15 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.compilerservices.unsafe"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; + sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; + }; + } + { + pname = "system.runtime.extensions"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; @@ -1808,7 +2192,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; @@ -1816,7 +2200,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; @@ -1824,7 +2208,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; @@ -1832,7 +2216,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; @@ -1840,7 +2224,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; @@ -1848,7 +2232,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; @@ -1856,7 +2240,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; @@ -1864,7 +2248,7 @@ }; } { - name = "system.runtime.interopservices.windowsruntime"; + pname = "system.runtime.interopservices.windowsruntime"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.windowsruntime/4.3.0/system.runtime.interopservices.windowsruntime.4.3.0.nupkg"; @@ -1872,7 +2256,7 @@ }; } { - name = "system.runtime.numerics"; + pname = "system.runtime.numerics"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; @@ -1880,7 +2264,15 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.runtime.serialization.primitives"; + version = "4.1.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }; + } + { + pname = "system.security.accesscontrol"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; @@ -1888,7 +2280,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.6.0/system.security.accesscontrol.4.6.0.nupkg"; @@ -1896,7 +2288,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; @@ -1904,7 +2296,15 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.claims"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }; + } + { + pname = "system.security.cryptography.algorithms"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; @@ -1912,7 +2312,7 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.cryptography.algorithms"; version = "4.3.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.1/system.security.cryptography.algorithms.4.3.1.nupkg"; @@ -1920,7 +2320,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"; @@ -1928,7 +2328,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg"; @@ -1936,7 +2336,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/5.0.0/system.security.cryptography.cng.5.0.0.nupkg"; @@ -1944,7 +2344,7 @@ }; } { - name = "system.security.cryptography.csp"; + pname = "system.security.cryptography.csp"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"; @@ -1952,7 +2352,7 @@ }; } { - name = "system.security.cryptography.encoding"; + pname = "system.security.cryptography.encoding"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; @@ -1960,7 +2360,7 @@ }; } { - name = "system.security.cryptography.openssl"; + pname = "system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1968,7 +2368,7 @@ }; } { - name = "system.security.cryptography.pkcs"; + pname = "system.security.cryptography.pkcs"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg"; @@ -1976,7 +2376,7 @@ }; } { - name = "system.security.cryptography.pkcs"; + pname = "system.security.cryptography.pkcs"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/5.0.0/system.security.cryptography.pkcs.5.0.0.nupkg"; @@ -1984,7 +2384,7 @@ }; } { - name = "system.security.cryptography.primitives"; + pname = "system.security.cryptography.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; @@ -1992,7 +2392,15 @@ }; } { - name = "system.security.cryptography.protecteddata"; + pname = "system.security.cryptography.protecteddata"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.3.0/system.security.cryptography.protecteddata.4.3.0.nupkg"; + sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; + }; + } + { + pname = "system.security.cryptography.protecteddata"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg"; @@ -2000,7 +2408,7 @@ }; } { - name = "system.security.cryptography.protecteddata"; + pname = "system.security.cryptography.protecteddata"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg"; @@ -2008,7 +2416,7 @@ }; } { - name = "system.security.cryptography.x509certificates"; + pname = "system.security.cryptography.x509certificates"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; @@ -2016,7 +2424,7 @@ }; } { - name = "system.security.cryptography.xml"; + pname = "system.security.cryptography.xml"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg"; @@ -2024,7 +2432,7 @@ }; } { - name = "system.security.permissions"; + pname = "system.security.permissions"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.5.0/system.security.permissions.4.5.0.nupkg"; @@ -2032,7 +2440,7 @@ }; } { - name = "system.security.permissions"; + pname = "system.security.permissions"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; @@ -2040,7 +2448,23 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }; + } + { + pname = "system.security.principal.windows"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }; + } + { + pname = "system.security.principal.windows"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; @@ -2048,7 +2472,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.6.0/system.security.principal.windows.4.6.0.nupkg"; @@ -2056,7 +2480,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; @@ -2064,7 +2488,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; @@ -2072,7 +2496,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; @@ -2080,7 +2504,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; @@ -2088,7 +2512,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; @@ -2096,7 +2520,15 @@ }; } { - name = "system.text.encoding.extensions"; + pname = "system.text.encoding.extensions"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }; + } + { + pname = "system.text.encoding.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; @@ -2104,39 +2536,47 @@ }; } { - name = "system.text.encodings.web"; - version = "4.7.0"; + pname = "system.text.encodings.web"; + version = "5.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; - sha256 = "0sd3bihfar5rwm6nib4lhyys306nkm02qvk6p6sgzmnlfmma2wn3"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.1/system.text.encodings.web.5.0.1.nupkg"; + sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }; } { - name = "system.text.encodings.web"; - version = "5.0.0"; + pname = "system.text.encodings.web"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg"; - sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/6.0.0/system.text.encodings.web.6.0.0.nupkg"; + sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }; } { - name = "system.text.json"; - version = "4.7.0"; + pname = "system.text.json"; + version = "5.0.2"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; - sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.2/system.text.json.5.0.2.nupkg"; + sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }; } { - name = "system.text.json"; - version = "5.0.0"; + pname = "system.text.json"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg"; - sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/6.0.0/system.text.json.6.0.0.nupkg"; + sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }; } { - name = "system.text.regularexpressions"; + pname = "system.text.regularexpressions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }; + } + { + pname = "system.text.regularexpressions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; @@ -2144,7 +2584,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg"; @@ -2152,7 +2592,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg"; @@ -2160,7 +2600,15 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.overlapped"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; + sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; + }; + } + { + pname = "system.threading.tasks"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; @@ -2168,7 +2616,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; @@ -2176,7 +2624,7 @@ }; } { - name = "system.threading.tasks.dataflow"; + pname = "system.threading.tasks.dataflow"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/5.0.0/system.threading.tasks.dataflow.5.0.0.nupkg"; @@ -2184,7 +2632,15 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; + version = "4.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }; + } + { + pname = "system.threading.tasks.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; @@ -2192,15 +2648,7 @@ }; } { - name = "system.threading.tasks.extensions"; - version = "4.5.2"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; - sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; - }; - } - { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.3/system.threading.tasks.extensions.4.5.3.nupkg"; @@ -2208,7 +2656,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; @@ -2216,7 +2664,23 @@ }; } { - name = "system.threading.timer"; + pname = "system.threading.thread"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }; + } + { + pname = "system.threading.threadpool"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }; + } + { + pname = "system.threading.timer"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; @@ -2224,7 +2688,7 @@ }; } { - name = "system.valuetuple"; + pname = "system.valuetuple"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; @@ -2232,7 +2696,7 @@ }; } { - name = "system.windows.extensions"; + pname = "system.windows.extensions"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.windows.extensions/4.7.0/system.windows.extensions.4.7.0.nupkg"; @@ -2240,7 +2704,15 @@ }; } { - name = "system.xml.readerwriter"; + pname = "system.xml.readerwriter"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }; + } + { + pname = "system.xml.readerwriter"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; @@ -2248,7 +2720,15 @@ }; } { - name = "system.xml.xdocument"; + pname = "system.xml.xdocument"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }; + } + { + pname = "system.xml.xdocument"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index e7d5c30b0a..0b3b15d85b 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.7.9"; + version = "1.7.10"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-e2G4kxcizE2lfdryS4S04OwWxseyUqGS0SAaBdiXax0="; + sha256 = "sha256-KkdkLos55n+IE9oIZPADIcSgrE6kn0rDWzEkwoYfoFw="; }; - vendorSha256 = "sha256-5YcDaGbvw6xo5J8mtJ3CUS8JNCqKUD7kdUyfYIkQ6aE="; + vendorSha256 = "sha256-oSIwp8t+US8yNziuq0BR8BsVR1/e0jkxE4QuiqyheQQ="; subPackages = [ "." ]; @@ -35,6 +35,5 @@ buildGoModule rec { maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix index c3b09b71d1..41ec653a40 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix @@ -2,18 +2,19 @@ , stdenv , fetchFromGitHub , autoreconfHook +, nix-update-script , python3 }: stdenv.mkDerivation rec { pname = "re2c"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "0snfxk1cf2f4dy4hcxd1fx1grav3di0qjgqqn97k85zsf9f6ys78"; + sha256 = "sha256-ovwmltu97fzNQT0oZHefrAo4yV9HV1NwcY4PTSM5Bro="; }; nativeBuildInputs = [ @@ -28,6 +29,12 @@ stdenv.mkDerivation rec { patchShebangs run_tests.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Tool for writing very fast and very flexible scanners"; homepage = "https://re2c.org"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index e81e5e48bd..dfed3c91bc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -58,7 +58,7 @@ let let change = name: grammar: callPackage ./grammar.nix { } { - language = name; + language = if grammar ? language then grammar.language else name; inherit version; source = fetchGrammar grammar; location = if grammar ? location then grammar.location else null; @@ -67,6 +67,7 @@ let grammars = grammars' // { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } // { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // + { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } // { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index a001573b48..eb2275d272 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -54,7 +54,7 @@ tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; - tree-sitter-org = lib.importJSON ./tree-sitter-org.json; + tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json; tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 61e0ee43fc..9e5bce1b0a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,9 +1,9 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "f6616f1e417ee8b62daf251aa1daa5d73781c596", - "date": "2021-10-13T08:19:43+02:00", - "path": "/nix/store/p13qh130n5741wdfk2fbmy7ifd1z1zb2-tree-sitter-cmake", - "sha256": "1b5cc84d0gjm8nb73gdvfjxbk9fjrfkd5aay3b0qvk6gar59pcj6", + "rev": "5020572408a386d5d2dfac3516584f5edda7a49b", + "date": "2022-01-26T22:53:15+01:00", + "path": "/nix/store/in8jrkjf5vca2azpnyq2dgmzz9jcvjy6-tree-sitter-cmake", + "sha256": "0y49x8d36vdq2lcj67f3ms53qxym3578b3aw9gs2ckibwzrbfbgy", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json index cefe88d8be..ed62f80e23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-commonlisp", - "rev": "4fd115d3bb7046cd094f21bfe5766c302dbf64cd", - "date": "2021-12-06T20:34:14+01:00", - "path": "/nix/store/vmyfmgyhnx0ipi16d1w7sxsdkprybzk7-tree-sitter-commonlisp", - "sha256": "1kmxmx93f34lba5g7kqa5fcijfak9zc9qydbid9dcqxw6kf65ncg", + "rev": "c7e814975ab0d0d04333d1f32391c41180c58919", + "date": "2022-01-28T21:33:11+01:00", + "path": "/nix/store/1696bj1f92y8vqfk71cha8bzk9cx9rls-tree-sitter-commonlisp", + "sha256": "1hq3pwrp8509scgn983g0mi8pjy2q21pms30xlc3q7yyjxvpsw7b", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index 3618413500..19129d053a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elm-tooling/tree-sitter-elm", - "rev": "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd", - "date": "2021-12-27T23:25:02+01:00", - "path": "/nix/store/l5b9nhvrnq4a105rpmfi59dpg2xqs5nr-tree-sitter-elm", - "sha256": "1ls9l81nkcyym92n6h983m3jjjxdlr27nxa21p9l6czwf34564ky", + "rev": "5128296ba8542853d59e6b7c8dfe3d1fb9a637ea", + "date": "2022-02-04T13:10:25+01:00", + "path": "/nix/store/8brpvn8y88x3f3dsbgqql57kp9bygj3w-tree-sitter-elm", + "sha256": "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index b6ff0d8a32..654a89b597 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "d8b5b9f016cd3c7b0ee916cf031d9a2188c0fc44", - "date": "2022-01-23T20:01:08-08:00", - "path": "/nix/store/iv3vxp8cdnfhpr75gvqvm8hmvfw8hw51-tree-sitter-heex", - "sha256": "0dx6l9k6l5ibvrdb7x13lqnpj5nmjz8f5lc8j8wh4cq2jdabfw0k", + "rev": "592e22292a367312c35e13de7fdb888f029981d6", + "date": "2022-01-30T14:04:04-08:00", + "path": "/nix/store/21n6sqyvkfd0q5ass9nj2wgicm9ljmgv-tree-sitter-heex", + "sha256": "1k4nhlbbn7lqrjmkz8rr81rsrfkl9qfwm9q7qd2b18ygzr52payh", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index bfa5df3733..5cf20f2796 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "6f796b700c69a8af28132e84ed6d0c8f0c17a5e2", - "date": "2022-01-11T19:20:05+01:00", - "path": "/nix/store/48rdm71qngr9szsfhr85708srwn6b4ra-tree-sitter-latex", - "sha256": "0rbaql6jh3kwa4fap3b438l1733h2pbiazdbjzv38bbigkirad0n", + "rev": "323b609de40b7729073482a3c59de76cfba7744f", + "date": "2022-02-08T21:23:53+01:00", + "path": "/nix/store/f6kvr0x41rbb64s36ii6bj30fqaallz4-tree-sitter-latex", + "sha256": "1qsw5wcqs65ip0qq17vq6bf2snnpvw61iq2ahgwl9842ir15hrbr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index fe20047713..a11ac648fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "2e372ad0af8c6a68ba39f107a2edc9e3fc19ecf1", - "date": "2022-01-21T16:10:07+06:00", - "path": "/nix/store/6gpfn7bvv92b6rjw40kpmgvvvzb07j26-tree-sitter-lua", - "sha256": "1vyjix2vsrxkcwm0hbcc5i81c0a552mg7x639m6zxr6wh0ca4nsm", + "rev": "547184a6cfcc900fcac4a2a56538fa8bcdb293e6", + "date": "2022-01-28T20:44:16+06:00", + "path": "/nix/store/gvq91asqk6911bci8xxx5wjbp2p3c2lk-tree-sitter-lua", + "sha256": "04z182d591r3jlw0yx29m0hhzw4b14f8m85rz2bw959p0yghs88k", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 189301c729..1743d2252c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "c4be6addec0a8ada234684ced6c928189fd399af", - "date": "2022-01-22T17:12:52+01:00", - "path": "/nix/store/x73fgsrav1fg0vzydcy4ayrawn0cw7w2-tree-sitter-norg", - "sha256": "14wf53p6lkf4xknzb4bngh9fsas6hnr8iv73xnalyf8mqq1977pc", + "rev": "b7f879eaf9f20852f6b670439154b0128fbb6558", + "date": "2022-02-08T12:24:02+01:00", + "path": "/nix/store/q02py98zm9cmalzc5a0yqw8lg73ybx9g-tree-sitter-norg", + "sha256": "07hm5sysb25ivlz52ijnbka02hlqksha259w7v03awap85i9ydk6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json new file mode 100644 index 0000000000..67e75cd60e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/milisims/tree-sitter-org", + "rev": "1c3eb533a9cf6800067357b59e03ac3f91fc3a54", + "date": "2022-02-05T14:19:52-05:00", + "path": "/nix/store/n51rx6d005iibpvb1bb2d7az1l6p6vlq-tree-sitter-org", + "sha256": "06xkhhdlkikvxadp7wnk8riz51mjq9ks1jchdy9x3fmq6bj72y1p", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json deleted file mode 100644 index 23df3b743c..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "url": "https://github.com/milisims/tree-sitter-org", - "rev": "f110024d539e676f25b72b7c80b0fd43c34264ef", - "date": "2021-11-28T23:04:31-05:00", - "path": "/nix/store/8vc7ddhd2wzrin3cj14zrw5mmi58f8sl-tree-sitter-org", - "sha256": "1gvqvdapqfac1ny1a0l590h1w617wczwv234fsnal6amfdyganxc", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index e64e3f6bff..856d6bbb7e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "57f855461aeeca73bd4218754fb26b5ac143f98f", - "date": "2021-11-19T17:22:11+01:00", - "path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php", - "sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc", + "rev": "0ce134234214427b6aeb2735e93a307881c6cd6f", + "date": "2022-01-31T19:53:17+01:00", + "path": "/nix/store/kdddnbbsik9wvnjh1wnbyzzr1x8v64ps-tree-sitter-php", + "sha256": "0gg3p1zpwfhf0qz0isnca0zi5zkxs5j5bmjix99dv3rkw911vk17", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 548764811a..e724e7bbeb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "24b530ca158d2782ea9046e756057a412e16b52f", - "date": "2021-11-11T20:37:43-08:00", - "path": "/nix/store/1fqgxgb3l6wxvsvzaa2f26h5ywiyxz5h-tree-sitter-python", - "sha256": "1d8d66v64jwwk73y8q94n80w0f0cs7wjnww49b0sbmpa9d3hsfl6", + "rev": "78c4e9b6b2f08e1be23b541ffced47b15e2972ad", + "date": "2022-02-07T12:53:14-08:00", + "path": "/nix/store/9i5fh21cwa6w2zq9fkcn46207pbk2fzn-tree-sitter-python", + "sha256": "09xq6ymwa2ap4432yln5qs0y41iaxbrpp4m07pvydgcmyk3blxvv", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index dc339fe1fd..f77e929225 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,9 +1,9 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "d9868735e401e4870a3d4422790b585fea3faec8", - "date": "2022-01-10T10:12:40-05:00", - "path": "/nix/store/b2dp06sk8s3ksm382gndshhd1mxmd6n6-tree-sitter-r", - "sha256": "1pl38gksb4cwdgrb92rbmkanxn65m99i6c8w8xldhs0q97d1v5k0", + "rev": "c19e54de252d5573cc2a762a030957074526fe99", + "date": "2022-01-27T09:41:27-05:00", + "path": "/nix/store/b2h3khs1x0j4j2fvs2sbkx1dp3d8fx4g-tree-sitter-r", + "sha256": "1zan8dhjpxrn7vy7mvbc85hcdd5lls3vzpk6nchvn3j0i1ach85h", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 1479f09e06..87cc40f83b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "eeb0702ebdac504b97196577b1dac43c80913d7b", - "date": "2022-01-10T13:05:56-08:00", - "path": "/nix/store/sh170d6b589l16rhlygz6hvn1dmfhlb1-tree-sitter-rust", - "sha256": "1npx8kc4qdjj1fszqx6ks1d0x0pklmzm3gkxracs7y28lh2whrvq", + "rev": "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68", + "date": "2022-02-04T13:11:35-08:00", + "path": "/nix/store/i1f2zyrqghy98pl7dfnvcpbs3jsnmhay-tree-sitter-rust", + "sha256": "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json index 03644c839c..0b2637a143 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json @@ -1,9 +1,9 @@ { "url": "https://github.com/serenadeai/tree-sitter-scss", - "rev": "f3174d3d131eb776f86dfa3d90fe6f7325c0ad9a", - "date": "2021-11-08T17:21:33-08:00", - "path": "/nix/store/qpmqd6a3rnrp451b5jjmqqwark276smj-tree-sitter-scss", - "sha256": "0c8mx5fxcfn8wn361i7pnr3xga7vm2jjj99ilkqljir71nl6bm11", + "rev": "c478c6868648eff49eb04a4df90d703dc45b312a", + "date": "2022-02-03T21:48:21+00:00", + "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss", + "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index 7dcf59de2f..24f5776294 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -1,9 +1,9 @@ { "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider", - "rev": "a7201b61779be59ac0fc0d118746c886dbc3edbd", - "date": "2022-01-14T01:11:12+01:00", - "path": "/nix/store/rgy05854am625shbs13gjx0yggbb6awh-tree-sitter-supercollider", - "sha256": "118mbv8d5n2lb4w5cbjy657g9z9z910gvjjj41a2rkx971vgb6w3", + "rev": "0f0e5b5a96dd3e048a9c3db648ed969c44068bff", + "date": "2022-02-01T13:46:31+01:00", + "path": "/nix/store/5rzm6vnqvpwxwakrjyy93hg0glfvcx93-tree-sitter-supercollider", + "sha256": "0nxl43j7ddsddqcq56p921h1r5jkx8v49zxjzr6mcj6y1ljzndm2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index 86e9a86bbc..2ffc311fd9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "ffa98bbbd80e425f07e92bf511e64c8b0dffc1c7", - "date": "2022-01-23T09:32:54-05:00", - "path": "/nix/store/rbxa4biim19pwiz6gmh0ag5cz68rws3k-tree-sitter-tlaplus", - "sha256": "0j8bwxdvdhfhvpiahbf0hr9hfkbg75p7qpxx2i1rgvidavflbpiv", + "rev": "dde405e5128c3c47ab8aa014d21b6e5296ca450f", + "date": "2022-02-03T12:27:54-05:00", + "path": "/nix/store/vwmr9wd4agmym5ryrchl470qa46j8ymr-tree-sitter-tlaplus", + "sha256": "06g5pbx4rydfryfxfqjq37akhqn2465xwh90r5yc5rdv0kppvbhq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index bb57181f00..12322fe82b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "274b004d226a6686546ef83231f0f836b91700ae", - "date": "2022-01-21T14:12:20+01:00", - "path": "/nix/store/lpl3kbb5kwawr71m6qhqrwj1adkll540-tree-sitter-viml", - "sha256": "01bmn3l3fsi1r36ak72ly0v8fr62wchida965c60244bfg2s4r2c", + "rev": "bc573ef552adf8bed9e36eb687a0cccf43158634", + "date": "2022-01-24T16:13:56+01:00", + "path": "/nix/store/2i9n2fvjk0ymxv32ziq5z9ykv95svi7d-tree-sitter-viml", + "sha256": "0ckx9jh9fqfw5x9yb0sljczb0xsgxs8j6v2qbqywh5z6fcqx8sjc", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index eae6dd0813..246574895e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -304,7 +304,7 @@ let orga = "victorhqc"; repo = "tree-sitter-prisma"; }; - "tree-sitter-org" = { + "tree-sitter-org-nvim" = { orga = "milisims"; repo = "tree-sitter-org"; }; @@ -376,7 +376,7 @@ let if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then echo "rate limited" >&2 fi - release=$(printf "%s" "$res" | ${jq}/bin/jq '.tag_name') + release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name')" # github sometimes returns an empty list even tough there are releases if [ "$release" = "null" ]; then echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2 diff --git a/third_party/nixpkgs/pkgs/development/tools/pet/default.nix b/third_party/nixpkgs/pkgs/development/tools/pet/default.nix index 653bc8aca7..d759efb2b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg="; }; - vendorSha256 = "sha256-vciiBzmqUAt5ZWn9go4B1uaz0HsBk5Z9Rbw7/MAimY4="; + vendorSha256 = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix index 9d2d9b3962..c7d22015d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2021.11.23"; + version = "2022.1.8"; src = fetchPypi { inherit pname version; - sha256 = "1bde859e8bbd1d21d503fd995bc0170048d6da7686ab885f074592c99a16e8f3"; + sha256 = "f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix b/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix index 74f47f3f99..f60bfb4b72 100644 --- a/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - vendorSha256 = "1ivvq5ch9grdrwqq29flv9821kyb16k0cj6wgj5v0dyn63w420aw"; + vendorSha256 = "093blawprs2yf478zp9p1zc7mmimgpiwrw6nh8nqml89y5b5zldc"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix index a978c28665..df5afac2db 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TaHfyYoWsA/g5xZFxIMNwE1w6Dd9Cq5bp1gpQudYLs0="; }; - vendorSha256 = "sha256-z3Yp+Yy03g2DAvWUZXaOxQWONjnYUl69eTpYIDPhsqc="; + vendorSha256 = "sha256-qQFlBviRISEnPBt0q5391RqUrPTI/QDxg3MNfwWE8MI="; subPackages = [ "protoc-gen-twirp_php" ]; 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..ead72184b7 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 @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + vendorSha256 = "sha256-xZlP4rg1FMx6ddkKYlSdF6NrtY8xBZ3aEZSATgSf13M="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index 0bd33f19f8..bbc76ef8cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -14,11 +14,11 @@ }: mkDerivation { pname = "spago"; - version = "0.20.2"; + version = "0.20.5"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2"; - rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64"; + sha256 = "1qjlag5wm1hls54gb1rjym3xj28xww2p3m58f38g6icar9qz4a72"; + rev = "2a70306d87ddb2a7a61cf5ac61fccd7d91ecae6c"; fetchSubmodules = true; }; isLibrary = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix index f1e21641c3..ccc8e88dec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix @@ -1,19 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, nix }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, nix }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "rnix-lsp"; rev = "v${version}"; - sha256 = "sha256-D2ItR8z4LqEH1IL53vq/wPh9Pfe3eB0KsA79aLM/BWM="; + sha256 = "sha256-MfD07ugYYbcRaNoLxOcH9+SPbRewNxbHJA5blCSb4EM="; }; - cargoSha256 = "sha256-71vH8oc8DmwbwM2PgxjGmWAbyC4AByx7waHxLsr2koI="; + cargoSha256 = "sha256-23TJrJyfCuoOOOjZeWQnF/Ac0Xv2k6tZduuzapKvsgg="; - checkInputs = [ nix ]; + checkInputs = lib.optional (!stdenv.isDarwin) nix; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 2c69ad9876..782996d921 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -1,75 +1,45 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeTextFile -, runtimeShell -, bash -}: - -rustPlatform.buildRustPackage rec { - pname = "rust-bindgen"; - version = "0.59.2"; - - RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-bJYdyf5uZgWe7fQ80/3QsRV0qyExYn6P9UET3tzwPFs="; - }; - - cargoSha256 = "sha256-zhENlrqj611RkKDvpDtDFWc58wfQVamkJnpe2nvRieE="; - - #for substituteAll - libclang = llvmPackages_latest.libclang.lib; - inherit bash; - - buildInputs = [ libclang ]; - - propagatedBuildInputs = [ clang ]; # to populate NIX_CXXSTDLIB_COMPILE - - configurePhase = '' - export LIBCLANG_PATH="${libclang.lib}/lib" - ''; - - postInstall = '' - mv $out/bin/{bindgen,.bindgen-wrapped}; +{ rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: +let + clang = rust-bindgen-unwrapped.clang; + self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}" + { + #for substituteAll + inherit bash; + unwrapped = rust-bindgen-unwrapped; + libclang = clang.cc.lib; + meta = rust-bindgen-unwrapped.meta // { + longDescription = rust-bindgen-unwrapped.meta.longDescription + '' + This version of bindgen is wrapped with the required compiler flags + required to find the c and c++ standard libary, as well as the libraries + specified in the buildInputs of your derivation. + ''; + }; + passthru.tests = { + simple-c = runCommandCC "simple-c-bindgen-tests" { } '' + echo '#include ' > a.c + ${self}/bin/bindgen a.c --whitelist-function atoi | tee output + grep atoi output + touch $out + ''; + simple-cpp = runCommandCC "simple-cpp-bindgen-tests" { } '' + echo '#include ' > a.cpp + ${self}/bin/bindgen a.cpp --whitelist-function erf -- -xc++ | tee output + grep erf output + touch $out + ''; + with-lib = runCommandCC "zlib-bindgen-tests" { buildInputs = [ zlib ]; } '' + echo '#include ' > a.c + ${self}/bin/bindgen a.c --whitelist-function compress | tee output + grep compress output + touch $out + ''; + }; + } '' + mkdir -p $out/bin + export cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)" + export cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)" substituteAll ${./wrapper.sh} $out/bin/bindgen chmod +x $out/bin/bindgen ''; - - doCheck = true; - checkInputs = - let fakeRustup = writeTextFile { - name = "fake-rustup"; - executable = true; - destination = "/bin/rustup"; - text = '' - #!${runtimeShell} - shift - shift - exec "$@" - ''; - }; - in [ - rustfmt - fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` - clang - ]; - preCheck = '' - # for the ci folder, notably - patchShebangs . - ''; - - meta = with lib; { - description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; - longDescription = '' - Bindgen takes a c or c++ header file and turns them into - rust ffi declarations. - As with most compiler related software, this will only work - inside a nix-shell with the required libraries as buildInputs. - ''; - homepage = "https://github.com/rust-lang/rust-bindgen"; - license = with licenses; [ bsd3 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ johntitor ralith ]; - }; -} +in +self diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix new file mode 100644 index 0000000000..65ce8e20bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -0,0 +1,63 @@ +{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt, writeTextFile +, runtimeShell +, bash +}: + +rustPlatform.buildRustPackage rec { + pname = "rust-bindgen-unwrapped"; + version = "0.59.2"; + + RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rust-bindgen"; + rev = "v${version}"; + sha256 = "sha256-bJYdyf5uZgWe7fQ80/3QsRV0qyExYn6P9UET3tzwPFs="; + }; + + cargoSha256 = "sha256-RKZY5vf6CSFaKweuuNkeFF0ZXlSUibAkcL/YhkE0MoQ="; + + buildInputs = [ clang.cc.lib ]; + + preConfigure = '' + export LIBCLANG_PATH="${clang.cc.lib}/lib" + ''; + + doCheck = true; + checkInputs = + let fakeRustup = writeTextFile { + name = "fake-rustup"; + executable = true; + destination = "/bin/rustup"; + text = '' + #!${runtimeShell} + shift + shift + exec "$@" + ''; + }; + in [ + rustfmt + fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` + clang + ]; + preCheck = '' + # for the ci folder, notably + patchShebangs . + ''; + + passthru = { inherit clang; }; + + meta = with lib; { + description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; + longDescription = '' + Bindgen takes a c or c++ header file and turns them into + rust ffi declarations. + ''; + homepage = "https://github.com/rust-lang/rust-bindgen"; + license = with licenses; [ bsd3 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ johntitor ralith ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh index 0b3e3cd4c1..b7110385c2 100755 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/wrapper.sh @@ -22,7 +22,7 @@ for e in "$@"; do done; cxxflags= if [[ $cxx -eq 1 ]]; then - cxxflags=$NIX_CXXSTDLIB_COMPILE + cxxflags="@cxxincludes@" fi; if [[ -n "$NIX_DEBUG" ]]; then set -x; @@ -30,7 +30,7 @@ fi; export LIBCLANG_PATH="@libclang@/lib" # shellcheck disable=SC2086 # cxxflags and NIX_CFLAGS_COMPILE should be word-split -exec -a "$0" @out@/bin/.bindgen-wrapped "$@" $sep $cxxflags $NIX_CFLAGS_COMPILE +exec -a "$0" @unwrapped@/bin/bindgen "$@" $sep $cxxflags @cincludes@ $NIX_CFLAGS_COMPILE # note that we add the flags after $@ which is incorrect. This is only for the sake # of simplicity. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 62c9f9b97e..4b9819c199 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-MPU+hmYfmWftVEkdT/sZx9ESgCPTb7m4lEnYf5bOSYU="; + sha256 = "sha256-e9mT+OpPDTBtvQx3BVekr38azzD2DaT715wYLHYkjtk="; }; - cargoSha256 = "sha256-6Ffgg5/B1IFnTlSjzhAsnhxz8jBcgk01RIkwgLqlsvc="; + cargoSha256 = "sha256-pVa7OLRlWMy7ZlLGTeePt86kK5y0OULOLYrq9GtOFRA="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; 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 b895ff703e..5b446035c2 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 @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-LYXwdOopQkgq7i4l8dqQFkNLB3r+CVRor4BVeoj0DPs="; + sha256 = "sha256-LsRky7hc7mgx1iRpJZICmP/ofdfD9r3D5LURTqfI9Fo="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-SdbDWw4GOvCTKN7vBjhLU5rhdVIpyO+AWaFbo06HXfU="; + cargoSha256 = "sha256-7WGNaad00MqEM/OdUaLJ3McXlUQyQwPezbMbL+4se5A="; nativeBuildInputs = [ pkg-config ]; @@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/EmbarkStudios/cargo-deny"; changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; + maintainers = with maintainers; [ figsoda matthiasbeyer jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index 22fe3a2b19..5893fd2c82 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; - rev = version; - sha256 = "sha256-5dHEUGn2CrEpSTJsbnSRx/hKXx6dLCDcuD1dPOH49d4="; + rev = "v${version}"; + sha256 = "sha256-vjKo0L7sYrC7qWdOGSJDWpL04tmNjO3QRwAIRHN/DiI="; }; - cargoSha256 = "sha256-vZPd8Zzyp0PgIdyp5qY57ex0cCihplw/FY+xf3etuu8="; + cargoSha256 = "sha256-8XVRMwrBEJ1duQtXzNpuN5wJPUgziJlka4n/nAIqeEc="; buildInputs = lib.optional stdenv.isDarwin libiconv; 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 da4345c0e4..24d309eb68 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.35.7"; + version = "0.35.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rMeaKzCGY9jRrw8GaGtgm1rg3FIdaX/P+bOZRAtAI/s="; + sha256 = "sha256-YNPAIdN9FDUHs/5aCYJN+1/12ZYk1YJsUjjB1a09KvA="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-ZXQM2ij9Cpa5WCEHhcDc/tThfKZ7s1URmYsmqRg73m0="; + cargoSha256 = "sha256-xLFBF8fEbupLgFNdYC1NzM6p7O2gvsv0Utk4Et2oBDc="; # 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-msrv/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index aec27c588a..32ecbf9b34 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.13.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zIUbPmSlobSC3iJ0ddto40Sa/1xzCYG6eaTjMuUnXNU="; + sha256 = "sha256-rKkU49sqVArp/iCfcG78ieoEbyZoqB1owTwLfl09DSM="; }; - cargoSha256 = "sha256-GKU0ootG4fXUGErPplERMVjEBop/0+sfQCYpQwPPcXA="; + cargoSha256 = "sha256-aA4l7kyVnu416LcHddJqrEpi8WS0AImbROZG+kBy5tk="; passthru = { updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 8e6e9459aa..3b579d3ef9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.9.6"; + version = "0.10.1"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "0brrpcnsphvl1qn8myrzan0k87ph629gcj6zd54ym9f67qg2nri1"; + sha256 = "sha256-AKk25/j9Ao7ss8+2x+A5ohZ4P1wQ8uW5DVIBCHqFSPU="; }; - cargoSha256 = "0d0adpgf0j8xvw0dm3gcd6lnksn6p5rz3limc038fg8k84zf7cdb"; + cargoSha256 = "sha256-6zTZXSW8poePNZy48F6u5tF1LEDQt4f9qv7W/pdIBbI="; buildInputs = lib.optional stdenv.isDarwin Security; @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Checks rust documentation for spelling and grammar mistakes"; homepage = "https://github.com/drahnr/cargo-spellcheck"; + changelog = "https://github.com/drahnr/cargo-spellcheck/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ newam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix index e8d62c9252..506c71808a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.6.2"; + version = "0.6.5"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "01whdjryz6zjsk4149h72w5xdjnkpcn5daf0xnsb59b0q38hjgg9"; + sha256 = "sha256-bnceN47OFGlxs3ibcKoZFjoTgXRQxA2ZqxnthJ/fsqE="; }; - cargoSha256 = "036a50shzl6wdjk5wypkacx1kjwbyb4x1aqhbzgjgpxxxrf0lj16"; + cargoSha256 = "sha256-qMPJC61ZVW9olMgNnGrvcQ/je4se4J5gOVoaOpNMUo8="; meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; 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 164e57e774..53e74bf163 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 @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-12-27"; - cargoSha256 = "sha256-yok7kLcvKvDwrdgJR0540QLJi5/zXi0NyZxhtoQ8Xno="; + version = "2022-01-31"; + cargoSha256 = "sha256-BWCLzyCcLWwmh7Os7NjN2o89KD+VB0EHyZfTyYoYM08="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-/195+NsV6Mku2roi8zVy4dw8QGL6rQcnPcQ29Os8oqs="; + sha256 = "sha256-6+d/x7ZIyvkPLdn7ziXuPyKfxt/7z5PCWs7B960DFqk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix index c1b47d9019..ee49ee1bf6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.3.1"; + version = "3.4.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "hEfy8hNuWin7mKXs9yD9bEKHCVNuxrz5qasTeLOi1zY="; + outputHash = "l5F09bjRev2eBHKTMzojC7+USkW7qf3YtA2KSoN7MxM="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix index dd936781d9..37071321f5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-tA1exZ97N2tAagAljt+MOSGh6objOiqbZXUaBZ62Sls="; + sha256 = "sha256-S0EeFJS90bzQ7C+hN4CyZ7l9wmizT2d3P6utshI5JWs="; }; - cargoSha256 = "sha256-4vCKiTWwnibNK6/S1GOYRurgm2Aq1e9o4rAmp0hqGeA="; + cargoSha256 = "sha256-3J1Q595LxAI0LBP4/cLHDrMbZBnoA2+OSr8/erQcN+0="; nativeBuildInputs = lib.optional robloxSupport pkg-config; diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix index b029e7711a..975a040b8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix @@ -2,12 +2,12 @@ with lib; let - name = "selendroid-standalone-${version}"; + pname = "selendroid-standalone"; pluginName = "selendroid-grid-plugin-${version}"; version = "0.17.0"; srcs = { jar = fetchurl { - url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar"; + url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw"; }; gridPlugin = fetchurl { @@ -17,9 +17,7 @@ let }; in stdenv.mkDerivation { - - inherit name; - inherit version; + inherit pname version; dontUnpack = true; @@ -28,11 +26,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/lib/selendroid - cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar + cp ${srcs.jar} $out/share/lib/selendroid/selendroid-standalone-${version}.jar cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar makeWrapper ${jdk}/bin/java $out/bin/selendroid \ - --add-flags "-jar $out/share/lib/selendroid/${name}.jar" + --add-flags "-jar $out/share/lib/selendroid/selendroid-standalone-${version}.jar" makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index 021ba8c7f9..8087148c16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.72.1"; + version = "1.72.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-qFEvDslAjXpIpSanM4iorgTRfKWQPKKzxxwguFUlFZA="; + sha256 = "sha256-iaU0+sbssHhenz7QgXI9n5J2P5b0Tbw7fdvekRmjEeY="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-PRyQWohxlSNRiVj3r7xTxFVWsYL+C50bkhDU4NLaMBo="; + cargoSha256 = "sha256-vz0qSKFoM5kRgATshQ8W+yJTtWyQRvHp22t4nsJHqG0="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix new file mode 100644 index 0000000000..173de27d94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "skjold"; + version = "0.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "twu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-xz6N7/LS3wOymh9tet8OLgsSaretzuMU4hQd+LeUPJ4="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + packaging + pyyaml + toml + ]; + + checkInputs = with python3.pkgs; [ + pytest-mock + pytest-watch + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/twu/skjold/pull/91 + (fetchpatch { + name = "switch-poetry-core.patch"; + url = "https://github.com/twu/skjold/commit/b341748c9b11798b6a5182d659a651b0f200c6f5.patch"; + sha256 = "sha256-FTZTbIudO6lYO9tLD4Lh1h5zsTeKYtflR2tbbHZ5auM="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'packaging = "^21.0"' 'packaging = "*"' \ + --replace 'pyyaml = "^5.3"' 'pyyaml = "*"' + ''; + + disabledTestPaths = [ + # Too sensitive to pass + "tests/test_cli.py" + ]; + + disabledTests = [ + # Requires network access + "pyup-werkzeug" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_gemnasium_update" + "test_ensure_missing_github_token_raises_usage_error" + "test_ensure_pypi_advisory_db_update" + "test_ensure_source_is_affected_single" + "test_osv_advisory_with_vulnerable_package_via_osv_api" + "urllib3" + ]; + + pythonImportsCheck = [ + "skjold" + ]; + + meta = with lib; { + description = "Tool to Python dependencies against security advisory databases"; + homepage = "https://github.com/twu/skjold"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index 7b9a727c2e..5ec2ff7ac4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-KleTvRQwQFr4rrRXFW2z4N7DXIT920O2gig6wmOFIKs="; + sha256 = "sha256-SXwIwBlajzcXJaB90aesPk6BTRUNLRXtx4FPuM7pcyU="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix index 752803ee05..5d185dd153 100644 --- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.11.3"; + version = "0.12.2"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9V8vuFfyEdSzOG3Azk/e55N+Oh1VtMgcM+/PEMwJ6DI="; + sha256 = "sha256-Nry6P4nwcCmvJ4kdzeGEkaP1fm2LgnAwrINTBFK23tY="; }; - cargoSha256 = "sha256-PrZojkObidzzVv6KwFtI1QUGj5UB5TiMmzdBKq45Ci4="; + cargoSha256 = "sha256-i5wOGPOe1lDZknrVzZGxC8dUgTGiZJSzLqkxSRt0mQ8="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; diff --git a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index ee75f2e081..99b51854e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.6.0"; + version = "2.6.4"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-8Vfk6B85anlUf09cc08hOGujbcVCMqgEJ1PTxX6llrk="; + sha256 = "sha256-oUIgEWLcpEZHtL1wvTAezLtz2PecddtwhzbLhGqso/k="; fetchSubmodules = true; }; 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 b2da64427c..5b084aaad3 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.2.2"; - vendorSha256 = "sha256-/ct1DNSCB1KzajyHWe6guF5iYm5AAEbPunn7xYLw25I="; + version = "5.3.3"; + vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-qTt9FxphGi8o5hc3IaQGuIN+6t3KE/9xH9dv7i+C4ec="; + sha256 = "sha256-qLgcv6vjPiNJZuZzW0mSKxySz0GdNALtyZ6E3fL3B6Y="; }; # Tests requires network access diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index 6958a7b11d..b6f6dd2abb 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.3.7"; + version = "1.4.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bsPwyTucFJdKp+r8uJ2XLOzvbTM4i5EmSY+3VgyAFuE="; + sha256 = "sha256-XFx8M9cQ7uXm4LS983FOZ6hz3zffLahhwrBjytbwEWk="; }; - cargoSha256 = "sha256-2wJXx8xHPrjzKupuen3XfRMSviYEwYK3nbL5/uTDIzE="; + cargoSha256 = "sha256-ngWvbNx41K3PfGbzJfH8uBUl0cuI/Abj6EbX8YANk6Q="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix index 16926b16e9..365bb920e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix @@ -17,7 +17,8 @@ buildGoModule { sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; - vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv"; + vendorSha256 = "1xgl4avq0rblzqqpaxl4dwg4ysrhacwhfd21vb0v9ffr3zcpdw9n"; + proxyVendor = true; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index eb08ce7f0d..6e83961703 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mT99flZAAhLSynD/8+fa74Mc3KK8pVs+OOFDYNSBzEE="; + sha256 = "sha256-jcZiCZn6AbrjEhMkJQloLhZmfnxqlZxu5TXqH+dDN0s="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix index 5568f8c457..2ce704a00b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.25"; + version = "1.0.26"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-2go4HR/z96ONisXBGZDSIB5vXtHvRqBMhHOQTBL5G5w="; + sha256 = "sha256-xX654awHD7tHRhM6VYmbgsX3/XQDLmAUJ1EpBIQMc3M="; fetchSubmodules = true; }; 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 4416ce1b6c..3a36a00c73 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 @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.78"; + version = "0.2.79"; src = fetchCrate { inherit pname version; - sha256 = "sha256-5s+HidnVfDV0AXA+/YcXNGVjv/E9JeK0Ttng4mCVX8M="; + sha256 = "sha256-3kWhhzYmIo/GFieI0i7XVJIZxIaaJHHuDp38k5xcFmI="; }; - cargoSha256 = "sha256-CbtjUFwowP/QqyAMCzmUiSib4EpRhQAmO4ekX00xYGE="; + cargoSha256 = "sha256-xKYdvcrx3a9AKiRU8yJ3JNQp1Q2pEufwo+in82yTV6c="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix index a6c2b6db97..fba7d96c1d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.7"; + version = "1.19.8"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Bb4vpmWtSW2E2gr6V+tDsc4P5FJfCLLpzQX2WiVzUg="; + sha256 = "sha256-vJjAN7RmB1J4k7p2emfbjJxkpfph6piinmqVTR67HW0="; }; - cargoSha256 = "sha256-iAlRdUMR+64ngRT4icY6sTFFeRt4aShV/hj8PXJ0kEk="; + cargoSha256 = "sha256-dDQvcYnceBPDc+yeePjZ1k4a2ujCSh1hJMYFjPGw/bE="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index b0bf715e66..087658fe55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -76,9 +76,14 @@ in rec { workspaceDependencies ? [], # List of yarn packages }: let - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key}.buildInputs or [] - ) (builtins.attrNames pkgConfig))); + extraNativeBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.nativeBuildInputs or []) + (builtins.attrNames pkgConfig); + extraBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.buildInputs or []) + (builtins.attrNames pkgConfig); postInstall = (builtins.map (key: if (pkgConfig.${key} ? postInstall) then @@ -106,7 +111,8 @@ in rec { inherit preBuild postBuild name; dontUnpack = true; dontInstall = true; - buildInputs = [ yarn nodejs git ] ++ extraBuildInputs; + nativeBuildInputs = [ yarn nodejs git ] ++ extraNativeBuildInputs; + buildInputs = extraBuildInputs; configurePhase = lib.optionalString (offlineCache ? outputHash) '' if ! cmp -s ${yarnLock} ${offlineCache}/yarn.lock; then 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 59ba7ca8db..33565ecf8a 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.17.2"; + version = "4.19.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-jfb/r4Z8i23A0e4cJqZoG2TPXGVFOf64FfnZy/keAeQ="; + sha256 = "sha256-kIXMBXKcM9EHECJiegnjeFnccF68hmL/7I/QnePJdIw="; }; - vendorSha256 = "sha256-0eaD4oT6DyCWkJ0He4A7ysOEJD8CtFH6diQYBuEOoIk="; + vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix b/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix new file mode 100644 index 0000000000..94a5c3de37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix @@ -0,0 +1,42 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "bloomrpc"; + version = "1.5.3"; + + src = fetchurl { + url = "https://github.com/uw-labs/${pname}/releases/download/${version}/BloomRPC-${version}.AppImage"; + name = "${pname}-${version}.AppImage"; + sha512 = "PebdYDpcplPN5y3mRu1mG6CXenYfYvBXNLgIGEr7ZgKnR5pIaOfJNORSNYSdagdGDb/B1sxuKfX4+4f2cqgb6Q=="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname src version; + }; +in appimageTools.wrapType2 { + inherit pname src version; + + multiPkgs = null; # no 32bit needed + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "GUI Client for GRPC Services"; + longDescription = '' + Inspired by Postman and GraphQL Playground BloomRPC aims to provide the simplest + and most efficient developer experience for exploring and querying your GRPC services. + ''; + homepage = "https://github.com/uw-labs/bloomrpc"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ zoedsoupe ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index aea8ba6b19..6885e98871 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "9.2.0"; + version = "9.4.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "sha256-NxmGMHAEVuFl/3YgcHSbg+yWHB2tRpVTWlP5p5nGtPc="; + sha256 = "JoHfXhN5mXJoPwnUf7cKK5FduxqP9bSaGUU8yNfg29Y="; }; # don't remove runtime deps diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index a276907f37..f4f51d25cc 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ov2zCINh4uH5pvhML1fgpnxFhWs680bdv9oqUESFkpw="; + sha256 = "sha256-YaQOYhnbzoLyMpEPYyGXdVTWKN8dvcpLcb++8HO51qQ="; }; - cargoSha256 = "sha256-qYz5p+3QNA/zir2M9/aWxKYOMYI01OsIWZCJ4njjFPc="; + cargoSha256 = "sha256-2+77mILB5vaiejeXJ75l5LedQ55ibq/nlEzxfbANvgI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 72615b3562..1e05850884 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -19,7 +19,7 @@ let majorVersion = versions.major version; minorVersion = versions.minor version; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + pname = if enableNpm then "nodejs" else "nodejs-slim"; useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4"; @@ -43,9 +43,7 @@ let extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; self = stdenv.mkDerivation { - inherit version; - - name = "${baseName}-${version}"; + inherit pname version; src = fetchurl { url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/games/7kaa/default.nix b/third_party/nixpkgs/pkgs/games/7kaa/default.nix new file mode 100644 index 0000000000..2b74306cd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/7kaa/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, gccStdenv +, autoreconfHook +, pkg-config +, fetchurl +, fetchFromGitHub +, openal +, libtool +, enet +, SDL2 +, curl +, gettext +, libiconv +}: + +let + + name = "7kaa"; + versionMajor = "2.15"; + versionMinor = "4p1"; + + music = stdenv.mkDerivation rec { + pname = "${name}-music"; + version = "${versionMajor}"; + + src = fetchurl { + url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2"; + sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; + }; + + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + + meta.license = lib.licenses.unfree; + + }; + +in + +gccStdenv.mkDerivation rec { + pname = "${name}"; + version = "v${versionMajor}.${versionMinor}"; + + src = fetchFromGitHub { + owner = "the3dfxdude"; + repo = pname; + rev = "9db2a43e1baee25a44b7aa7e9cedde9a107ed34b"; + sha256 = "sha256-OAKaRuPP0/n8pO3wIUvGKs6n+U+EmZXUTywXYDAan1o="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ openal enet SDL2 curl gettext libiconv ]; + + preAutoreconf = '' + autoupdate + ''; + + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + + postInstall = '' + mkdir $out/share/7kaa/MUSIC + cp -R ${music}/MUSIC $out/share/7kaa/ + cp ${music}/COPYING-Music.txt $out/share/7kaa/MUSIC + cp ${music}/COPYING-Music.txt $out/share/doc/7kaa + ''; + + # Multiplayer is auto-disabled for non-x86 system + + meta = with lib; { + homepage = "https://www.7kfans.com"; + description = "GPL release of the Seven Kingdoms with multiplayer (available only on x86 platforms)"; + license = licenses.gpl2Only; + platforms = platforms.x86_64 ++ platforms.aarch64; + maintainers = with maintainers; [ _1000101 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/alephone/default.nix b/third_party/nixpkgs/pkgs/games/alephone/default.nix index 347ccd8df6..6477e3fb37 100644 --- a/third_party/nixpkgs/pkgs/games/alephone/default.nix +++ b/third_party/nixpkgs/pkgs/games/alephone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg +{ lib, stdenv, fetchurl, boost, curl, ffmpeg_4, icoutils, libGLU, libmad, libogg , libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net , SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip , alephone }: @@ -20,7 +20,7 @@ let buildInputs = [ boost curl - ffmpeg + ffmpeg_4 libGLU libmad libsndfile diff --git a/third_party/nixpkgs/pkgs/games/anki/default.nix b/third_party/nixpkgs/pkgs/games/anki/default.nix index d1def37400..a25111bddf 100644 --- a/third_party/nixpkgs/pkgs/games/anki/default.nix +++ b/third_party/nixpkgs/pkgs/games/anki/default.nix @@ -116,6 +116,11 @@ buildPythonApplication rec { url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch"; sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2"; }) + (fetchpatch { + name = "anki-2.1.15-unescape.patch"; + url = "https://795309.bugs.gentoo.org/attachment.cgi?id=715200"; + sha256 = "14rz864kdaba4fd1marwkyz9n1jiqnbjy4al8bvwlhpvp0rm1qk6"; + }) ]; # Anki does not use setup.py diff --git a/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix b/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix new file mode 100644 index 0000000000..6426c058c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "cl-wordle"; + version = "0.2.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-M2ljFrfIOyM1Slwsk7ZJ+PhJIVSUvFcFck2Q2e9nOwc="; + }; + + cargoSha256 = "sha256-bB6MzpJc8QS2+8GSS8RbSF5QcJyRT8FkmChpf1x2i/E="; + + patches = [ ./rust-1-57.diff ]; + + meta = with lib; { + description = "Wordle TUI in Rust"; + homepage = "https://github.com/conradludgate/wordle"; + # repo has no license, but crates.io says it's MIT + license = licenses.mit; + maintainers = with maintainers; [ lom ]; + mainProgram = "wordle"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/cl-wordle/rust-1-57.diff b/third_party/nixpkgs/pkgs/games/cl-wordle/rust-1-57.diff new file mode 100644 index 0000000000..b4c5721d85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/cl-wordle/rust-1-57.diff @@ -0,0 +1,13 @@ +diff --git a/src/state.rs b/src/state.rs +index 5fac0a3..41cbde4 100644 +--- a/src/state.rs ++++ b/src/state.rs +@@ -74,7 +74,7 @@ impl State { + 'X' + }; + +- write!(w, "{score}/6",)?; ++ write!(w, "{:?}/6", score)?; + for Guess(_, m) in self.guesses() { + write!(w, "\n{}", m)?; + } diff --git a/third_party/nixpkgs/pkgs/games/crawl/default.nix b/third_party/nixpkgs/pkgs/games/crawl/default.nix index e5eea7ece6..064e1d623a 100644 --- a/third_party/nixpkgs/pkgs/games/crawl/default.nix +++ b/third_party/nixpkgs/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "crawl${lib.optionalString tileMode "-tiles"}"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-fyI7OIzhYXNTjIgJLqApyPMmiG3iof1b5XuGudNanos="; + sha256 = "sha256-pVEE3g+NDwpsrakyj4YIk53aE+LCiIaRhOqos4huh9A="; }; # Patch hard-coded paths and remove force library builds diff --git a/third_party/nixpkgs/pkgs/games/egoboo/default.nix b/third_party/nixpkgs/pkgs/games/egoboo/default.nix index 158e81d912..506868efe3 100644 --- a/third_party/nixpkgs/pkgs/games/egoboo/default.nix +++ b/third_party/nixpkgs/pkgs/games/egoboo/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "3D dungeon crawling adventure"; - homepage = "http://www.freedink.org/"; + homepage = "http://egoboo.sourceforge.net/"; license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix index 287093354f..567ab267cf 100644 --- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.11"; + version = "0.9.12"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-p2FG4oWLTGflOoxsp8A+FpoVHfKiEw3DEnK8n3UiBtU="; + sha256 = "sha256-6voM6aQ22zW6NHm9x2TDsM4Kea6TLYZTdSLyc/6fz8A="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/third_party/nixpkgs/pkgs/games/flare/default.nix b/third_party/nixpkgs/pkgs/games/flare/default.nix index 9b4b6848ae..3567a58860 100644 --- a/third_party/nixpkgs/pkgs/games/flare/default.nix +++ b/third_party/nixpkgs/pkgs/games/flare/default.nix @@ -1,7 +1,7 @@ { lib, buildEnv, callPackage, makeWrapper, Cocoa }: buildEnv { - name = "flare-1.12"; + name = "flare-1.13.04"; paths = [ (callPackage ./engine.nix { inherit Cocoa; }) @@ -17,7 +17,7 @@ buildEnv { meta = with lib; { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://flarerpg.org/"; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse McSinyx ]; license = [ licenses.gpl3 licenses.cc-by-sa-30 ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/games/flare/engine.nix b/third_party/nixpkgs/pkgs/games/flare/engine.nix index fc7415ba3e..9e9215ada1 100644 --- a/third_party/nixpkgs/pkgs/games/flare/engine.nix +++ b/third_party/nixpkgs/pkgs/games/flare/engine.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-engine"; - version = "1.12"; + version = "1.13.04"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "0swav6fzz970wj4iic3b7y06haa05720s2wivc8w7wcw9nzcac7j"; + sha256 = "sha256-GPHPYcW0kBDGpZti2kFggNB4RVK/3eQ53M9mJvJuKXM="; }; patches = [ ./desktop.patch ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; homepage = "https://github.com/flareteam/flare-engine"; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse McSinyx ]; license = [ licenses.gpl3 ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/games/flare/game.nix b/third_party/nixpkgs/pkgs/games/flare/game.nix index 9903f0b582..791af26453 100644 --- a/third_party/nixpkgs/pkgs/games/flare/game.nix +++ b/third_party/nixpkgs/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.12"; + version = "1.13.04"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "15k9r7w587pvkzrln0670hhq5fzif8k7xmrhb0nl3z3fi6dw3mmc"; + sha256 = "sha256-7dEIagioM6OZXG+eNaYls8skHXSqGFXZuNhT0zhTFdY="; }; nativeBuildInputs = [ cmake ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://github.com/flareteam/flare-game"; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse McSinyx ]; license = [ licenses.cc-by-sa-30 ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/games/freedink/default.nix b/third_party/nixpkgs/pkgs/games/freedink/default.nix index c80dc2b070..75c5066942 100644 --- a/third_party/nixpkgs/pkgs/games/freedink/default.nix +++ b/third_party/nixpkgs/pkgs/games/freedink/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { with close compatibility, under multiple platforms. ''; - homepage = "http://www.freedink.org/"; + homepage = "https://www.gnu.org/software/freedink/"; # Formerly http://www.freedink.org license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bjg ]; diff --git a/third_party/nixpkgs/pkgs/games/linthesia/default.nix b/third_party/nixpkgs/pkgs/games/linthesia/default.nix new file mode 100644 index 0000000000..0914722a9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/linthesia/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, libGL, libGLU +, alsa-lib, glibmm, sqlite, SDL2, SDL2_ttf_2_0_15, SDL2_image, gtk3, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "linthesia"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "linthesia"; + repo = "linthesia"; + rev = version; + sha256 = "sha256-bdW0RlV14ttnK8NizfNfXmZ7zlJOqZCpVvt8vT2Pjys="; + }; + + postPatch = '' + patchShebangs meson_post_install.py + ''; + + nativeBuildInputs = [ meson ninja pkg-config python3 wrapGAppsHook ]; + buildInputs = [ + libGL + libGLU + alsa-lib + glibmm + sqlite + SDL2 + SDL2_ttf_2_0_15 + SDL2_image + gtk3.out # icon cache + ]; + + meta = with lib; { + description = "A game of playing music using a MIDI keyboard following a MIDI file"; + inherit (src.meta) homepage; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/update.py b/third_party/nixpkgs/pkgs/games/minecraft-servers/update.py index 4fe84ee21a..0e7f10a8c9 100755 --- a/third_party/nixpkgs/pkgs/games/minecraft-servers/update.py +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/update.py @@ -4,6 +4,7 @@ import json from dataclasses import dataclass, field from datetime import datetime +from pathlib import Path from typing import Any, Dict, List, Optional import requests @@ -150,6 +151,6 @@ def generate() -> Dict[str, Dict[str, str]]: if __name__ == "__main__": - with open("versions.json", "w") as file: + with open(Path(__file__).parent / "versions.json", "w") as file: json.dump(generate(), file, indent=2) file.write("\n") diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index 7ffa361da5..9e94bb6a4a 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex -, leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa +, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp +, OpenGL, OpenAL ? openal, Carbon, Cocoa }: with lib; @@ -9,6 +10,21 @@ with lib; let boolToCMake = b: if b then "ON" else "OFF"; + irrlichtMt = stdenv.mkDerivation rec { + pname = "irrlichtMt"; + version = "1.9.0mt4"; + src = fetchFromGitHub { + owner = "minetest"; + repo = "irrlicht"; + rev = version; + sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ]; + outputs = [ "out" "dev" ]; + meta = irrlicht.meta; + }; + generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let sources = { src = fetchFromGitHub { @@ -30,29 +46,41 @@ let src = sources.src; cmakeFlags = [ + "-G Ninja" "-DBUILD_CLIENT=${boolToCMake buildClient}" "-DBUILD_SERVER=${boolToCMake buildServer}" - "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" + "-DENABLE_SPATIAL=1" "-DENABLE_SYSTEM_JSONCPP=1" - "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" + "-DIRRLICHT_INCLUDE_DIR=${irrlichtMt.dev}/include/irrlicht" + + # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_DATADIR=share" + "-DCMAKE_INSTALL_DOCDIR=share/doc" + "-DCMAKE_INSTALL_DOCDIR=share/doc" + "-DCMAKE_INSTALL_MANDIR=share/man" + "-DCMAKE_INSTALL_LOCALEDIR=share/locale" + ] ++ optionals buildClient [ "-DOpenGL_GL_PREFERENCE=GLVND" + ] ++ optionals buildServer [ + "-DENABLE_PROMETHEUS=1" ]; NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 - nativeBuildInputs = [ cmake doxygen graphviz ]; + nativeBuildInputs = [ cmake doxygen graphviz ninja ]; buildInputs = [ - irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses + irrlichtMt luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm ] ++ optionals buildServer [ - leveldb postgresql hiredis + leveldb postgresql hiredis prometheus-cpp ]; postInstall = '' @@ -66,25 +94,20 @@ let license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz ]; + # never built on Hydra + # https://hydra.nixos.org/job/nixpkgs/trunk/minetestclient_4.x86_64-darwin + # https://hydra.nixos.org/job/nixpkgs/trunk/minetestserver_4.x86_64-darwin + broken = (lib.versionOlder version "5.0.0") && stdenv.isDarwin; }; }; - v4 = { - version = "0.4.17.1"; - sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg"; - dataSha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s"; - }; - v5 = { - version = "5.4.1"; - sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8"; - dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4"; + version = "5.5.0"; + sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA="; + dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0="; }; in { - minetestclient_4 = generic (v4 // { buildClient = true; buildServer = false; }); - minetestserver_4 = generic (v4 // { buildClient = false; buildServer = true; }); - minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; }); minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; }); } diff --git a/third_party/nixpkgs/pkgs/games/minetest/disable_fixup.patch b/third_party/nixpkgs/pkgs/games/minetest/disable_fixup.patch deleted file mode 100644 index 1c378d7f83..0000000000 --- a/third_party/nixpkgs/pkgs/games/minetest/disable_fixup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -802,7 +802,6 @@ - install(CODE " - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) -- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\") - " COMPONENT Runtime) - endif() - diff --git a/third_party/nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch b/third_party/nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch deleted file mode 100644 index 9540a434da..0000000000 --- a/third_party/nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -17,6 +17,7 @@ - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include - #include "irrlicht.h" // createDevice - #include "irrlichttypes_extrabloated.h" - #include "chat_interface.h" diff --git a/third_party/nixpkgs/pkgs/games/openttd/nml.nix b/third_party/nixpkgs/pkgs/games/openttd/nml.nix index 094330faff..bb44d9eee0 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/nml.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/nml.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.5.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = version; - sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9"; + sha256 = "0z0n4lqvnqigfjjhmmz7mvis7iivd4a8d287ya2yscfg5hznnqh2"; }; propagatedBuildInputs = with python3Packages; [ply pillow]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 8c6724d9e3..35564704f6 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2021.1225.0"; + version = "2022.118.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-kN5pR37b0giKGJVnJo/Mce+MWFwZiY+mZAHG/fUt0O4="; + sha256 = "sha256-/BzoLiQLiBcWqThzDOVb4Y7s6WhcKnCRRhAzUi5Jstk="; }; 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 e6ebf84830..7bf9a89e50 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -1,12 +1,12 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "AutoMapper"; version = "10.1.1"; sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8"; }) + (fetchNuGet { pname = "AutoMapper"; version = "11.0.0"; sha256 = "1ni9mmrqfbspwf7xz6by5415ci5zhg15z3f7596qqpmbn8bqg7wq"; }) (fetchNuGet { pname = "DeltaCompressionDotNet"; version = "2.0.0.0"; sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.0"; sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.39"; sha256 = "05rlw9h3ps1gx4pwdxjwpx1lajyvj1b35j3536ixfmnnvjx4v2yj"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.40"; sha256 = "0k1cpkfgz4v5qigvmmvlk8lv2a731kqkmx6acf3rzr8rlj3cfnc4"; }) (fetchNuGet { pname = "Humanizer"; version = "2.13.14"; sha256 = "155g2700x6sbym2jd4dshm4rf3jjr8flx6w9xnw28zrrv7r2rdy8"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.13.14"; sha256 = "1ni4mcyhcs46ih9b8c8l3xq3iai56rdlcw0afwhji3hxwbxqbk7i"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) @@ -156,14 +156,14 @@ (fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2021.1225.0"; sha256 = "1md0zsjwi8zx2az42cch1wgvb5ygscncmpc4ysgz1pl6jn02v3by"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.118.0"; sha256 = "1c81r8s9zivj9hany0yqsza1y3nhh24zbkwwnjm0m6z4mls04l1y"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2021.1215.0"; sha256 = "1aarb8wkzz31xa8fa6g5axwmvx89ix66ygbqq7zcyz8k9yy2ilh1"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.115.0"; sha256 = "0w2hnci93644ayfpgpsyxsifz38yklvn42fkgd860i3mn04lyl2z"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; }) (fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) - (fetchNuGet { pname = "Realm"; version = "10.7.1"; sha256 = "058jigmsxvzb7571ll9qkf0hwmgff5zddfq4pqvnzkf87i5kd2kq"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.7.1"; sha256 = "1m3cglh39fr84pr3nr7q1hyiq83gqj0m6h8m79wl96g5xxq5v6pa"; }) + (fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; }) + (fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (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"; }) @@ -185,7 +185,7 @@ (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 = "Sentry"; version = "3.12.1"; sha256 = "1bqldqc0bnrxdgfxh71w3vjf3cygcn6jyrhxmjvikciirlgcs3cz"; }) + (fetchNuGet { pname = "Sentry"; version = "3.13.0"; sha256 = "0wnivy7rhzghr94pdczv7kw72y1hv5kp6hw0fkmw1nfgnsh4qjfm"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.30.1"; sha256 = "1hib2hxjrlikwsczym1qn2slaapgjw8qzd8gmid8bryaz8hv044h"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) @@ -276,7 +276,6 @@ (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) diff --git a/third_party/nixpkgs/pkgs/games/polymc/0001-pick-latest-java-first.patch b/third_party/nixpkgs/pkgs/games/polymc/0001-pick-latest-java-first.patch deleted file mode 100644 index a65dcbfd03..0000000000 --- a/third_party/nixpkgs/pkgs/games/polymc/0001-pick-latest-java-first.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Tue, 22 Jun 2021 21:50:11 +0300 -Subject: [PATCH] pick latest java first - ---- - launcher/java/JavaInstallList.cpp | 4 ++-- - launcher/java/JavaUtils.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp -index 0bded03c..40898e20 100644 ---- a/launcher/java/JavaInstallList.cpp -+++ b/launcher/java/JavaInstallList.cpp -@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList versions) - - bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) - { -- auto rleft = std::dynamic_pointer_cast(left); -- auto rright = std::dynamic_pointer_cast(right); -+ auto rleft = std::dynamic_pointer_cast(right); -+ auto rright = std::dynamic_pointer_cast(left); - return (*rleft) > (*rright); - } - -diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp -index 5f004a10..6d633631 100644 ---- a/launcher/java/JavaUtils.cpp -+++ b/launcher/java/JavaUtils.cpp -@@ -350,7 +350,6 @@ QList JavaUtils::FindJavaPaths() - qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; - - QList javas; -- javas.append(this->GetDefaultJava()->path); - auto scanJavaDir = [&](const QString & dirPath) - { - QDir dir(dirPath); -@@ -379,6 +378,7 @@ QList JavaUtils::FindJavaPaths() - // general locations used by distro packaging - scanJavaDir("/usr/lib/jvm"); - scanJavaDir("/usr/lib32/jvm"); -+ javas.append(this->GetDefaultJava()->path); - // javas stored in MultiMC's folder - scanJavaDir("java"); - return javas; --- -2.31.1 - diff --git a/third_party/nixpkgs/pkgs/games/polymc/default.nix b/third_party/nixpkgs/pkgs/games/polymc/default.nix index ddfc76b8b9..0d63a8ad5f 100644 --- a/third_party/nixpkgs/pkgs/games/polymc/default.nix +++ b/third_party/nixpkgs/pkgs/games/polymc/default.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, makeDesktopItem , fetchFromGitHub , cmake , jdk8 @@ -17,21 +16,19 @@ mkDerivation rec { pname = "polymc"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - patches = [ ./0001-pick-latest-java-first.patch ]; - postPatch = '' # hardcode jdk paths substituteInPlace launcher/java/JavaUtils.cpp \ @@ -42,19 +39,6 @@ mkDerivation rec { cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; - desktopItems = [ - (makeDesktopItem { - name = "polymc"; - desktopName = "PolyMC"; - genericName = "Minecraft Launcher"; - comment = "Free, open source launcher and instance manager for Minecraft."; - icon = "launcher"; - exec = "polymc"; - categories = "Game"; - terminal = "false"; - }) - ]; - dontWrapQtApps = true; postInstall = let @@ -68,8 +52,6 @@ mkDerivation rec { libGL ]; in '' - install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg - # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/polymc \ "''${qtWrapperArgs[@]}" \ diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 8c379959ad..35e8b9838f 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -327,7 +327,7 @@ in buildFHSUserEnv rec { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiPkgs extraBuildCommands; + inherit multiPkgs extraBuildCommands profile; inherit unshareIpc unsharePid; diff --git a/third_party/nixpkgs/pkgs/games/toppler/default.nix b/third_party/nixpkgs/pkgs/games/toppler/default.nix index ffe807410b..890e134987 100644 --- a/third_party/nixpkgs/pkgs/games/toppler/default.nix +++ b/third_party/nixpkgs/pkgs/games/toppler/default.nix @@ -1,34 +1,61 @@ -{ lib, stdenv -, fetchurl -, SDL -, SDL_mixer +{ lib +, stdenv +, fetchFromGitLab + +, pkg-config +, gettext +, povray +, imagemagick +, gimp + +, SDL2 +, SDL2_mixer +, SDL2_image +, libpng , zlib }: stdenv.mkDerivation rec { pname = "toppler"; - version = "1.1.6"; + version = "1.3"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ifccissd8sh78kpwh7dafx4ah7hkhqz6nf4z2hdnalw702jkg3x"; + src = fetchFromGitLab { + owner = "roever"; + repo = "toppler"; + rev = "v${version}"; + sha256 = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; }; + nativeBuildInputs = [ + pkg-config + gettext + povray + imagemagick + gimp + ]; + buildInputs = [ - SDL - SDL_mixer + SDL2 + SDL2_mixer + SDL2_image + libpng zlib ]; - # The conftest hangs on Hydra runners, because they are not logged in. - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + # GIMP needs a writable home + preBuild = '' + export HOME=$(mktemp -d) + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + hardeningDisable = [ "format" ]; meta = with lib; { description = "Jump and run game, reimplementation of Tower Toppler/Nebulus"; - homepage = "http://toppler.sourceforge.net/"; - license = licenses.gpl2; + homepage = "https://gitlab.com/roever/toppler"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/games/uchess/default.nix b/third_party/nixpkgs/pkgs/games/uchess/default.nix index cafd7cf576..58b45609cc 100644 --- a/third_party/nixpkgs/pkgs/games/uchess/default.nix +++ b/third_party/nixpkgs/pkgs/games/uchess/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1njl3f41gshdpj431zkvpv2b7zmh4m2m5q6xsijb0c0058dk46mz"; }; - vendorSha256 = "0dkq240ch1z3gihn8yc5d723nnvfxirk2nhw12r1c2hj1ga088g3"; + vendorSha256 = "sha256-4yEE1AsSChayCBxaMXPsbls7xGmFeWRhfOMHyAAReDY="; # package does not contain any tests as of v0.2.1 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index fc32607ada..1ff9f9d36d 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.1"; + version = "3.6.4"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-elcSwm7KvDpGVBF7Gs6GFreQPyVwWBxYN0NO1N6JWDM="; + sha256 = "sha256-WUEpYxzNcH9kJRn4nROoaeXTe1+D4/0VRqTwc7ac1hc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix index 46d847dee6..8c2e857317 100644 --- a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.16.1"; + version = "1.16.3"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-o3FMuMvWxj9ECj77H/q5QkpcFbcZ0eNQ1OS51pUal3c="; + sha256 = "sha256-PpvTHG/EBKBhtlgIrAz/B+U1aHbZURN2cWTlZ/DkZQs="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index d079b3f61c..d0b0ae1184 100644 --- a/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -10,7 +10,7 @@ let , ... } @ args: stdenv.mkDerivation ({ - name = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}-${version}"; + pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; inherit version; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/misc/beep/default.nix b/third_party/nixpkgs/pkgs/misc/beep/default.nix index 92d84bdf6d..e278d4778d 100644 --- a/third_party/nixpkgs/pkgs/misc/beep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/beep/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "beep"; - version = "1.4.9"; + version = "1.4.11"; src = fetchFromGitHub { owner = "spkr-beep"; repo = "beep"; rev = "v${version}"; - sha256 = "JLaoiINHpIFWSqsRl8wJ/NeBu7SCcPuT/BzY8szEu0o="; + sha256 = "sha256-8g9Nni9lalQvrffhwIv2LFRtLrioUL+lMeDTHH6l6Sk="; }; makeFlags = [ "DESTDIR=\${out}" "prefix="]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix index 0e9977f564..2d0129e21c 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/default.nix @@ -18,11 +18,9 @@ , avahi ? null , libpaper ? null , coreutils +, nixosTests }: -### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test -### works at least for your platform. - with lib; stdenv.mkDerivation rec { pname = "cups"; @@ -137,6 +135,8 @@ stdenv.mkDerivation rec { --replace "Exec=htmlview" "Exec=xdg-open" ''; + passthru.tests.nixos = nixosTests.printing; + meta = { homepage = "https://openprinting.github.io/cups/"; description = "A standards-based printing system for UNIX"; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix index 916ac32c2e..768256e816 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1110/default.nix @@ -17,7 +17,8 @@ lprdeb = fetchurl { }; in stdenv.mkDerivation { - name = "cups-brother-hl1110"; + pname = "cups-brother-hl1110"; + inherit version; srcs = [ lprdeb cupssrc cupsdeb ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix index 975e07aa6c..abdc5b061a 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -12,7 +12,8 @@ let }; in stdenv.mkDerivation { - name = "cups-brother-hl1210W"; + pname = "cups-brother-hl1210W"; + inherit version; srcs = [ lprdeb cupsdeb ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix index 255fae09c7..fc6a06535e 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -17,7 +17,8 @@ let }; in stdenv.mkDerivation { - name = "cups-brother-hl3140cw"; + pname = "cups-brother-hl3140cw"; + inherit version; nativeBuildInputs = [ makeWrapper dpkg ]; buildInputs = [ cups ghostscript a2ps ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix index e61d3ace5f..5704cb6ccd 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "cups-brother-hll2340dw"; + pname = "cups-brother-hll2340dw"; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index 44c6e8a4c6..6f17bcbf41 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.45"; + version = "1.1.46"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/13/38/11/01e244e8529c5cbcec8d39220a9512d5e6c08eec/epson-inkjet-printer-escpr2-1.1.45-1lsb3.2.src.rpm"; - sha256 = "sha256-MZXn1fsD3D6W5vlX+NwRkwLtaBRqQwe9lwnJC2L9Lfk="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/13/43/83/99e36ae2747bfae54a5dd32dacaf189a073278aa/epson-inkjet-printer-escpr2-1.1.46-1lsb3.2.src.rpm"; + sha256 = "sha256-7AeDULD/BB+swLBOwijilcM+yJi5slOMw2lEtquLyYw="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index 1afa976117..56e107300b 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-15445"; + version = "5.0-15993"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "db02b50d2ecdfbbc21e19aadc57253c353069f77"; - sha256 = "l2vbTZOcjfyZjKOI3n5ig2f7cDYR22GcqKS479LMtP8="; + rev = "5e595616379a694789fe749e40a27ef069f0090e"; + sha256 = "1kid8qjn8r7dxh2yc1y6yal6qkfxij0ymi3zryxsnym3rjh1jds9"; fetchSubmodules = true; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten ]; + maintainers = with maintainers; [ MP2E ashkitten xfix ]; branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dosbox-staging/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dosbox-staging/default.nix index 3322c43a0c..05c970507b 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dosbox-staging/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dosbox-staging/default.nix @@ -1,6 +1,21 @@ -{ lib, fetchFromGitHub, stdenv -, gtest, makeWrapper, meson, ninja, pkg-config -, alsa-lib, fluidsynth, libGL, libGLU, libogg, libpng, munt, opusfile, SDL2, SDL2_net +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_net +, alsa-lib +, fluidsynth +, gtest +, libGL +, libGLU +, libogg +, libpng +, makeWrapper +, meson +, libmt32emu +, ninja +, opusfile +, pkg-config }: stdenv.mkDerivation rec { @@ -14,34 +29,53 @@ stdenv.mkDerivation rec { sha256 = "07jwmmm1bhfxavlhl854cj8l5iy5hqx5hpwkkjbcwqg7yh9jfs2x"; }; - nativeBuildInputs = [ gtest makeWrapper meson ninja pkg-config ]; - buildInputs = [ alsa-lib fluidsynth libGL libGLU libogg libpng munt opusfile SDL2 SDL2_net ]; + nativeBuildInputs = [ + gtest + makeWrapper + meson + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + SDL2_net + alsa-lib + fluidsynth + libGL + libGLU + libmt32emu + libogg + libpng + opusfile + ]; hardeningDisable = [ "format" ]; mesonFlags = [ "--buildtype=release" - "-Ddefault_library=static" "-Db_asneeded=true" - "-Dtry_static_libs=png" + "-Ddefault_library=static" "-Dfluidsynth:enable-floats=true" "-Dfluidsynth:try-static-deps=true" + "-Dtry_static_libs=png" ]; postFixup = '' - # Rename binary, add a wrapper, and copy manual to avoid conflict with vanilla dosbox. - # Doing it this way allows us to work with frontends and launchers that expect the - # binary to be named dosbox, but get out of the way of vanilla dosbox if the user - # desires to install that as well. + # Rename binary, add a wrapper, and copy manual to avoid conflict with + # vanilla dosbox. Doing it this way allows us to work with frontends and + # launchers that expect the binary to be named dosbox, but get out of the + # way of vanilla dosbox if the user desires to install that as well. + mv $out/bin/dosbox $out/bin/${pname} makeWrapper $out/bin/dosbox-staging $out/bin/dosbox cp $out/share/man/man1/dosbox.1.gz $out/share/man/man1/${pname}.1.gz ''; meta = with lib; { - description = "A modernized DOS emulator"; homepage = "https://dosbox-staging.github.io/"; - license = licenses.gpl2; + description = "A modernized DOS emulator"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ joshuafern ]; platforms = platforms.unix; priority = 101; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix index ba4f88dbca..383e943ff2 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,16 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_net +, SDL_sound +, copyDesktopItems +, graphicsmagick +, libGL +, libGLU +, libpng +, makeDesktopItem +}: stdenv.mkDerivation rec { pname = "dosbox"; @@ -6,31 +18,40 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; - sha256 = "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0"; + hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; + nativeBuildInputs = [ + copyDesktopItems + graphicsmagick + ]; + + buildInputs = [ + SDL + SDL_net + SDL_sound + libGL + libGLU + libpng + ]; + hardeningDisable = [ "format" ]; - buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ]; - - nativeBuildInputs = [ graphicsmagick ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - desktopItem = makeDesktopItem { - name = "dosbox"; - exec = "dosbox"; - icon = "dosbox"; - comment = "x86 emulator with internal DOS"; - desktopName = "DOSBox"; - genericName = "DOS emulator"; - categories = "Emulator;"; - }; + desktopItems = [ + (makeDesktopItem { + name = "dosbox"; + exec = "dosbox"; + icon = "dosbox"; + comment = "x86 dos emulator"; + desktopName = "DOSBox"; + genericName = "DOS emulator"; + categories = "Emulator;Game;"; + }) + ]; postInstall = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/icons/hicolor/256x256/apps gm convert src/dosbox.ico $out/share/icons/hicolor/256x256/apps/dosbox.png ''; @@ -40,8 +61,15 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.dosbox.com/"; description = "A DOS emulator"; - platforms = platforms.unix; + longDescription = '' + DOSBox is an emulator that recreates a MS-DOS compatible environment + (complete with Sound, Input, Graphics and even basic networking). This + environment is complete enough to run many classic MS-DOS games completely + unmodified. In order to utilize all of DOSBox's features you need to first + understand some basic concepts about the MS-DOS environment. + ''; + license = licenses.gpl2Plus; maintainers = with maintainers; [ matthewbauer ]; - license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix index bbe4819246..8e4d909a72 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "duckstation"; - version = "0.pre+date=2021-12-16"; + version = "0.pre+date=2022-01-18"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "59cb7c03432f5f8d9f6283c71a34825d05e118c6"; - sha256 = "sha256-vF3YEpicbwCtR6QW2huNk0+pJ7BBjn/x9/Ae1c00gN4="; + rev = "51041e47f70123eda41d999701f5651830a0a95e"; + sha256 = "sha256-nlF6ctDU8KCK7MN2pniPLLqUbPUygX9rl0hjzVQ+mPo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix index f6b9c11ffe..d8defe6f2e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -4,7 +4,7 @@ , SDL2 , cmake , libepoxy -, ffmpeg +, ffmpeg_4 , imagemagick , libedit , libelf @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 libepoxy - ffmpeg + ffmpeg_4 imagemagick libedit libelf diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index f0dba9058d..2c49874e54 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -6,7 +6,7 @@ , alsa-lib , AppKit , fetchFromGitHub -, ffmpeg +, ffmpeg_4 , Foundation , freetype , gamemode @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { lib.optional stdenv.isLinux wayland ++ lib.optional (runtimeLibs != [ ]) makeWrapper; - buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ + buildInputs = [ ffmpeg_4 freetype libxml2 libGLU libGL python3 SDL2 which ] ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ lib.optional withVulkan vulkan-loader ++ lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ diff --git a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch new file mode 100644 index 0000000000..dccf06fc07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch @@ -0,0 +1,62 @@ +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/misc/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index 25a6d6befa..0ea56d3a72 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -8,26 +8,38 @@ }: let - majorVersion = "0.0.19"; - gitVersion = "12975-37383f421"; + # Keep these separate so the update script can regex them + rpcs3GitVersion = "13222-8c2fd5095"; + rpcs3Version = "0.0.20-13222-8c2fd5095"; + rpcs3Revision = "8c2fd50957be3af05c04a9bb782dce8505fb6400"; + rpcs3Sha256 = "1cf62vpqdc9i4masgv9zz24h7zdc7gcymx6n1hbh7wp5gg1dw4qi"; + + ittapi = fetchFromGitHub { + owner = "intel"; + repo = "ittapi"; + rev = "v3.18.12"; + sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; + }; in gcc11Stdenv.mkDerivation { pname = "rpcs3"; - version = "${majorVersion}-${gitVersion}"; + version = rpcs3Version; src = fetchFromGitHub { owner = "RPCS3"; repo = "rpcs3"; - rev = "37383f4217e1c510a543e100d0ca495800b3361a"; + rev = rpcs3Revision; fetchSubmodules = true; - sha256 = "1pm1r4j4cdcmr8xmslyv2n6iwcjldnr396by4r6lgf4mdlnwahhm"; + sha256 = rpcs3Sha256; }; + patches = [ ./0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch ]; + passthru.updateScript = ./update.sh; preConfigure = '' cat > ./rpcs3/git-version.h < -Date: Sun, 7 Nov 2021 15:36:02 +1000 -Subject: [PATCH] fix build with ffmepg 4 - ---- - libmedia/ffmpeg/MediaHandlerFfmpeg.cpp | 2 +- - libmedia/ffmpeg/MediaParserFfmpeg.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -index 127aaaa..216d96b 100644 ---- a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -+++ b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -@@ -149,7 +149,7 @@ MediaHandlerFfmpeg::cameraNames(std::vector& /*names*/) const - size_t - MediaHandlerFfmpeg::getInputPaddingSize() const - { -- return FF_INPUT_BUFFER_PADDING_SIZE; -+ return AV_INPUT_BUFFER_PADDING_SIZE; - } - - } // gnash.media.ffmpeg namespace -diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp -index 9ceb8b0..a27ca56 100644 ---- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp -+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp -@@ -64,7 +64,7 @@ AVInputFormat* - MediaParserFfmpeg::probeStream() - { - const size_t probeSize = 4096; -- const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE; -+ const size_t bufSize = probeSize + AV_INPUT_BUFFER_PADDING_SIZE; - - std::unique_ptr buffer(new std::uint8_t[bufSize]); - -@@ -173,7 +173,7 @@ MediaParserFfmpeg::parseVideoFrame(AVPacket& packet) - - // TODO: We might avoid the copy as a whole by making EncodedVideoFrame - // virtual. -- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE; -+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE; - std::uint8_t* data = new std::uint8_t[allocSize]; - std::copy(packet.data, packet.data+packet.size, data); - std::unique_ptr frame(new EncodedVideoFrame(data, packet.size, 0, timestamp)); -@@ -221,7 +221,7 @@ MediaParserFfmpeg::parseAudioFrame(AVPacket& packet) - - // TODO: We might avoid the copy as a whole by making EncodedAudioFrame - // virtual. -- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE; -+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE; - std::uint8_t* data = new std::uint8_t[allocSize]; - std::copy(packet.data, packet.data+packet.size, data); - --- -2.31.1 - diff --git a/third_party/nixpkgs/pkgs/misc/gnash/default.nix b/third_party/nixpkgs/pkgs/misc/gnash/default.nix deleted file mode 100644 index fc7148b404..0000000000 --- a/third_party/nixpkgs/pkgs/misc/gnash/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook -, pkg-config, libtool, boost, SDL -, glib, pango, gettext, curl, xorg -, libpng, libjpeg, giflib, speex, atk - -# renderers -, enableAGG ? true, agg ? null -, enableCairo ? false, cairo ? null -, enableOpenGL ? false -, libGLU ? null -, libGL ? null - -# GUI toolkits -, enableGTK ? true, gtk2 ? null, gnome2 ? null -, enableSDL ? false -, enableQt ? false, qt4 ? null - -# media -, enableFFmpeg ? true, ffmpeg ? null - -# misc -, enableJemalloc ? true, jemalloc ? null -, enableHwAccel ? true -, enablePlugins ? false, xulrunner ? null, npapi_sdk ? null -}: - -with lib; - -let - available = x: x != null; - - sound = - if enableFFmpeg then "ffmpeg" else "none"; - - renderers = [] - ++ optional enableAGG "agg" - ++ optional enableCairo "cairo" - ++ optional enableOpenGL "opengl"; - - toolkits = [] - ++ optional enableGTK "gtk" - ++ optional enableSDL "sdl" - ++ optional enableQt "qt4"; - -in - -# renderers -assert enableAGG -> available agg; -assert enableCairo -> available cairo; -assert enableOpenGL -> all available [ libGLU libGL ]; - -# GUI toolkits -assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; -assert enableSDL -> available SDL; -assert enableQt -> available qt4; - -# media libraries -assert enableFFmpeg -> available ffmpeg ; - -# misc -assert enableJemalloc -> available jemalloc; -assert enableHwAccel -> all available [ libGLU libGL ]; -assert enablePlugins -> all available [ xulrunner npapi_sdk ]; - -assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; -assert length renderers == 0 -> throw "at least one renderer must be enabled"; - - -stdenv.mkDerivation { - pname = "gnash"; - version = "0.8.11-2019-30-01"; - - src = fetchgit { - url = "git://git.sv.gnu.org/gnash.git"; - rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4"; - sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry"; - }; - - postPatch = '' - sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; - buildInputs = [ - glib gettext boost curl SDL speex - xorg.libXmu xorg.libSM xorg.libXt - libpng libjpeg giflib pango atk - ] ++ optional enableAGG agg - ++ optional enableCairo cairo - ++ optional enableQt qt4 - ++ optional enableFFmpeg ffmpeg - ++ optional enableJemalloc jemalloc - ++ optional enableHwAccel [ libGL libGLU ] - ++ optionals enableOpenGL [ libGL libGLU ] - ++ optionals enablePlugins [ xulrunner npapi_sdk ] - ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]; - - patches = [ - (fetchpatch { # fix compilation due to bad detection of libgif version: https://savannah.gnu.org/patch/index.php?9873 - url = "https://savannah.gnu.org/patch/download.php?file_id=47859"; - sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y"; - }) - - # Fix build with modern Pango - # https://savannah.gnu.org/bugs/index.php?57759 - (fetchpatch { - url = "https://savannah.gnu.org/file/0001-Do-not-depend-on-pangox.patch?file_id=48366"; - sha256 = "02x7sl5zwd1ld2n4b6bp16c5gk91qsap0spfbb5iwpglq3galv2l"; - }) - - ./0001-fix-build-with-ffmepg-4.patch - ]; - - configureFlags = with lib; [ - "--with-boost-incl=${boost.dev}/include" - "--with-boost-lib=${boost.out}/lib" - "--enable-renderer=${concatStringsSep "," renderers}" - "--enable-gui=${concatStringsSep "," toolkits}" - "--enable-media=${sound}" - "--with-npapi-install=prefix" - (enableFeature enablePlugins "plugins") - (enableFeature enableJemalloc "jemalloc") - (optionalString enableHwAccel "--enable-device=egl") - ]; - - meta = { - homepage = "https://savannah.gnu.org/projects/gnash"; - description = "A flash (SWF) player and browser plugin"; - license = licenses.gpl3; - maintainers = with maintainers; [ rnhmjoj ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix b/third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix new file mode 100644 index 0000000000..16bfa3a54b --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/kitty-themes/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "kitty-themes"; + version = "unstable-2022-02-03"; + + src = fetchFromGitHub { + owner = "kovidgoyal"; + repo = pname; + rev = "337d6fcb3ad7e38544edfb8d0f6447894b7e5f58"; + sha256 = "ZP5GrT2QCdXtC5swqI0SXzIlqIcQNsxBlzEplj/hpz4="; + }; + + installPhase = '' + mkdir -p $out/themes + mv themes.json $out + mv themes/*.conf $out/themes + ''; + + meta = with lib; { + homepage = "https://github.com/kovidgoyal/kitty-themes"; + description = "Themes for the kitty terminal emulator"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ nelsonjeppesen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix index 9f5e550d97..2cecc22cf5 100644 --- a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -11,7 +11,7 @@ let beat = package: extraArgs: buildGoModule (rec { sha256 = "sha256-9Jl5Xo1iKdOY9ZE5JXKSL4ee+NdsN3KCY2dDYuxlzPI="; }; - vendorSha256 = "sha256-tyxyM7RsTHTVVxc9gagPsSvFRaWGTmobKzyv9RODXBk="; + vendorSha256 = "sha256-fiqCccS2IAnTzfPfUqY0Wy9uRUuiYNtiVvpAFZJOPVI="; subPackages = [ package ]; diff --git a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix index 594561593e..ef1d7b1401 100644 --- a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.21"; + version = "1.22"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-28zKtSPuJnluVeozZSZJ5LevSY7a6ap15NTXhpwKuEg="; + sha256 = "sha256-wF0nPux1M8DhBiguAlTPBOf16PDCkgyjlEiGX6sqQZs="; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9MzOaQj+lR1F+E/yoxbL/HMOOuKOU82zkPVq7x6AH3c="; + sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0="; }; # postPatch: diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index b04a548745..8c39ab3f20 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -132,12 +132,12 @@ in rec { cpu = mkTmuxPlugin { pluginName = "cpu"; - version = "unstable-2020-07-25"; + version = "unstable-2021-12-15"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; - rev = "20120a38ade17057441482b43eb5390e6ea2c1c1"; - sha256 = "1gdz2awyd9icvyiw2p40gwymh6ngjhb9mkiv63ix53snp9ii794i"; + rev = "9eb3dba66672c5b43065e144cc3a1031f77ad67e"; + sha256 = "sha256-v/jZxsa+JwsSKjmA32VK/4gBNHP/SyOzTaYSSz2c0+4="; }; }; @@ -523,12 +523,12 @@ in rec { tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; - version = "unstable-2020-12-07"; + version = "unstable-2021-10-20"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "5efeb91086040a3becf5372fb38258acd0579954"; - sha256 = "1z0zmsf8asxs9wbwvkiyd81h93wb2ikl8nxxc26sdpi6l333q5s9"; + rev = "1801dd525b39154745ea668fb6916035023949e3"; + sha256 = "e929Jqletmobp3WAR1tPU3pJuYTYVynxc5CvB80gig8="; }; 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/vim-plugins/aliases.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix index 8f3308a122..955590cafe 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix @@ -94,7 +94,6 @@ mapAliases (with prev; { neosnippet = neosnippet-vim; The_NERD_Commenter = nerdcommenter; The_NERD_tree = nerdtree; - onedark-nvim = onedarkpro-nvim; # added 2021-10-22 open-browser = open-browser-vim; pathogen = vim-pathogen; polyglot = vim-polyglot; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index c3599c908a..210aa3e817 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-01-19"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "845a1052f7d8c084eab15d190b62d87350f6fa37"; - sha256 = "0k16c83qn8rcg0gfmwlwlj27apj1k081yy4aqgyrkn485fdlv3sl"; + rev = "ee369de02aebc52e7d34506298556e15030c52dc"; + sha256 = "0d31lkaiqn5f8rg1asinp72hlngmfbih7rffb4q4zm5hwayyqi3p"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-01-07"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5087246c8223712fa0097098e910951aba8603fb"; - sha256 = "0szp3iy0ljzxkahz7bwz1h135isaqngg4861zl1p22ddylnaxnwq"; + rev = "47470eddc277e0a141e6e36a1e2a19045e051d1c"; + sha256 = "1wrhi9gwr5wjl7jdvqvldrl4480qcx6ry9gkl41dhiz643g28pvk"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -171,6 +171,18 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; + asyncomplete-lsp-vim = buildVimPluginFrom2Nix { + pname = "asyncomplete-lsp.vim"; + version = "2021-12-17"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "asyncomplete-lsp.vim"; + rev = "f6d6a6354ff279ba707c20292aef0dfaadc436a3"; + sha256 = "1y0wpq982nw0ibqhvcvb7md58jvadygkxc1ibg99zxw1kznfpla6"; + }; + meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; + }; + asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete.vim"; version = "2021-12-06"; @@ -197,12 +209,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-11-29"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "1607b4c100f9c466fc0208e936421a0202025457"; - sha256 = "1rx1ggy54j71pp5ihv8zb3wqq69b26v65q1snv6hlabar02hrl1r"; + rev = "d11266046077968bbc3d6ac37d81e069618cdedd"; + sha256 = "1hdycb9rc7kpcppwv332hmrnzx5g2jy5r0ckaynahwwbwbjiyjqh"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -233,12 +245,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-01-15"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "486e23f024a21c952758726497244e27aa3b9f0e"; - sha256 = "1sxg9gr329zlccm8xh8zv3n26s72mikqh4aik5l1hdx663afqc0d"; + rev = "5860ae9369c86332ec45b38ab8308b9a4afb272c"; + sha256 = "0klwbjgxqddw5apqzrx9fsqk25xy6nbaplx4fw68x6z0c63dbvsa"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -329,12 +341,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2022-01-14"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "2bee35e435310c7cc1333fff983268ae3f17b06f"; - sha256 = "1y6q2r462l7p4y9x5fn04902s41n4rr0xrwnry6vwp4rdlzldw8c"; + rev = "b227dd1380bbe226b117f9b758e146aa7c2e7d82"; + sha256 = "1jzfjnry03cv8nxf30h4x5pad5s55k4grzy1jp26sb3xjlpriz3p"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -413,12 +425,12 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-01-06"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "4d46f80734a1f6854942f78fcbf2163b959b8ab0"; - sha256 = "1hzbxpz3yz3z7fxj7imd4l3aznrxcx1fnhf39gg2xqzk8j1yspwx"; + rev = "4b1d3adca7e968ebc619cf2f6f3e197ef78c8342"; + sha256 = "0imyzav898hzx4d669rxx7qyac6b8csp04am2j85rr31rywylpn0"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -473,12 +485,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-01-23"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c63ad901576729c46f443630a1fb61e4a7e93a0f"; - sha256 = "1w90zb46fdvpp0b1i559yj3dvijfskl9dlqjkgn7fr8513fgblrz"; + rev = "406fdf2f2d2372df52d503e9f7bef96d89901c9f"; + sha256 = "17b07krgc9pzqhmwls2d50xbiqs4fgzmdi61qrz1v5n0bgs011mr"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -497,12 +509,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7f1b916fabbae134b37c0a5ac09f0bfc555ab010"; - sha256 = "0xmm0fikqj95m836nv8y6cyvqkn3p0iklqhqj32cxqfrvh0mbnb6"; + rev = "95920369e18ea64bb5e1e5f1a3161c822681f325"; + sha256 = "1jd0vqmlwm9x28bdflbfcg3xgsff0mh011cwi1sq30llwja1jhf2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -545,12 +557,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-08-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "a2fb69aabbe2bbbf1fd08d34c168f2348a4af493"; - sha256 = "1fd6pk0vl8il42d53rzddlbbk5r4k0gz95bk964pc81z38bmskcw"; + rev = "6d0254b845e1cf42ee778763190f852b6d013dc3"; + sha256 = "15z2mfjgpr36bqady1ijvaha41d1rfw5prcwr9czcmh2iaphp2j8"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -749,12 +761,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2022-01-17"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "c5230cb439df9547294678d0f1c1465ad7989e5f"; - sha256 = "0ya68crpc78fb5zn34s06rl77gsm956pjpsjfk1dv2cddwwxi8x8"; + rev = "466b6b8270f7ba89abd59f402c73f63c7331ff6e"; + sha256 = "15ksxnwxssv1yr1ss66mbl5w0layq0f4baisd9ki192alnkd7365"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -773,12 +785,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-01-20"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "276f3a5e43465c479164f00258f7454ff0b4d3a1"; - sha256 = "145gpizsa28g3rd872hxflnw644k9ki5qvw9012yjrfm5n8mmfcp"; + rev = "2a051347190a22b738e9784426199b9db745e1da"; + sha256 = "1z3imhw4jgswd957aqhf1yf5dihb1k9dfd22abshziv45fb0fggy"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -881,12 +893,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-01-14"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "eae915d529503a7a281e2e80aaa0bcb7ef04a576"; - sha256 = "18pfamaczbcpf35dh2sn9cp1wd6fha882qpbzvhx8qrvhjdz0n2a"; + rev = "80a1100866354d2e057fb5a7ef979978b5990ecc"; + sha256 = "1jqx2195c01im5gnp5knqwgrb9fkxsasb9m54s8c2vhqg7i7j7pg"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -917,12 +929,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-01-22"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5b8cc589540e82e6862b2948924f06461261a09a"; - sha256 = "0j1v9nckv86b4z2pz6b9kssp59fl3da9hyadjplnqgilbbcqplxm"; + rev = "6116a010e18b7adcca024d95891da9af4e0dcd27"; + sha256 = "06sc3rr4dxk1j6glb6vyxkw8k9m90g7gd1zdgsj5pw7mxfk9xbik"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -990,12 +1002,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-01-02"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "90df2f87c0b17193d073d1f72cea2e528e5b162d"; - sha256 = "1zrmcmz7vr74pamr8ig7a4r0y9jqjs2rh4zd66gx67ccf4bjapsy"; + rev = "af51a8af6b213336345f36fc7aba65f9c3316696"; + sha256 = "1zzv4f1rxqfl9saf90gf6h5cbcnw1jc4qqm63x3zkl6a8s9qpj51"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1182,24 +1194,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "c878e9f1886f86a0210753fa9c146b2e863d84bc"; - sha256 = "1nhzj0pslfzzski3z0synv5vpacfbx359ggsq1z5d9cyapsxchkx"; + rev = "81aea6abdf8467b79fd8fe506d28f60391d30ac4"; + sha256 = "1fjjkwz9q91xfyph19hix9610s7g331mwq15wmpcr86vrmjvjbbj"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-01-23"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a036b5e3c15baeda71bd76f4b7e9d3de9a057e42"; - sha256 = "1i2yygw4j6g7zihcbja58k2qh0sdn3mqbx277k91bdkf4y1hjdxd"; + rev = "ccfe42887401d99e4a1dfc89306f9376fbbc062d"; + sha256 = "0lvkzd3hwm4yzlpf5l77cy08dxx7r02zz5yg5w271bwf3lfcj61d"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1230,12 +1242,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-01-19"; + version = "2022-02-03"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "edf3b7aafa334d72b80d502dcca55b36a5b5ba79"; - sha256 = "1szmnagv2f8ik4ypzgvf68y39243f3877yah6msvfrm44qzh9bf6"; + rev = "afa44bb9ccebbcde56bf66d498f2277206f7895c"; + sha256 = "064is1nhdldkglj03f4832qagnbbwrf4sd1bnjx9iadq9wx84lp5"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1302,24 +1314,24 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2022-01-14"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "ed04d2ec91c78748f0d8ddf69df2f6e5cffa7bb8"; - sha256 = "1336bk2w4ll1vq6vwd0pq77021i13hcrm3mqzynznvhxwwxrk4dy"; + rev = "d5b092036bc651912474f64277913be8502f8f09"; + sha256 = "12nmcam301h69181hznsh19p9sl42srp98dfa56ghy4iyrcg2d34"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2021-08-17"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "08764627ce85fc0c0bf9d8fd11b3cf5fc05d58ba"; - sha256 = "0fqjgnpc6zajqr4pd3hf73fg0cjx7cnkhz6cjdf5mvjwllgv92gp"; + rev = "42e6f57f2404b882cb7e491d50e525f8a8eb7f1f"; + sha256 = "1lla0ldgayryib0868zl10dz6yy9dxa0k86fxl5sr6y0csfpi23z"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1362,12 +1374,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-01-03"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "10fa80481a9489be1ad38ceff84e357a5a4c416b"; - sha256 = "10nqgha8p25n79sgi5arw79pr59q6wldm6s8c876l6al3111971n"; + rev = "c3417f30029c384c73aeccb1084f21c14b4bae45"; + sha256 = "0dc0w8j4fhbh86vmibi9wx146r79sv2yvsqczp28hqinwss6j68b"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1422,12 +1434,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-01-03"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "e7c9569ad3e8223894872ab7f47b53c5fbffdfa5"; - sha256 = "0ps08viz39476dz31qzssp5xmhhaw5szvr5yj1k58nx912hn9d17"; + rev = "acaf6b6282bfab2e28fbb8a01eea6da9b9c764af"; + sha256 = "19m1g79s55pyxcm2vg4kj52c9kkl3l2km07j9cwbq4qd8vm9vjil"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1724,12 +1736,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-01-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "5183d43fd2b3ccbb7747f85275a94aadc84c1b11"; - sha256 = "13mmc7wb4ngxwyjb7i990mf3lgvn2n90m0cy4y0zpmyghrxa2k9z"; + rev = "607d027a8440c01be9ef8f433563ab0c8567d4c1"; + sha256 = "0pcnx53n7n5gk97kbxias65lslif6ymsjqcsvlfx0qf2bwwsdz81"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1760,12 +1772,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-01-18"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "3f23266f0c623415ab8051c6e05c35e0981025b5"; - sha256 = "0khdg2wn204f0rrh5m26iaymf4ic73lk5h5z0zkc1ahdhfy3alsv"; + rev = "8e8f7e525941ee2080a39b98c1b1f5466a6ea187"; + sha256 = "0i2wsjzy881g80rf94zmggkk1mj1jnb582dwzl6wlw3bi9vvsbg0"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -1784,12 +1796,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "840bbfd5158976ae6e0f0b79d110e40bdabd084c"; - sha256 = "16gs2jfqwn081f12gmdgzkjxxha278rm57p95dsf752374gkn5v5"; + rev = "40ea50a854175d65f4ce9ea84fff39ba572e3f67"; + sha256 = "0wwp0hdvlri3kbq2b6glckyrbs4dbqynh25hgj3j77pc4zkjmjla"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1906,12 +1918,12 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2021-09-30"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "eee93cca626fdcdfae0ddcc6f8a956c85455acd3"; - sha256 = "1jm8dnr7p8k9ilc97vqrr5cx1adfhla0rc679iajg2h5ydxngfxk"; + rev = "e4a51e0f6763720ab1d1889e1ce3fa3beaaf00d3"; + sha256 = "11v3jh8qrpwpnvjj1r9z522v9bsyvxwxb8s8856a2zl6vn9caqml"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; @@ -1954,12 +1966,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-01-11"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "b6204ec4e04732d7b4ba73a3e4af48cba3576d67"; - sha256 = "0ndddww8ciwil7bpn77yahb7fcn5i59sq91syqy3qr0wwmfc7mwc"; + rev = "d415fcee2634b6c9bb4fad223c4e909498c6dcb8"; + sha256 = "0vs8nhhmpnp5jnqkmn5dz3mkhp894hyhv0v32j9qqsvdrllzsyjz"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1976,6 +1988,18 @@ final: prev: meta.homepage = "https://github.com/wincent/ferret/"; }; + fidget-nvim = buildVimPluginFrom2Nix { + pname = "fidget.nvim"; + version = "2022-02-09"; + src = fetchFromGitHub { + owner = "j-hui"; + repo = "fidget.nvim"; + rev = "2a69ee6d17cd264eb10b33170df4cfce4cc4f4f3"; + sha256 = "0l7ir0fky6czmjkkhd13di4x39jhy70i0s0wjiiyqn9cdfm0xw14"; + }; + meta.homepage = "https://github.com/j-hui/fidget.nvim/"; + }; + file-line = buildVimPluginFrom2Nix { pname = "file-line"; version = "2016-10-21"; @@ -2051,12 +2075,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2021-11-03"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "0cdce2da8762ee01ee7d8df047b6e569d58c1ba3"; - sha256 = "1169xj5k04l7gfhxqa4afq9khf6yv5bcihir21sgzpym4z69axh7"; + rev = "80a14fae599dfd200c805c345a7515266abf3438"; + sha256 = "1d42mbxhry3scycykxh381xdykm225sg5v02f9lfv9r2r3ay81jf"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2075,12 +2099,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-01-23"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "a8efb538f4be58b4f4586bc964f9f10496c05e31"; - sha256 = "0yj7ijr091jsd8rny4zx34427w8v87iywysig5pgrz7iz421wib4"; + rev = "2e575549910571ff5abb6b02178c69ad760a4e00"; + sha256 = "06cbqxnpi5gzq9cggwixkgmw9kw5sdlw311xsczk7vn720bay26f"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2159,60 +2183,60 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-01-23"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "74a8b7d3f39dbcbcb920a99b63adc4867363e8c3"; - sha256 = "0c80shgzxz90213qhx7bvd1fkzkdq9g79m157dnwvzh121jmpdap"; + rev = "b02056f3c4b9d64d876bbf0a58d20791345a9364"; + sha256 = "16n78ylicrd7lh41g5hvd9vnnhkwbvj28c190k5zvrblyyhipn93"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-01-24"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "91332acb1c48e7080539c5b5cd131816341c738c"; - sha256 = "0s8695m25v2j5hpp80g3hd28g7ja17yxih5cd71jqmqvl3zwmqrg"; + rev = "1f7bfa4007043c30027b2cd79625e8aac5cff1f9"; + sha256 = "0f6i6g9qvh9zyh56g51b1jf0bm4chsgkmqsy62fjh5yrlbkcwkai"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline.nvim"; - version = "2021-04-25"; + version = "2022-01-21"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "NTBBloodbath"; repo = "galaxyline.nvim"; - rev = "d544cb9d0b56f6ef271db3b4c3cf19ef665940d5"; - sha256 = "1390lqsqdcj1q89zn6y5qrm1id7p8fnpy07vlz6mm4cki47211mb"; + rev = "4d4f5fc8e20a10824117e5beea7ec6e445466a8f"; + sha256 = "0xgk64d7dyihrjir8mxchwzi65nimm9w23r24m99w6p0f9qr56gk"; }; - meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; + meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags.vim"; - version = "2020-10-12"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "jsfaint"; repo = "gen_tags.vim"; - rev = "f888a2f8732e08d9f2b638b144c5c826a30953a3"; - sha256 = "16gkczlaani0c0v3hkklriabhkgcs0mg9mrbn8jzfsap15cnkgk5"; + rev = "a7221d8edc3ca2d8616e3f57624b2248f390c34f"; + sha256 = "17gn7k835181cmd49i16yw22z2861wgk5y3la1la7cx1az2h83f4"; }; meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-12-10"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "b6027756f5bdfaaa24b26c5472f8904f78e86c3e"; - sha256 = "0w0nvf1ha065d16zlgqf77rvf52qs350zzy2rb4b741h1fk34v59"; + rev = "7f677946f3243e563782834f55df5f97c36db036"; + sha256 = "0vjpnvg1qqalrg449k8in76fvv1hwv343qg5z6k0gcqakc5dxl2p"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -2255,12 +2279,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-01-19"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d0c1ad8cdb6ad9455f9e084e55c6e411bdb03b49"; - sha256 = "0mavqgxf4ryd5p101c7nzzaxhpcpxlrzlr2mznfg23i1a36ibzxy"; + rev = "fdd38cf969af53acfaebde75ce74bb9bdc44daca"; + sha256 = "0pl60wgsc8pfhbzi6rgxa8kd4pbw7qdk2xc161i1qxykjjkczgwa"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2303,24 +2327,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2022-01-10"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "e83ebb3465fb224df394477a0d68a61094d3f7b9"; - sha256 = "0442yi5j1fdzh2wmyn59z9mzyzsja0j0dkialj4gzlsglg6ndbai"; + rev = "ff33d07bb64e104b387fff7d91650a35274f81ea"; + sha256 = "1sxhcbww0f780lp0zda1iaiyp89c6cirs0ncihjxr106a47zpya4"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-01-22"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f43cee333fdfeb27aae86bab73a38c5885d5c7f4"; - sha256 = "1rxx8abg4kx6n6xbg2fyw3cjixcnynkg4l00xjh4yk44bi0f65f8"; + rev = "e2b2730254df7648c79794555978f10fceb4b163"; + sha256 = "1kmbhfphf128psrxps7iyb1kb2s1lbc63qkxwla1cl3ywnl7f8gl"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2351,12 +2375,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-01-20"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "df202bd09bab4b63f5f64857eb8f3411d46fdf11"; - sha256 = "1ndgrrlhw87vwy12fzvf5fhnjdsl9na1a3j4hj6slq9v48rkv87f"; + rev = "c6685381d31df262b776775b9f4252f6c7fa98d0"; + sha256 = "08f6qi6ncicw7zj9vyf08pays9sbxvzwm920i3mbkld6nmb87j39"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2435,12 +2459,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-01-19"; + version = "2022-02-03"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "118f3b5576bed4cd345475aed0d61f63c6b20809"; - sha256 = "1n7sj5ia40x0lpf6q1s39zz46578wwb9v1z3vaxqwxdwrncrnn15"; + rev = "9395ee71627d7202343c606a2e1d3c7967bfb256"; + sha256 = "06v6kdsqhy59zd4il9qxcli68cmx4g1pxv5zfpaglayghvnxdn9n"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -2459,24 +2483,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "d043cd49c344e41cd07b19c5252ee31e356c8ebf"; - sha256 = "10m7wk8p6kwc8zgfl64r901vkxrsfv9bwnzxi4cx3s03vvkq1c00"; + rev = "591ca7fa71449b0e6ffe27f4525c3ceecc0b5684"; + sha256 = "1i5yq5lj4ws8j3v4pc459ls69fgcgfh8a4fr98gnj4z650nprkpg"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-01-10"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "ba2a3592174c19d6f3231d06723606f6ca33fc23"; - sha256 = "0qcc0f4lky8if91faw6923sdpgvr67nsfgfb1mqmhriwvq02l46y"; + rev = "d4d0c6e66c1f4d5bdc0cb216c882d88d223a4187"; + sha256 = "0s12sxhpk59r8a12df0zbhbmj6djffqmh1pw2fhw392zrb1549m8"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2507,12 +2531,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2021-12-04"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "6948a402c2d7b1a66826d28d50ad86c0b2c8a6cf"; - sha256 = "0bg5ax66fsrqbr4385fh1klljrmh3ycrda8fzk3lm9wggf0z93js"; + rev = "d035ef263a75029b0351f2be3708ec2829e2a3df"; + sha256 = "0zj44bcpsxdmxy36sfdbcc9587pasqffwhl72sjz943rvpxngng7"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -2579,24 +2603,24 @@ final: prev: hoon-vim = buildVimPluginFrom2Nix { pname = "hoon.vim"; - version = "2020-11-09"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; - rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac"; - sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js"; + rev = "f287adb9ce5f99a2a8b806833ab1582ba162aab0"; + sha256 = "0nlmcz79qcmrkfji5mdc66p1pxrz5i68m50013fr66zqcccnynjk"; }; meta.homepage = "https://github.com/urbit/hoon.vim/"; }; hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-01-09"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "f418a3750ed3a7f321287a39d2c9a56d8ad630aa"; - sha256 = "0imscbnaw02cgxn1qh42zz8divnv43mgccaq4hrancnhixr44lw9"; + rev = "75f73d3959a0df7ef3642fd5138acdb1ce50fdc8"; + sha256 = "08yvjh70saffnjjxdhis9sfcbkpmbgm8jl3ax0qal41crwrv7ibb"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2819,12 +2843,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-01-17"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "08ad42efed82dbb7547fdebe2acc194f50e07854"; - sha256 = "16acd976d44whpkl5bypskpf15a6mjf72pijjbg6j0jjnd2mm9qw"; + rev = "32d05f7742dfb0ef84bee99e059ac3b7cb9526eb"; + sha256 = "19z9i07w3wgf939fiy6kh7mq5pvlay3w37sm0sv4bmrdi42p8b4z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -2892,36 +2916,36 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-12-08"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e4972997fb5aee1c180e9840586a09553865cc20"; - sha256 = "11v9fhd7i9si5psnsrvdgrih64rgjjy7ypjlfz9ys74rcryfyy5x"; + rev = "a630e12de13db03313b88d6983cbbb81398eadcd"; + sha256 = "08rlj48cw7c9cslrkpiw63fic5yw8vvls7ifcw48m1bhpibxfmnh"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-01-23"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "7a3442f416174665e9114d617a9a366438bc9f3b"; - sha256 = "12nilfk56va7y93yvi6nkh2fqw1a4w7bhzh085ir0kss66nma1bp"; + rev = "e3a1037905c27a04b1725dc4d4006c4408bcd198"; + sha256 = "12328xrsdhcysxs9ww97ngf134ibcsalf2a48c7z7bd48s8vajj7"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2022-01-21"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "a190d052fca4ce74ffddb1c87c87ccf15f9111d5"; - sha256 = "0p2hyqv73gn1lrzf8yi84cfj199jx8ix0llm4jykkxlyx3qprwq2"; + rev = "83706980d6ed022317e45f7965c9393e0f4ad96e"; + sha256 = "0vipzqnscx2vqxskibbf0jf5ifrmxcwgz4ynahqgqg12z48jr4k2"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -3012,24 +3036,24 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-12-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "5626a1f71bcc2dd7a74156f22c53734621c12433"; - sha256 = "0xr76yf5wm4mggf5993m5sywim08dg3qsgx84xck5zcqiz84i3q9"; + rev = "18dc0d630250c3d3b8cb4139bed53327aa4fed50"; + sha256 = "0cxvhinwd7afsy8jxy9c6ql9ybv1w0m8xv4dh5sl1bpybf8dsg96"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-01-24"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "4d613c6aea73be9b8882d5710b11f502ef8692db"; - sha256 = "16lcr9bbiq33agd9p1cwrrxmzsj3xmva1lva8ay4zrm1v2v45jn5"; + rev = "4997c8d12a05c3e854208affa1c83914643e9834"; + sha256 = "0m3lr88cbzw3c9yw3860d34nmjb0bwq80cxa8sy6yya2hzs8c4qm"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3132,12 +3156,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-10-05"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "61c7c8668b80537aefa69654a6e5a5e63095be61"; - sha256 = "0aa7cwzaqzma1w5xyvppj6g3i8kc7199zwd4nhc9ydx9isn885sh"; + rev = "81c3ed800ce24bc09802899c1dc0c0b4d8d4f9b2"; + sha256 = "1ahbd3l2jjjjcwsvjlbr0q4vhhlsngz9jwvmrkl5a7q9c7h0y7m6"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3168,12 +3192,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-01-21"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "428051b2e5212cea914510eb9eb979ec06d5b2e1"; - sha256 = "01s3v3jfmgyrmwkifnyfh0wlm1d5fdvfvya0564y76bj4sh2lpzw"; + rev = "b04fc4e129512ce5ccd15acfe8388a898daa0a2a"; + sha256 = "0a7bz8v0lh8myj39vk553gkglmk83smqc3nylfabqyxkij1gmdqx"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3228,48 +3252,48 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-01-20"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "be1c8d67ef80dc4cdfc164d3a95a45d8d551b3eb"; - sha256 = "0qqyws79a4d4kn1vgb7p8iw7vlx2flb3ra2y2xvjilyvzz4ppqrq"; + rev = "ba1a0f49e71849863b4212ca0ac1974aeb7c7032"; + sha256 = "1y55p429rd7z8jph30ils2g35vmqam4qk1ii9s88jwfl545g7qga"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-01-24"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "15014fe3855848ebe48431c789d8e8ec2e9efe34"; - sha256 = "1xwysily6lh8z9wd8g983102lfj4543dpqzfk7cr7zqd864qj951"; + rev = "b45b0c869f2a77fc6d7e09503fbeb4663cc25ff1"; + sha256 = "0126maly11irv7r51fca9zgf3yazv9knwa46hlf7pf977nc30yc4"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-01-13"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "9baa027c79abdadc0a63bdd14d248241a1333b99"; - sha256 = "0lr203px4ydakqnqavymd2f08gj5mid1nhb63rww72i7i959hz7v"; + rev = "07545e1c5bd5c081c7e28540591275cbb46b7d02"; + sha256 = "0pld9i7db4w4wqwc1nnmymfgr7miia60l1rj0pakfkgyf1g5w61s"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-01-19"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "54b3bcfd70250b5a5dc1d51d0f3653a4e6892555"; - sha256 = "0z4y7iis1fkm76ibkfln70fasywwrlrf25r3si6ns0s3wq9q849v"; + rev = "d29557a4024358cf028b706d91e3a95bd8180784"; + sha256 = "0d16jms75nm2phx4hyvqlr3fbjadllgznd5dsy53cjf0gnybd6h2"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3335,38 +3359,38 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-01-23"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "64eb5cc8961e54b2888d363bb94d551203080b45"; - sha256 = "0v3dza9mp351715i87x75zxkm0d5i7v77a5zq8c8mlhz1v31z0vx"; + rev = "42eb06b5903dc212acb03f276e6e3fd24f92593c"; + sha256 = "0mh2glx9fmf56znpnxn8y8n185pdl8hxiy00pymc5r2g2q8gjrlb"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-12-30"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "f0d1552890e384f15b47ea88bd1b8a077cddc24a"; - sha256 = "0wnkwh132cxnp9ppxlxrx87lykizx9mc00hg0zdvgys2h51kh050"; + rev = "93e98a0c900327ce7e9be1cbf24aebbe7170e375"; + sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2021-04-25"; + version = "2022-02-08"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "tami5"; repo = "lspsaga.nvim"; - rev = "cb0e35d2e594ff7a9c408d2e382945d56336c040"; - sha256 = "0ywhdgh6aqs0xlm8a4d9jhkik254ywagang12r5nyqxawjsmjnib"; + rev = "d8073a0e4d19d71da900fb77dcc5f23d72bb8707"; + sha256 = "0f5qzi9kk02z6siqzwz2zak687zb4q2nkg66x3pnnqvhfqazjb5q"; }; - meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; lua-dev-nvim = buildVimPluginFrom2Nix { @@ -3395,24 +3419,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-01-24"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "9208bae98fd5d1ab6145868a8c48bfee53c1a499"; - sha256 = "1dz4kg3l79d128jgqs6cs8ikvr108z46ijv36wq7pw3dam4ybnaw"; + rev = "98dc2dd3a2a07c251bcbd43048157aa56f901402"; + sha256 = "0c3q0ggw0qdi5b0mcvksps0v76rk6p7vcz1dg6c4y67irfjsd21p"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "59576a5cf28556a393eedfe38467e998288fc905"; - sha256 = "1bwmzvsm9d6ilq616697rwk3j29i0q3nzwdyapjyxdyhp9rivgsj"; + rev = "b993af2bd38a60c815768c6ddb250010ed8a1a4f"; + sha256 = "0bwmink8j8pgnxs2csskcbry46h5hl5iaqcdmm6c01ds6dcj1wql"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3431,12 +3455,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2021-11-06"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "57e9f310b7ddde27664c3e1a5ec3517df235124b"; - sha256 = "0y38id1dj15snx79sazh0kvs2c3jb1h6kyzr90zhm0130m7x6nri"; + rev = "218923092bea0ba1f7cb5552b68994f28064b154"; + sha256 = "1dmnmvavljy4dh6f7fvpwf6a2zl2rj9aq00jz57l1w0a63fddpcd"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3501,6 +3525,18 @@ final: prev: meta.homepage = "https://github.com/Valloric/MatchTagAlways/"; }; + material-nvim = buildVimPluginFrom2Nix { + pname = "material.nvim"; + version = "2022-02-07"; + src = fetchFromGitHub { + owner = "marko-cerovac"; + repo = "material.nvim"; + rev = "a7c9069a55d136e6dc62fc107cb996df2eaebb55"; + sha256 = "1qblxq744ldzihb57b62ykjci19fa2v918610g8jb36gjrlmxdkd"; + }; + meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; + }; + mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; version = "2021-09-13"; @@ -3527,24 +3563,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-01-23"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "a89d87667eec94915121d8f5caf199f63f9ff81d"; - sha256 = "0l6k5djgvhkl7y86g7wmaxs0yq5nv0g6aa46kjjc81lvycj9qg3m"; + rev = "f2ccb9339c979968b19db48b5f8b31c6f0ee7481"; + sha256 = "0f7yw2mjdimmi70liya75wnbbrk37xi2sncpsg0awh15sibynq05"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-01-12"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "e5707899509be893a530d44b9bed8cff4cda65e1"; - sha256 = "0kx5xdakwv9g8fhhc40rz2c0as5pjx46ymdw09bc5h1nnhwkgp8x"; + rev = "c8ea2a5550b95b007631bc83908c48a3368eb57c"; + sha256 = "08amdbn4xcdl7d09w3iqgrlyfmqnxlwmnild9q5mpqh5z372y6i0"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3575,12 +3611,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-12-06"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "a6fc41f7630e675ca5f0aeb829ad1b88c73a7c63"; - sha256 = "08lls5zzlzglxx7hw19vid4kiqdsdnwahgw306vhqlhhx8wc00w3"; + rev = "c073406d58472a6c98206a05307d108a5a727e61"; + sha256 = "0ymg9gbw7a6k1lkm1w789z3vp5pzmwjx2vsm5n00jsz5lq8sv5l0"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3851,12 +3887,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-10-25"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "ac084414cf1e0de86f5abaab6269b940806e8c6e"; - sha256 = "0456mvm8yzpfcfqrn9affj8s70bc2r13q07hkrlmix7d0g8mwlg7"; + rev = "4b537fa01c28f2f7cf249722530561d2e477b49f"; + sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3887,24 +3923,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-01-17"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d31b4251cb9985a2c21e6c6dc53decdc48954680"; - sha256 = "1j8h9gv3ilx42gm36xh9z2br3hzakf99z49s08cwfy5xvfwbm2ds"; + rev = "0d665b05efa344977208c230f164440e3a5ce52f"; + sha256 = "1ckz7lrnwgnijf6mm6dxamqhwkr0y0wswc5gcm3np37r58yc5mbh"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-01-16"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3086635873ae37fc8e28d7de55c2969682104a7d"; - sha256 = "1kff4hzgvp5fplzzi4gkmjc99mn5h414c5g1i6i0kddk4cpmhh2z"; + rev = "c8a320359cea86834f62225849a75632258a7503"; + sha256 = "070ji1x52hj0xnmxhdncwq78fybpsvak6b8bdy19rf7grg3ddrzk"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3959,12 +3995,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-24"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "02b185ff04083df22d8d1f957eaee9d1d50c6684"; - sha256 = "1kqcnyk8hb80w4ngggjmhnqnpmks3bzb8l0sqh3vdxzpz2d8bpj1"; + rev = "d3473a9bfdebbd042428d895c84545bc85124159"; + sha256 = "0ahijwjp21v79svgx44dlx5x69g6nh0qv9xi0x9markxj86660yz"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4031,12 +4067,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-01-21"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0bca6a4382e7cc5e26da8dce49e7f69abfb0e998"; - sha256 = "0pfrmzcs4vkxg74hzrp8g4kwb33m1r503c0b1yq25z33scqwc6hp"; + rev = "88bee216a0b1429d6301faa733712da84cf0e650"; + sha256 = "069y6ji6xnanzy3ad70lcgn5g3p2nxr62qn08fdhdrq6a75iz3ys"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4151,12 +4187,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-01-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9c536aa95f80dd9f5eb08da8499fc5f6145407aa"; - sha256 = "1hcbzwyqr5zypl6v9q6b2c2y7zjvql84mc2ip07066090v6l3qx7"; + rev = "90e616ac6ee2363577cc54f87c50dd958c2e32f9"; + sha256 = "1x87d69fypz0k424xzd8vy1x4lwhgb8hkmc7mybl4bqfdwi00fhr"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4211,24 +4247,24 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-01-20"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "2ec29eda54f5bbc8856794361847729b0f724095"; - sha256 = "1fz30h6nvgy71yc6ccn6m8wbc18kz29xm11zmsxc1qlp0a6j7c59"; + rev = "498b99c87a5826bfe4409883831deab91ebe296f"; + sha256 = "1bhbk87wrjyk8mvg9aqspag58sz9chhrxvkhblpy2qypgla0s9pk"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-01-14"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "b97cc5faafb10edd8fb5b261423b2f917ba43e1b"; - sha256 = "0b1643j492v7pm9b1z6ana3pjvaf4dqz1zvbqnl5r0bmkl2bb4m4"; + rev = "300e13d542359213952bcaf7ffa22a976fe0a739"; + sha256 = "15l56b9hbwymvbg1mk12i5a34fbrgpdl53nxrnh7ra96is2g2gyx"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4259,24 +4295,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-01-23"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "0d603c19171fb2e127bc128e9229d48340a6beeb"; - sha256 = "1d6j3syv86afj0cpfqy8jcwj8pxm53wa1xjl76f1j5h7y6ba1237"; + rev = "6f803e88093573f73d4ee6c0dfe0575df3f97a9f"; + sha256 = "05napd3gqhdpb2x07affs50bm8prb3rzz0w5a39iyr40y96bpjix"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-01-23"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "0adceda4fb3fdd25ff015e68ebe176268b12bb2c"; - sha256 = "1nczxn4mxnl5qylzg0kmd7jbybf856x554xv83kwhjv4zzwpaj84"; + rev = "f8f3932fb2abaa22e2536b5ac6ef1253a76647c7"; + sha256 = "0h5q16i2n1rssml9ws5rvkmg9gslsdfw69asdq6rmr11w5kihyf9"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4331,24 +4367,24 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-01-16"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "3720bdf0d651bb579ab0f24f889246862fdf8b00"; - sha256 = "0x9agiyh5zjsa462bw3xqx2vnmax8qpidwd7w72zjig0hmhy34hs"; + rev = "5f34bccc232b687309b32b53bdf1aab73beeec2b"; + sha256 = "0jds7m7l5d75yi8y1rwrg3zbrjy98bayr8ryv83haqzh36y3wwff"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-01-20"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "88ad98547aee3ac7c026c9e3654532e62cc7f1b3"; - sha256 = "0mcwzp7g631cg40gn8zy5rblqdwwrdrzgp3byaws47cgsmldb3w1"; + rev = "aaa160d4423c6c0029f91af85a7e1f092b1aa966"; + sha256 = "07n78gwj8q7mnw6rnzsmnl6cl51g5harrzn2g3fz6rhpr2f1hlwz"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4379,12 +4415,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-01-24"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "27123b1297e37109bdb2fd0cd4638621b0eab65a"; - sha256 = "0wn1jb9pfq541k7lq6qm6434p5vgd6bj7f374rn56x93nxlll1g1"; + rev = "a7fea2ca9f29869c75c3e2ccb683e7740868ba8b"; + sha256 = "182w3ms4j9fvw0h0k2q019a5yxjg3hn88yybwk4r27l1mc54jycb"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4463,12 +4499,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-01-22"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c9a58267524f560112ecb6faa36ab2b5bc2f78a3"; - sha256 = "0sga5dv5zrm5cyxk0s3dp9avpx7j9nag8d8jv6bgzbq772szbfwf"; + rev = "ee39d5d570d07161e16eb73054c295c6561eb2b4"; + sha256 = "0ybh21rzmrvs0njwdg0kw6rlbwhaiwkq41gj8iban7nrfn36vydh"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4547,24 +4583,24 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-01-19"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "3c0a1b7fddd63620ffe6d25fb85cb71ef68e0bd3"; - sha256 = "1h7h8r6sfi6kzlr0n5wwrlda3whraw4128jr0djh9jjfywhnlls0"; + rev = "6afd8f7a69e7008dabe048d4fb1ee8e467a72fdf"; + sha256 = "13pgq09sxhfxxmrrqzc1f8b119f6d7yyx30lzbgr2vx59bh69ph2"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-01-06"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "1c52ff7e3dcc2b89897a16bea7b9903888656154"; - sha256 = "03x39hdnnf81qmlhwg9czd9dda6j2df6w685n2x15x01ghg86h1h"; + rev = "60ea878d3f25155f8bcccc2a2f86393d2fa2ee10"; + sha256 = "1ii7ajxcjznq030q7xydx995w33whb88vwbijsihmgd3dcakjr4s"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4583,24 +4619,24 @@ final: prev: nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs.vim"; - version = "2020-08-29"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "nvim-hs.vim"; - rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6"; - sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x"; + rev = "d4a6b7278ae6a1fdc64e300c3ebc1e24719af342"; + sha256 = "0a4sc2ff67xdqy5wj1j384vrsbnvhcd15mmwv7yygd7rccc2wsxs"; }; meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-01-13"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "2cceff656f2bfac38da784f2cd4b202a64a2faf3"; - sha256 = "13sx0rwz53rf8yg4ndc4m9fgvxa2xs46y92yn8rbgrjgf4xv18xi"; + rev = "e2a80d5f51c326d6623979d614dd7968ef752061"; + sha256 = "1m8sc88g8sk41m4ml62zn7dn05q1ns8xr20c7bldqaz9rwqbhqny"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4631,72 +4667,72 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-01-24"; + version = "2022-02-03"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "e83f80295737e8f470329d768f6ae325bcd0bb23"; - sha256 = "12b78p8lw94ixwgcl71chwssi6li7q46aj0ahdna9v77hk2mlvc8"; + rev = "8da4d0e14a40e616a73a358f516794cea0fa31f1"; + sha256 = "06h5mq4jq0i15lvwbjbg4cv55kdva8scvad8shc29bpcampq162d"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-01-11"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "fb2f9d86c036b52eaf6b7901e36a71632ceea264"; - sha256 = "13ddy2g3dlg1b9wy08bxkrq2bjmqmi4xdddrwad7jv47fwpmwgrb"; + rev = "337e4fa31d88e5553edeb05ac572bacd4a24d867"; + sha256 = "1xa2zxyqfgzp4zjccrjnj9djdb4f4i9gr2m4gxa6cqz01b21xwmq"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-01-24"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "12a0d3a81af173a330c957ca51b81e5f66144ef8"; - sha256 = "06qxdr8dzc7i9fvn9yyjnb1yypdgj35dppivx8752c8czd5bmshw"; + rev = "2008c5cebf2b84c5e5f8a566480b022ab2e7ebab"; + sha256 = "0698i51s6dgcanw1iz9zhb8hk6ls2zrvas4i8sqpw7jwr9vnygah"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-09-28"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "aaaf8c12771e905e5abf68470d8bda3e80536a0d"; - sha256 = "1iag2ynp2yba5xaw4z0hnp9q6hfcrvjmkhl4js9hqhhsrm42c2vh"; + rev = "ae1a4a62449863ad82c70713d5b6108f3a07917c"; + sha256 = "0xl3crhgkzmas8zdcycgk11am3wx0az4jh7fh5n4lsjip8895p4s"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-01-19"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "a07ddfb8bc6fd3626b0441ff7fe52be7221044d3"; - sha256 = "0kmpkkqvl5x3wi4byq8cfn4y9lvwdkrj2qwzmf1drm0sqhaqrs95"; + rev = "ffd1a3bc198b168b9bb5e777b26f11d8fa864a78"; + sha256 = "00lzypb2zrpr1w9jyiw4vad3sfr4ki4whgpg8cr5m9qzamwr87bs"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-01-09"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "bfd6503ce5e2949e17e4053ca00b9e6836fe94e7"; - sha256 = "07qw00rk087p2ipp4p6k2wanqca0zhwd050n103lld42kd1lqci0"; + rev = "841021836ee00e7da6dbad819508e384f4e2362a"; + sha256 = "1qjwyicpvbp8396lby62jd9fj8yh2dak5kk1vf64ppjvdf038hpd"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -4715,12 +4751,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-12-30"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "15f52efacd169ea26b0f4070451d3ea53f98cd5a"; - sha256 = "1ixdckbmz6c54mm3mhkvh59ahfg5wc3h0ybnrp64d0bzsi3jngjh"; + rev = "27f3176b950dc803b61c29bd007e140c232544e5"; + sha256 = "1b4s7vcr1d2d6jnkbsnybc55fmwgk52cdfqsm8x5m37fbwn4k6dq"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4763,12 +4799,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-01-06"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "4a4cf2c981b077055ef7725959d13007e366ba23"; - sha256 = "1aa062r2p69kn2xr9d2mbbrs8qdlv0q86lah2q9h6jhzxfi5ccdp"; + rev = "9842b5fe987fb2c5a4ec4d42f8dbcdd04a047d4d"; + sha256 = "12ww1yqxsk6qm6cimgr0ljgc98n831dpm711q4xqg9c6wm0pyzg7"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -4787,24 +4823,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-01-21"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "2dfed89af7724f9e71d2fdbe3cde791a93e9b9e0"; - sha256 = "1842c6s3q8hd8cnnyniwjxkkl48zzdy7v2gx20fiacnf365vgzpc"; + rev = "b54de4b48a2e0481da8fc502e6e2a5cf5e4b0ba2"; + sha256 = "0svlmm58w8c6mcqlx8gb47j6sn0z2i4rx9fpgihhhkk7pvjhinwc"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "91fdda9b5c3896b4b630d98292d657afa00bba2d"; - sha256 = "0qknkalnsjbyqfi9kgmscswwwck40vpwwx6cbrrk4pgkwykabi21"; + rev = "4990db79a87f49e56a3a1bb8507926ebd52ec4cc"; + sha256 = "0c2wpk1bc3ga1m54s4kjmlskv3l2rkgf83xj1alm1rfgzwhl38vv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4847,24 +4883,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-01-23"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "1ce9933a1be6e16f788d51dcaa9602accfa25030"; - sha256 = "120gqzh205sx26gadilwawx761s6ibyzkbhwybfdd2f1fq832pag"; + rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7"; + sha256 = "0221ax71334ghsr8xznp9jk2iv9r0bin47ch8r7hsfh4r0wgc5w7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-01-04"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "32bc46ee8b21f88f87d97b976ae6674595b311b5"; - sha256 = "1daqlkr7a53g3rcmjdw2z2fnaqb0iz6dh5g1laddv4ni27ifm5rg"; + rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715"; + sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4883,24 +4919,24 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "38eb126412723fa4c3bfd137c1a3a811faf67eb5"; - sha256 = "13igbd268z0533bsrz0r8s69lbryh0h4w33cpywmacghxy672jjl"; + rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af"; + sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-01-18"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "634e26818f2bea9161b7efa76735746838971824"; - sha256 = "1pfhaa7xx3r4nq9bz3zj8hb1qbh5rjhmlxn1f8l7ihvbhb0s0f6z"; + rev = "e3294f687626b40754bb40ac2d636d166098b2fb"; + sha256 = "1lajkfxpky4f9bprgbsik6i9n625rbq6gpazfhwy8d9dp0g7c5m4"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4931,12 +4967,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-01-22"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "47afb03249e36cd740bda79907c0f279f4e28544"; - sha256 = "18pbdp7ci5gb7i0als4rgcr151rbm8j3mc0pxc9h4x9cvxdl8x5f"; + rev = "07da9b402a3a31659cd0418d0a84dba0b1b8dbbf"; + sha256 = "1ccsbx9s7ic85mj1ls054vzw9isi7pp1caf1cb7ki5p79sr0drxi"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -4979,12 +5015,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-01-23"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "33224362e20e1b3e87eb7ef2d669de6c60e727db"; - sha256 = "0z163sfxly71bypskxnph9rwqamgp3h01i24va9n41wbbfvr0pw3"; + rev = "9b7902d28c6d50c481e5b46209ef0ebe5b78990f"; + sha256 = "1gqrr9kc7l3ibdwacmfwqz7vb80wdrxzsv73g59l8vhp3q6m7q7a"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5027,12 +5063,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-01-16"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "55846471df3c6257cc2b4c7ad6001a55d52e2c34"; - sha256 = "179wwb7b65yyh345a5hnhdc10kxchddzicdlpiqkvy77rbrxc65a"; + rev = "579f0a552154677ebe5a2f4a7e97f551967da998"; + sha256 = "1g9zbylx8dvall19yxlymrqqp6bk24h5xs3z5a5i0dkwjvnaxx8v"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5075,36 +5111,36 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-01-19"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "27c4083e29702c8b4fa5e314926ae054eb4c0dc2"; - sha256 = "0vl95ywln1njxi7593gf2jp8y12fi6mwz3xmc8v6vd012vj4lbnk"; + rev = "f339a7f87e4736c0a3e0db563b8c3cb45fc00a61"; + sha256 = "1raicj3h524csqivw9x3l6znx5y7dwfn3cmh2hzddfy0n7n1mph0"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-01-06"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "c862335f303c631f53a642a1ea60f15634c720fa"; - sha256 = "05n17r2grh25d6srb5lwazj790xp00l3jsyjc0drf4npyd1m424r"; + rev = "139bcf19837213d4e5d541b46f79390a75e84701"; + sha256 = "0siir143hkw87dzkmm64fdyq3raqd9k50wppjafnvdz6i1pgb7nz"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-01-19"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "7182f0ddbca2dd6f6723633a84d47f4d26518191"; - sha256 = "1v9d6r94hgki1i8dq605w03d8kqfdqk589xsaxxfj4l4g6jmrsxn"; + rev = "8551feef9030edf364188c26a6db797f827cda77"; + sha256 = "060wjn7l518fhg35jqvx0m526qkvhrvc9n778hb3blnm19fj7p55"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5195,12 +5231,12 @@ final: prev: plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2021-12-25"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "dbe57599bc340d7726938b624438779fa0ec2929"; - sha256 = "095j1an00187ampxklwd6hhy05xzz7ssjwkgdsv06ydx7a1kn8xk"; + rev = "32428a7b7bc1f1f4efe54490c212a7bda5dd073c"; + sha256 = "06jxfr484wa563hs5qj2g4i37a6mfdvdjdn7a72dmbqzismvzd48"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -5219,12 +5255,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-01-05"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "563d9f6d083f0514548f2ac4ad1888326d0a1c66"; - sha256 = "1i4sj56fral52xa2wqzx331a6xza4ksi0n6092g6q93kxx202xwq"; + rev = "e86dc9b11241ff69ece50c15a5cdd49d20d4c27c"; + sha256 = "1yfiqkvk71i68hha2xdikfmch9qkn0di9gl14x4b9snvcf6l9plh"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5268,12 +5304,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-01-18"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "a579a3906ed2cfc980aed6046047ed2ebe4fbd74"; - sha256 = "1q2gkdng7r386i8f04py3nhh5hy9vl8mj59c01v2i3iwix78rvf8"; + rev = "ebdf23b9b180c7f162e3afb4a250c313ca2b7271"; + sha256 = "0wygl17k2adbsy3pjyyb6amsrx14r11ldbqj21kmkjq289n58f6n"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -5352,12 +5388,12 @@ final: prev: python-mode = buildVimPluginFrom2Nix { pname = "python-mode"; - version = "2022-01-19"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "6d81349723fdb6a7ce03b27afa8ea88819f3c0d5"; - sha256 = "1cpmjg8867qmir79pd1zay63ihp2jzd8f1igxq2954q354bk08br"; + rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; + sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -5389,24 +5425,24 @@ final: prev: quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2021-12-28"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "4371a23bbb3b687e49c42a2a4379d17fc5c6a9a3"; - sha256 = "0f625gmrs8zk622b1a8hhdxwx3c7hnxxznr98aqbxik6924rmr8g"; + rev = "5e2373e36d774e1cebd58b318346db32c52db21a"; + sha256 = "1dqygvc1gr35niqqdqivz5vgqpca9yj68incq3z73rl9qya96pvx"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; quickfix-reflector-vim = buildVimPluginFrom2Nix { pname = "quickfix-reflector.vim"; - version = "2019-12-11"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "stefandtw"; repo = "quickfix-reflector.vim"; - rev = "8e9c05a110b80ab66fc8bc3d5fe9e6fa168aada6"; - sha256 = "1i8453z3s0xmbmbzk3kpxwvd42ar9v2m2gjqic9k7njpxw87czvs"; + rev = "6a6a9e28e1713b9e9db99eec1e6672e5666c01b9"; + sha256 = "0rm3vks354g36rc7lr721j7s0x0vpnqhyvc1nhchkhbn1h1yd1ry"; }; meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/"; }; @@ -5521,24 +5557,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-01-21"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "4f63e903fbcfa5d17fdbe6ae9b03e0b09ab5af89"; - sha256 = "0krvp2q20f6iwk33www097c2i8ah9pls6j1lmbx92n437k6sj5gj"; + rev = "1c77bd656b4802d890ec3382e438e45109e2b862"; + sha256 = "0s1zhrnrkzb1xc3mb95930w31kad0vwff78z8ag2liawq10s2yhb"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-01-03"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "3a8b22157ad5b68380ee1b751bd87edbd6d46471"; - sha256 = "07adb9rrcy4vr0bhjn4h8r1si0xq31gdpwr4l9lypfr23b2pdm10"; + rev = "941a36e99bccc48fa9569a03b02ec95fb9c5222c"; + sha256 = "0w0n3210c3j2jpvx0jf718in5hkj7vczv9n1qnls2f46ljwl1f5a"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5653,12 +5689,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-01-24"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "876089969aa8ccf8784039f7d6e6b4cab6d4a2b1"; - sha256 = "0j3gi150gpj5m0i4kklcwjgrqk6fqv1ha8wh9mlhpjp26i68ylb6"; + rev = "3962fd333e729ecd06639d220a6a4e99fb71151b"; + sha256 = "0h0di5ibnlxiwvvqwqfz3zykc8mqg1w8vhd1h04r4626ira7s5rw"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5701,12 +5737,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-23"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "c9d7de2dc3dc23d2bd6d3f1d147f40ee4c016f79"; - sha256 = "1va0zbhr7j2hym6arg4nfdgk30ypsw2k8nb6j3lfi1fj41l3lmr4"; + rev = "73c15bf820f1a94b3f1e52484ff102667bc1f987"; + sha256 = "0n2q41k69ljca5vj2kapgwffrxk478lgd7l2yg8rsd54jsav5w7q"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5797,12 +5833,12 @@ final: prev: Shade-nvim = buildVimPluginFrom2Nix { pname = "Shade.nvim"; - version = "2021-04-29"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "sunjon"; repo = "Shade.nvim"; - rev = "0196387bba50b8d36cec99cd6483583ff2dedb42"; - sha256 = "0831k71gm8rpl54x63v7mgp9i1fgxydp2wig3yyd98dc7z9d8f48"; + rev = "4286b5abc47d62d0c9ffb22a4f388b7bf2ac2461"; + sha256 = "0mb0cnf8065qmjq85hlgb4a1mqk1nwl7966l1imb54hpzw828rzl"; }; meta.homepage = "https://github.com/sunjon/Shade.nvim/"; }; @@ -5918,12 +5954,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9a2ac50100b22599ac625484a76f192dfd80e2ce"; - sha256 = "09qn6f898qvpxpn3xy0z4l7j5b84v7pd1b237g1xh3lkyy3xvmzg"; + rev = "73622eaf3764237d32395b2b589fa9231eb44b83"; + sha256 = "0xd6kzc043bmf27bs653d8q8vkdlr33ja0k63vmikz9vk91w3czb"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6051,12 +6087,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-01-05"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "824de25ed4b115922190838d7ad40e2f933f8392"; - sha256 = "0p03535njy5c3cik2l8ajfrrmi8pjr0vj53ydbay9bjb97mrnxfg"; + rev = "2f0fd5fe6e47e7fe2a6de19a4b56ea4f86947780"; + sha256 = "1fcrn6f05dabk6h4c5xhfczcr7mdg1hqnraas0021cr03lgnf63w"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6147,12 +6183,12 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-01-23"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "blackCauldron7"; repo = "surround.nvim"; - rev = "b0105011437ab148261b5c4ed6b84c735c54cd61"; - sha256 = "1bs0ba29pfxvvz8j5qpam6mxch4b40idlpq7l39rsanrxyxl81yf"; + rev = "549045828bbd9de0746b411a762fa8c382fb10ff"; + sha256 = "0dw10lk7vd2axdd8kf532x9q5hrj6b8qcazni456qy2vrbipyx2x"; }; meta.homepage = "https://github.com/blackCauldron7/surround.nvim/"; }; @@ -6171,12 +6207,12 @@ final: prev: swift-vim = buildVimPluginFrom2Nix { pname = "swift.vim"; - version = "2021-09-10"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "3278cf3b0522e6f08eaf11275fedce619beffe9a"; - sha256 = "0hhi49iwkgzxhdixj0jbc4mbgad1irb056ijf7l5022r4k4gs2n8"; + rev = "478e11812f3ddb1778918bd243d8b27c9984ab26"; + sha256 = "15kqlbp1spkbkrgaa9dwp7dbdppncq059cps1qljpqp49qmgay2l"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -6244,12 +6280,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-01-20"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "251ab5f24cc376daf488b68e2d46a219854dcf5f"; - sha256 = "0v7jdrsyx754y13zwc6cjwqmwc4ic63ala55sxpa0bvsyx63cvdh"; + rev = "bcb474cafade81a7fc1ecab4bd2ceda6fe359e66"; + sha256 = "0mpawhqhnva3xqpxq27amd6hr0nls3zsxxwzb7bsrkzk4lc2p1kj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -6305,12 +6341,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-01-20"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "88242397b4d2fc03d20db189da84869ffbc31b64"; - sha256 = "0x40nvkm64zwpifbm85ir4n96pyqwv6rrkdrl4a4k2rg4k0b24d1"; + rev = "a0343f009025c0457edc92ab83b5a8ee5626d114"; + sha256 = "14lqfkp6ldrdr67r2s5zjg9kml3llirsjbcvsczs0wmwmdl8r7bp"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6377,12 +6413,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-01-14"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "9d1740d335a4ca1da0892369c02537a8523fd8f4"; - sha256 = "0vkakb7xf6y6yk3bhfaj61ayldsxrn3mqnch4qind2vvbnjsr9si"; + rev = "0481789b0ba59d0b13f32a33f6b1b844f829f412"; + sha256 = "0mnxy4fvk2n5qqvqhblnflyqzjd6z8w9ifnajfilzzrdfbny87jf"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -6401,12 +6437,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-01-20"; + version = "2022-02-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "e65a5674986dcaf27c0fd852b73f5fc66fa78181"; - sha256 = "0h76cc7mn7wmdhqk5bdgkaz3abvk15687mqkkp049xsqyjkfjzb2"; + rev = "924f5ac716bed3bb9cd933a3c96aaba751ee81fd"; + sha256 = "17l0idp0z9h9r3svjpcy0rvmhgddr6pbsc4d2v4hqp3qkazn32ha"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6462,12 +6498,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2022-01-21"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "36df6b281eb3cb47494933a3dc44c874086fa688"; - sha256 = "1lra7c38m3amqgdlb4gnl3rnvszwzn0yv624v2h4lhax8nzzq85j"; + rev = "b46686fd5a928aaf5d433dc9e2aae7d26453f530"; + sha256 = "1dv4m8xycqq1npc99m5mdv4vh6dwcgf6p7nh1lk82kwyhz1rcw8l"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6534,12 +6570,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-01-18"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "0011b1148d3975600f5a9f0be8058cdaac4e30d9"; - sha256 = "129cha5pwr1blnkyvkl59ildap0zdvk2khajmvd79fkcncgffvfi"; + rev = "f262e7d56d37625613c5de0df5a933cccacf13c5"; + sha256 = "0gi31w0rpd14zmnnc883hji7vf8hi1njdprhm9lk3n6pslipgfmv"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6592,14 +6628,26 @@ final: prev: meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; + tex-conceal-vim = buildVimPluginFrom2Nix { + pname = "tex-conceal.vim"; + version = "2022-01-15"; + src = fetchFromGitHub { + owner = "KeitaNakamura"; + repo = "tex-conceal.vim"; + rev = "93ae39d9222b0892684d02324b85ee9d3647bf8e"; + sha256 = "05nqqfxkxd8f9xky9mnfxw9g16z1005ka8zxaw52i0n35dg4gg8y"; + }; + meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/"; + }; + thesaurus_query-vim = buildVimPluginFrom2Nix { pname = "thesaurus_query.vim"; - version = "2021-07-08"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "ron89"; repo = "thesaurus_query.vim"; - rev = "65e67a2dc3290d1fbed59db2a3f58944a73e7251"; - sha256 = "1hak0ncsq43j0vblcgy9y4ylx2lazhij71sm3471cgini42klmgp"; + rev = "23d8aa3f7d1a785e31e760e1b6b3b4c18abf8332"; + sha256 = "0mh87m2jimblmdkfw5hr07li3zh2zmvgp23izc79k1i41v4yffsi"; }; meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; @@ -6691,12 +6739,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-01-13"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "f23866b8fbb0703be4e15d50c814ffe496242a67"; - sha256 = "0rvsba0zr3d35dxyjk99shgn7h15r93diwnga1k4s9mcxg07fsmm"; + rev = "d2ceb2ca3268d09db3033b133c0ee4642e07f059"; + sha256 = "0ijmx8rsf8v4m32044bfzprlmbsnlphjcrzvh3jryf6sc58spx6k"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6823,24 +6871,24 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-01-24"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e12dd76d4a4d9d18c985bbafe8b6a55f7f8ea917"; - sha256 = "0i64rrg3q8w80hskwxsbs1a1nzbkbbwz5vs62dpd6vbi02ghkkzg"; + rev = "2a06971ba1a5b3b4c0cbed996feb20d5662fdc43"; + sha256 = "06zc93rw2bkpdi8kli9wfw3h8br1kmfqhhqrdc1b0bjw1zcawwxh"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2021-12-24"; + version = "2022-02-03"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "c4984fc6dcc6c4e190f2f8cd5fffb65b0aaa51d2"; - sha256 = "16ga9blahchln019nxf6iv391qf46rrcc51v9azvr3xq7k53a7fz"; + rev = "8a01863a8204b2382ec341d0203c4e9665212221"; + sha256 = "0shc1wmkrhivfvgn4ahwmn0ifa57rgjq26qlaljxznjhzsiiqxp3"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -6931,12 +6979,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-01-18"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "c4985dc3990e565ec8bcd82b3eda0609cdf5bcc7"; - sha256 = "07yi58iidmagjpa3adbc767dirhdpk87pz1gza8i9ysj95jpnqjn"; + rev = "cc6a3d9ac374078c16a49ace984d9130b307b5e6"; + sha256 = "15yl6pk9c9dal23jlfc356z4v26a84jhflw5v04y33wv57b1kdfa"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7195,12 +7243,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-01-12"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "95935e66b9a3cd802900ac2d23ccaaf70145d857"; - sha256 = "1frp3al8jzcmjhcz13drw1gh0nsany5vpqnhcihl8mqd04g638ax"; + rev = "d0c67776f27eb49cccbd58008724bd6caa00ed8f"; + sha256 = "1nnwq2csz1nvj4si3y4b85sv8rihnbzxhwcm35dawki57qnvxkpw"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7243,12 +7291,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-09-01"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "ab784d414148e16c8f6c737c14d115783da72c30"; - sha256 = "0ihw5v9rm32351ydfvsrmkq15hls7rri9d54xqfrzhrdmygyicjf"; + rev = "e9d03b12378b173b39d416df6469ca417b9cac9d"; + sha256 = "1r7jcd8q41v1v0syy097qd34ydx0bczgad9ihsmsz83bdbx51dbl"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -7291,12 +7339,12 @@ final: prev: vim-argwrap = buildVimPluginFrom2Nix { pname = "vim-argwrap"; - version = "2021-12-16"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "c5de0769d8c00817d42ed6f1b2e7ea4cca2cbc8d"; - sha256 = "1qp21k9dlgh5gvd4x393xkalzfj36rchn17rg9jy3gij88p2xmbn"; + rev = "0faba07179f96cae2ab49cf2cc22ebeb922c1532"; + sha256 = "1lb1rjp1q25gqpzbjix9anjxvx7cqw1qlacvc693f59gl8s8nbf4"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; @@ -7433,6 +7481,18 @@ final: prev: meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/"; }; + vim-boxdraw = buildVimPluginFrom2Nix { + pname = "vim-boxdraw"; + version = "2021-01-28"; + src = fetchFromGitHub { + owner = "gyim"; + repo = "vim-boxdraw"; + rev = "b7f789f305b1c5b0b4623585e0f10adb417f2966"; + sha256 = "0zr3r4dgpdadaz3g9hzn7vyv0rids0k1wdywk9yywfp6q9m0ygj8"; + }; + meta.homepage = "https://github.com/gyim/vim-boxdraw/"; + }; + vim-bracketed-paste = buildVimPluginFrom2Nix { pname = "vim-bracketed-paste"; version = "2018-05-22"; @@ -7517,6 +7577,18 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; }; + vim-ccls = buildVimPluginFrom2Nix { + pname = "vim-ccls"; + version = "2022-01-29"; + src = fetchFromGitHub { + owner = "m-pilia"; + repo = "vim-ccls"; + rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886"; + sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k"; + }; + meta.homepage = "https://github.com/m-pilia/vim-ccls/"; + }; + vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; version = "2021-04-22"; @@ -7543,12 +7615,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-01-21"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7aa3959cad43302601d530671808f1b9cd1b5233"; - sha256 = "07298d5fzsg1jyvwiqpphn9add0ihvk0cdhmsvz3zvabh32mx8lz"; + rev = "936edac04920196b331edf3a056c42e5b926c0aa"; + sha256 = "153503q7rfb58ga3hislhbn98hh7gcycwmdmdq22dagxd16zrr31"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7579,12 +7651,12 @@ final: prev: vim-closer = buildVimPluginFrom2Nix { pname = "vim-closer"; - version = "2021-03-28"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "rstacruz"; repo = "vim-closer"; - rev = "26bba80f4d987f12141da522d69aa1fa4aff4436"; - sha256 = "1pyi5akzvvkdngm577m1c1210r0yypdwsvp1y7ag6gdfnls75xws"; + rev = "43acc7c59fca861cb92cc47f01f184d9d342a73b"; + sha256 = "1q03kz5ffyz8ifxdn7bgf3r7jlqa8vya13pnjyqda15wly1fl0k8"; }; meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; @@ -7615,12 +7687,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2021-12-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "605dc002cabfec67eded553298aba21ab392ea78"; - sha256 = "1zlmibs23nyxkaj95h7z2m2p8xizvdr0i3477zs4y3lm6g0rqs23"; + rev = "27e5ac299a0714025cc46fc1da11694a8662b058"; + sha256 = "06zp45w1mxq075lrw1x2p87l4gdc5fijgag4mj7j61jd2x92xsx7"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -8059,12 +8131,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-10-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "8ace05a9a4e225d103a9c06f6d5148d0e07408df"; - sha256 = "0b3lk6z5l3bmxkh4syk8jrqh9s0d4kikna23990f3j06k141k6gp"; + rev = "ff7a1223dfc5386c41bb582039a90a262d488607"; + sha256 = "0a82c6vmdjfq1cjiakdxd9mz0ivqivrjcrppqpwch9rzp98qspag"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -8251,12 +8323,12 @@ final: prev: vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2021-07-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "ddceec6c457fd59bc2a9321cbf817e42aa4bfd86"; - sha256 = "0w0g0wjikvvah6fckay2slrcl7zh9f199safhfs875g6f8halj6g"; + rev = "5bd58732be452a32e923179673b94e5f1ed5dc9e"; + sha256 = "0x79nnscv11xdldb26j42w268bfhw9haph03l587j2pm5bnkd9qb"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; @@ -8275,12 +8347,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-01-18"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "e4166b0586efdc3ad1221afe74fa1e5135e0ad1c"; - sha256 = "18a855hhibyndfypiryl2mcz0w3jwncg35grwh4rinpl14hh4193"; + rev = "237787fe2206f8ebec1293aa5730eef71b04c69b"; + sha256 = "1qr9cf8yk6kjm3q7pgcp2pkbli31x94vgxxzd4xx7f4ssfv8l0bl"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -8347,12 +8419,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-01-13"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a93ceff61f070a095c3c712c389247a80897e3b0"; - sha256 = "0shf5l5rax465hsppswf58lypz9x80jaz74g93jlrx4xfs9k1agl"; + rev = "6c19f1ddfb74b3b21f3d1e830bee1d1ed6a72ece"; + sha256 = "0fki0z29zlzckf8a3zg82lzi0rijn85rixrpfhb732880nrn5vbx"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8443,36 +8515,36 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-09-07"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "256702dd1432894b3607d3de6cd660863b331818"; - sha256 = "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl"; + rev = "d845704e9e60e974f7708b9b1e54ab5cca6d9454"; + sha256 = "0gf447qhmdy3azkh0in66awpsk7jwa1bp0ivg4afigylq1s30x76"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; vim-github-dashboard = buildVimPluginFrom2Nix { pname = "vim-github-dashboard"; - version = "2018-09-03"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-github-dashboard"; - rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; - sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; + rev = "a639ab203418210eff3e09cea820102a53e15f5b"; + sha256 = "10dw9lmii3li5hw9sfbam8b2hv19dz6cxfkadmv1xz12cqwfdlwi"; }; meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2021-11-13"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "25f9a7dfca64787313fb4339866ff941b8974d61"; - sha256 = "0dm0nmglf7sr9rkxq4ya14pg1wrqfbv6pigj2f1hb0gf1n9bd6rz"; + rev = "28a6dfbcd96095226bee90985b7f12c5679dbbb6"; + sha256 = "051f0q5bkgp77pz0izh5mvqsmxy0rzlvriwq4j7qzslqk7i850p2"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -8491,12 +8563,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-01-20"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8dfedede1c6e27e4339411b1071fee6a40663f11"; - sha256 = "0micmffcbw70bbxcx03isrf4b4s6plz3drfjbbls7dvalws0z5pa"; + rev = "f7a4509fc1d1434daf922894f0aee140c9fa3f1a"; + sha256 = "1g0v9miazm9z9nbi3s8k5imh75kp4d1mz5q95y2aqm12bi5a7890"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8515,12 +8587,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2021-09-18"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "9a9fe186a73fce636398ee7f851466ef60c9fde5"; - sha256 = "0npqcpciq1pwm1ac6ldlyvrg7mhjg4ybrpmmld9b4nysiws97cnq"; + rev = "15c5937688490af8dde09e90c9a5585c840ba81c"; + sha256 = "07j704ysc2klqfjk3918b1kjq16pw1yb1fykdsi2a0lamndn9l04"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -8684,12 +8756,12 @@ final: prev: vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2022-01-15"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "9669226c6db7da5fe96f9ea069f9db254a299796"; - sha256 = "079mhfiqkgn789wl18xd03307k28ixyz37rx6vd2nh0gsfscwf25"; + rev = "ff16bf3bac23fb4e17c976f4e1ff7941cd686c8d"; + sha256 = "0slnykqkbqnncz0vjwhf9p9x8wi5p8xfv485wbip1njd6vqhd965"; }; meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; @@ -9021,12 +9093,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2022-01-12"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "38e491ebca229b7520480a334bb398719c8e62fc"; - sha256 = "1qsy474c2wily49lyjn34j5sin4jk2gj5pkz2cnrw6yd7nm1w9v8"; + rev = "8d9af030c8a74cdda6ab9a510d9a13bca80e8f9b"; + sha256 = "03rf49w3x67aayfn6hl0jhf4gik1scq4khhnvicp1zabdn8cq175"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -9261,12 +9333,12 @@ final: prev: vim-manpager = buildVimPluginFrom2Nix { pname = "vim-manpager"; - version = "2020-10-28"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-manpager"; - rev = "c23c02dd79b0a5cabe140d1f10f9aa2591cf55ed"; - sha256 = "0g61qbp4vl010isigp6j3jjb3vb2kxalcbb56xzfa6c9k5zap5j9"; + rev = "194607a8d1bd122ad811ef601eb04a3df7786d59"; + sha256 = "0qnm4k0frki3p9fpb6h4xnv1dxijk9aqcd7glq28c216gh395a5d"; }; meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; @@ -9285,12 +9357,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "9156bba66350d4c0c32b4ac783550c3e132d6a88"; - sha256 = "0ghlswpc0qdxidc38y9xy22293nf0hjxqwvln71gzmxjlxj3rdgk"; + rev = "b4dc23e2b0c4ce1ed77eb630bf04238ee2871e2e"; + sha256 = "1b4dz229a5qlfdigc4h0chrdb368bkskq11g6a6mc0fhnzm20j1i"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -9310,24 +9382,24 @@ final: prev: vim-markdown-toc = buildVimPluginFrom2Nix { pname = "vim-markdown-toc"; - version = "2022-01-17"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "ca8dbd38bc5c113b1dde0396cd1dae0ccb992f14"; - sha256 = "17giwfyda3clr01f29smgkkfylqc5k9ph3a4ff9bkqpf7mwf793x"; + rev = "70dd06e9358859f712cc7cf40e267fdac93cc7ff"; + sha256 = "1xin3j5ccg6j6ny9la4shknqnk3i6pf7awkg1rgxqlrd4pwcq5pr"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-01-19"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "43483d27bc7abdd8f7c8c71f4d0bbf56d62e0461"; - sha256 = "0py53inwl5csh8aa0cnldqjq73m5yl46frgylcawkx1n99q350v6"; + rev = "0fd7055cc23109f3dbb65aadee664c663a4d5f94"; + sha256 = "0w19jb52xwifiigivard7xxhfp4qjfqjf7fygk7b2bbhbrh1qnb8"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9442,12 +9514,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-11-09"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "e193f185bad3aa58446e771f8f2739abf11d3262"; - sha256 = "1q2j88rcg0slvm2bfdri4fy42h5a2md9bbqsspb3kzx5yrhgawhp"; + rev = "595ee332719f397c2441d85f79608113957cc78f"; + sha256 = "0kwiw877izpjqfj4gp4km8ivj6iy2c2jxyiqgxrvjqna62kic0ap"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -9536,6 +9608,18 @@ final: prev: meta.homepage = "https://github.com/LnL7/vim-nix/"; }; + vim-nixhash = buildVimPluginFrom2Nix { + pname = "vim-nixhash"; + version = "2022-02-06"; + src = fetchFromGitHub { + owner = "symphorien"; + repo = "vim-nixhash"; + rev = "d6e3c5161ef2e3fbc4a4b68a785d958d97e25b7e"; + sha256 = "1mrprl6mqapjzcya643nzvwaf01r38knjg9xnfbpvlidfq38d3cw"; + }; + meta.homepage = "https://github.com/symphorien/vim-nixhash/"; + }; + vim-noctu = buildVimPluginFrom2Nix { pname = "vim-noctu"; version = "2015-06-27"; @@ -9586,12 +9670,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "9485f5aa3aa8e3d8505fce9a70efecc38dfee329"; - sha256 = "13lwc63iavqpwr25knrzs5f5mn7yrq8lhmm8p1d99vd5j7ngyy5x"; + rev = "335ebc6e433afb972aa797be0587895a11dddab5"; + sha256 = "079pfc897zz36mb36as7vq38b9njy42phjvmgarqlyqrwgjc0win"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -9958,12 +10042,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2021-12-30"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "ad9e7ed29a27ac03d1f6ceaa099457e2a60ae6a4"; - sha256 = "1inr4c6vr28vkx1z67n5l4w83zsfh2g06vb25n6g7xdihdlm549j"; + rev = "a1ff5b95b4e3965c285a1983b930a4bcfd7dd87e"; + sha256 = "1zxwlsnnmq8x56gy37y66hyvir0qzaaf98fkz0d5kyv8nqqirclz"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -10246,12 +10330,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-01-18"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "6ab5f16a56f5b2361ba17a41d8644631d2b43647"; - sha256 = "1z36b9vdl8zr1r08jm43p2qys598lbxplbjdqmywkx5y78dm4hhr"; + rev = "48acdaded60c6b75fce06a0d61183ee99950c0ec"; + sha256 = "0rijq9xwm3n84vpjzyvcpy6r58y6ma2pxj61h86122wda5ymwxwg"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10402,12 +10486,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-01-18"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "b14a41a070d774c562eba7ff63e5f5f6968812fc"; - sha256 = "1997ipivg7y712z2pmaqzgav6irff3gcc5vw809k8syds618w0hh"; + rev = "65ade2453342062010386e226eaa754889e2b557"; + sha256 = "005z7l99lp89lwz7y8a2gfrnby3j2macncbpprjfmnwc0f1y9wvg"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10498,12 +10582,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-01-22"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "cbad57e5d0304198503648b5416ea28d2d1d437a"; - sha256 = "08ayp2p840fri3yc0lydic2w9gzjxvnpydrr9fifmmf3sw9fbdcd"; + rev = "851c39c38f48c47f9aa937f83cda314ab1c8dd44"; + sha256 = "04ni3fnci1h9sqrmchwad9bsqmnq9ix0lvh6mssy4s38pkl677l8"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10582,24 +10666,24 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-01-02"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "5518103a7a5e4d761d7ca9dd8fdc6f1aed669402"; - sha256 = "19286aa4vsif684wfywagfibzbxvq7sf62z6rmci5shvd5zsrpfi"; + rev = "13ad9c4ce43538601eb9b94dae2c55dccb5cab7e"; + sha256 = "1v8g6is8aw0wlfmxypdkdnx2vd53f3k13i9sqyq3kayj32k22cwn"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; vim-strip-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-strip-trailing-whitespace"; - version = "2021-01-03"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "axelf4"; repo = "vim-strip-trailing-whitespace"; - rev = "9a93dd653806ba3f886b2cf92111b663ce8d44bd"; - sha256 = "1pvirqj21xl2qbs9ycdp7n3lnf4n8b2bz1y90nphnvda4dfaac8l"; + rev = "59385775cbe416b2797ec5e2c7eb445a3398dd46"; + sha256 = "04v3hnljl9lxil6nqnrfsldyyhaz50l3sppifmpa27c2gd1w1v0y"; }; meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/"; }; @@ -10630,24 +10714,24 @@ final: prev: vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-05-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "5695f97fc803767bf657a5e512daec19dd1fd786"; - sha256 = "0lksvgk3g2yqbm8pw8ba5f8594djh5cj795hwjhnxc8rrhl29qpq"; + rev = "6286cda3f9222bfd490fe34a00a2d8cd4925adec"; + sha256 = "1lsfxrdxqzk0pqrv6him2s4j0vl1khxa5njknsbn8bvmshv8grap"; }; meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2021-10-12"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "aeb933272e72617f7c4d35e1f003be16836b948d"; - sha256 = "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf"; + rev = "baf89ad26488f6a7665d51b986f5c7ad2d22b30b"; + sha256 = "0kzp1g2zw2an0z7bb8h4xs8jf17z0mnn0zf6v1wkipvz6nvp7di8"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -10919,12 +11003,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-01-24"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "72b956f668237a4cd9b020b2c173d013699b38b5"; - sha256 = "1f0kkxclpa9x3qc81yzagl1qili13ihbicb6d84pnpycy482k0sj"; + rev = "3758476a99644e8071b240184af3c74bc00373f1"; + sha256 = "0ilhyam3av9hd685938abz3h4qfpgxcv81qhr71fr8fwbfb8k2w5"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10979,12 +11063,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-01-21"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "00da9eacaf4396bdc11817f987c35e5d09486eb4"; - sha256 = "1r5zdwm20110mzwawxik563l4bw5zxhrpdsn0cgq04icp5gbbxrc"; + rev = "0aa467db97a075c576e97424865a57a457fd4851"; + sha256 = "0ds8a0qn4dx332rpfwjmk09iaqjjd7wiqp91j1c84ysjnc2c1pfk"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11003,12 +11087,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-10-18"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "e4006d68cd4f390efef935bc09be0ce3bd022e72"; - sha256 = "048n8p7bjpcwdk924glqkwkp10fl813ffrjsagwwzsnakax3da5f"; + rev = "f992923d336e93c7f50fe9b35a07d5a92660ecaf"; + sha256 = "04l0v2jgkvhkfjj7j5r7x81gq2zwbjh5vh4p860p38razq6aixpl"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -11111,12 +11195,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-01-21"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "e7f67547956667dd87c4c74bff2760567c3e3ab1"; - sha256 = "0v6kyjsw8ridyvvlwncprfz56iyk9rlsiva5k6sn5ir62cdwhipj"; + rev = "b6754ace510ffa931bceb47df417a9ef3a87cb6b"; + sha256 = "13dfaf6y0yfnbnxl43fc0jwqv45gigki4iyhb4698fhmcy105jv6"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11157,6 +11241,18 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; + vim-windowswap = buildVimPluginFrom2Nix { + pname = "vim-windowswap"; + version = "2018-05-16"; + src = fetchFromGitHub { + owner = "wesQ3"; + repo = "vim-windowswap"; + rev = "15db3f697aa1fa696d99fcdc920c90cd2cec855e"; + sha256 = "1zzgwxv0a4i1qlig1c3n6n9ns2fqkkv6jqc2qxcipn6v6v88sl2b"; + }; + meta.homepage = "https://github.com/wesQ3/vim-windowswap/"; + }; + vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; version = "2021-12-28"; @@ -11207,12 +11303,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-10-15"; + version = "2022-02-03"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "2797c6c9d5278241a5932b5b31168fe2daa894de"; - sha256 = "1rvnm0xk8s9m6s9aycbzlnxbl8f03c3dqn74qrz5pw0r0vclfsv5"; + rev = "ccfa687d4f8d34bc2e23facc9b92c3abb90e5f93"; + sha256 = "0hrzwnnfdlb21wi3rj91k739v8dwi51w4llip669sw22ad0xz9la"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -11279,12 +11375,12 @@ final: prev: vimade = buildVimPluginFrom2Nix { pname = "vimade"; - version = "2022-01-12"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "fd3d3eb4bf6e5bdb643353f9d4bdae70faa16768"; - sha256 = "046w99vqk0lmxiwnsw57yvz6xgs64wmqwfm3iymxygqz828c8n3s"; + rev = "b0ce0820240e72a330bd388caa48baf434f1a0e3"; + sha256 = "1yknp4fjdwkc5sfw8f6rkhffa1k7lz3pa9q62v9ifj27a0gykwsd"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -11301,6 +11397,18 @@ final: prev: meta.homepage = "https://github.com/jreybert/vimagit/"; }; + VimCompletesMe = buildVimPluginFrom2Nix { + pname = "VimCompletesMe"; + version = "2020-12-30"; + src = fetchFromGitHub { + owner = "ackyshake"; + repo = "VimCompletesMe"; + rev = "2c69e30675d2a30208099742d14bd661d99fc5f2"; + sha256 = "0gjzl0027xjkq0mbqs9grab38ghwnixr57b4wicl113yd76hyb5i"; + }; + meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; + }; + vimelette = buildVimPluginFrom2Nix { pname = "vimelette"; version = "2019-05-02"; @@ -11399,12 +11507,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-01-22"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "f0b135d091a2b78945ea46695fd8c667a92457c0"; - sha256 = "01lsplkqv6h71z09p5sy0xmadd0gwn20nl94az7hb1igvlrangc4"; + rev = "670fb84fcf623c3978fa3d91a7cce8ac8a21674d"; + sha256 = "1f7ibgnzsmakxspzn4xhhscbw9hq61cs3s4v2zr3xawdc5cf89gq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11412,12 +11520,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-22"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c7c084a5215c9402f1cdfdaa662a7eaa9b67d81b"; - sha256 = "0mcd8wzq9xhidfyyir689050j2nfvwhgjp1ypnp3nib0m10n7kb8"; + rev = "950f9e5ea26cf7f63cd9f0bf71bbae87e70c2158"; + sha256 = "0gc7zh1h60mnds2xgsliblxg951swcnafxxla1w74yjjsn9cmsbd"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11688,6 +11796,18 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; + zen-mode-nvim = buildVimPluginFrom2Nix { + pname = "zen-mode.nvim"; + version = "2021-11-07"; + src = fetchFromGitHub { + owner = "folke"; + repo = "zen-mode.nvim"; + rev = "f1cc53d32b49cf962fb89a2eb0a31b85bb270f7c"; + sha256 = "1fxkrny1xk69w8rlmz4x5msvqb8i8xvvl9csndpplxhkn8wzirdp"; + }; + meta.homepage = "https://github.com/folke/zen-mode.nvim/"; + }; + zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; version = "2021-09-15"; @@ -11714,12 +11834,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-01-17"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "29ceb12298015dfb59a6e06706c9005f76153238"; - sha256 = "1i5h6lk0ikwhda4h368m4nn0shb6xciaqhxpag109l9xijgm3yap"; + rev = "0762d89c24f5a1da6bf26ca83f3719c379008ff9"; + sha256 = "00vfyi79m85d8pv0cnhyj82nqlnwiqs5pkzbr9yn8mvy6r0hscf3"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index db4f0057d6..85a41d2e51 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -34,6 +34,7 @@ , statix , stylish-haskell , tabnine +, tup , vim , which , xkb-switch @@ -65,8 +66,16 @@ , gobject-introspection , wrapGAppsHook - # vim-clap dependencies + # sniprun dependencies +, bashInteractive +, coreutils , curl +, gnugrep +, gnused +, makeWrapper +, procps + + # vim-clap dependencies , libgit2 , libiconv , openssl @@ -76,7 +85,6 @@ , asmfmt , delve , errcheck -, gnused , go-motion , go-tools , gocode @@ -536,6 +544,43 @@ self: super: { dependencies = with self; [ skim ]; }); + sniprun = + let + version = "1.1.2"; + src = fetchFromGitHub { + owner = "michaelb"; + repo = "sniprun"; + rev = "v${version}"; + sha256 = "sha256-WL0eXwiPhcndI74wtFox2tSnZn1siE86x2MLkfpxxT4="; + }; + sniprun-bin = rustPlatform.buildRustPackage { + pname = "sniprun-bin"; + inherit version src; + + cargoSha256 = "sha256-1WbgnsjoFdvko6VRKY+IjafMNqvJvyIZCDk8I9GV3GM="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/sniprun \ + --prefix PATH ${lib.makeBinPath [ bashInteractive coreutils curl gnugrep gnused procps ]} + ''; + + doCheck = false; + }; + in + buildVimPluginFrom2Nix { + pname = "sniprun"; + inherit version src; + + patches = [ ./patches/sniprun/fix-paths.patch ]; + postPatch = '' + substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin} + ''; + + propagatedBuildInputs = [ sniprun-bin ]; + }; + sqlite-lua = super.sqlite-lua.overrideAttrs (old: { postPatch = let libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -643,6 +688,24 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + tup = + let + # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim + ftdetect = builtins.toFile "tup.vim" '' + au BufNewFile,BufRead Tupfile,*.tup setf tup + ''; + in + buildVimPluginFrom2Nix { + inherit (tup) pname version src; + preInstall = '' + mkdir -p vim-plugin/syntax vim-plugin/ftdetect + cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim + cp "${ftdetect}" vim-plugin/ftdetect/tup.vim + cd vim-plugin + ''; + meta.maintainers = with lib.maintainers; [enderger]; + }; + unicode-vim = let unicode-data = fetchurl { @@ -752,7 +815,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-4VXXQjGmGGQXgfzSOvFnQS+iQjidj0FjaNKZ3VzBqw0="; + cargoSha256 = "sha256-JKi51kzCHMctUX6tT8K2Rq1slV3Ek67dCgbPjBkwPTE="; }; in '' diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch b/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch new file mode 100644 index 0000000000..f3203e0075 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch @@ -0,0 +1,36 @@ +diff --git a/lua/sniprun.lua b/lua/sniprun.lua +index aa39e0b..188d54a 100644 +--- a/lua/sniprun.lua ++++ b/lua/sniprun.lua +@@ -4,9 +4,7 @@ M.custom_highlight=false + M.info_floatwin = {} + + -- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua +-local binary_path = vim.fn.fnamemodify( +- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") +- .. "/target/release/sniprun" ++local binary_path = "@sniprun_bin@/bin/sniprun" + + local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." + +diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh +index 2e6264d..0eab1c6 100644 +--- a/ressources/init_repl.sh ++++ b/ressources/init_repl.sh +@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe + touch $working_dir/$out + sleep 36000 > $working_dir/$pipe & + +-echo "/bin/cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh ++echo "cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh + chmod +x $working_dir/real_launcher.sh + + echo $repl " process started at $(date +"%F %T")." >> $working_dir/log +diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh +index feaa91e..749c55e 100755 +--- a/ressources/launcher_repl.sh ++++ b/ressources/launcher_repl.sh +@@ -1,2 +1,2 @@ + #!/bin/bash +-/bin/cat $1 > $2 ++cat $1 > $2 diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index d836b5247b..159fcb5656 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -3,6 +3,7 @@ aca/completion-tabnine AckslD/nvim-neoclip.lua AckslD/nvim-whichkey-setup.lua ackyshake/Spacegray.vim +ackyshake/VimCompletesMe ahmedkhalf/lsp-rooter.nvim ahmedkhalf/project.nvim airblade/vim-gitgutter @@ -180,6 +181,7 @@ folke/tokyonight.nvim folke/trouble.nvim folke/twilight.nvim folke/which-key.nvim +folke/zen-mode.nvim FooSoft/vim-argwrap freitass/todo.txt-vim frigoeu/psc-ide-vim @@ -202,8 +204,6 @@ gioele/vim-autoswap github/copilot.vim gleam-lang/gleam.vim glepnir/dashboard-nvim -glepnir/galaxyline.nvim -glepnir/lspsaga.nvim glepnir/oceanic-material glepnir/zephyr-nvim glts/vim-textobj-comment @@ -223,6 +223,7 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +gyim/vim-boxdraw haringsrob/nvim_context_vt hashivim/vim-packer hashivim/vim-terraform @@ -277,6 +278,7 @@ itchyny/vim-gitbranch itspriddle/vim-shellcheck ivalkeen/vim-simpledb ivanov/vim-ipython +j-hui/fidget.nvim jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jakwings/vim-pony @@ -362,6 +364,7 @@ kdheepak/cmp-latex-symbols kdheepak/lazygit.nvim kdheepak/tabline.nvim KeitaNakamura/neodark.vim +KeitaNakamura/tex-conceal.vim keith/investigate.vim keith/rspec.vim keith/swift.vim @@ -432,6 +435,7 @@ lumiliet/vim-twig luochen1990/rainbow luukvbaal/stabilize.nvim lyokha/vim-xkbswitch +m-pilia/vim-ccls machakann/vim-highlightedyank machakann/vim-sandwich machakann/vim-swap @@ -455,6 +459,7 @@ MarcWeber/vim-addon-sql MarcWeber/vim-addon-syntax-checker MarcWeber/vim-addon-toggle-buffer MarcWeber/vim-addon-xdebug +marko-cerovac/material.nvim markonm/traces.vim martinda/Jenkinsfile-vim-syntax MattesGroeger/vim-bookmarks @@ -557,6 +562,7 @@ noc7c9/vim-iced-coffee-script norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim +NTBBloodbath/galaxyline.nvim ntpeters/vim-better-whitespace numirias/semshi numtostr/comment.nvim @@ -627,6 +633,7 @@ posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 prabirshrestha/async.vim +prabirshrestha/asyncomplete-lsp.vim prabirshrestha/asyncomplete.vim prabirshrestha/vim-lsp preservim/nerdcommenter @@ -770,6 +777,7 @@ sudormrfbin/cheatsheet.nvim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive +symphorien/vim-nixhash t9md/vim-choosewin t9md/vim-smalls TaDaa/vimade @@ -778,6 +786,7 @@ tamago324/compe-zsh tamago324/lir.nvim tami5/compe-conjure tami5/lispdocs.nvim +tami5/lspsaga.nvim tami5/sqlite.lua tbastos/vim-lua tbodt/deoplete-tabnine @@ -943,6 +952,7 @@ wbthomason/packer.nvim weilbith/nvim-code-action-menu wellle/targets.vim wellle/tmux-complete.vim +wesQ3/vim-windowswap wfxr/minimap.vim whonore/Coqtail will133/vim-dirdiff diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh b/third_party/nixpkgs/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh index f3058755d6..e3d1e5fb13 100755 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh @@ -105,11 +105,15 @@ formatExtRuntimeDeps() { jsonStorePath="$(echo "$jsonShaWStorePath" | tail -n1)" 1>&2 echo "jsonStorePath='$jsonStorePath'" + # Assume packages without an architectures are for x86_64 and remap arm64 to aarch64. declare jqQuery jqQuery=$(cat <<'EOF' .runtimeDependencies -| map(select(.platforms[] | in({"linux": null}))) -| map(select(.architectures[] | in({"x86_64": null}))) +| map(select(.platforms[] | in({"linux": null, "darwin": null}))) +| map(select(.architectures == null).architectures |= ["x86_64"]) +| map(del(.architectures[] | select(. | in({"x86_64": null, "arm64": null}) | not))) +| map((.architectures[] | select(. == "arm64")) |= "aarch64") +| map(select(.architectures != [])) | .[] | { (.id + "__" + (.architectures[0]) + "-" + (.platforms[0])): {installPath, binaries, urls: [.url, .fallbackUrl] | map(select(. != null))} diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 111d5cf048..526c3f3778 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -93,8 +93,8 @@ let mktplcRef = { name = "vscode-tlaplus"; publisher = "alygin"; - version = "1.5.3"; - sha256 = "1cy0qn8iyjrinscn9p5ckpsa2hyryapxfi7is6s2zk2mpligbb1d"; + version = "1.5.4"; + sha256 = "0mf98244z6wzb0vj6qdm3idgr2sr5086x7ss2khaxlrziif395dx"; }; meta = { license = lib.licenses.mit; @@ -193,6 +193,18 @@ let }; }; + Arjun.swagger-viewer = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "Arjun"; + name = "swagger-viewer"; + version = "3.1.2"; + sha256 = "1cjvc99x1q5w3i2vnbxrsl5a1dr9gb3s6s9lnwn6mq5db6iz1nlm"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + arrterian.nix-env-selector = buildVscodeMarketplaceExtension { mktplcRef = { name = "nix-env-selector"; @@ -243,8 +255,8 @@ let mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2020.11.2"; - sha256 = "0n2dm21vgzir3hx1m3pmx7jq4zy3hdxfsandd2wv5da4fs9b5g50"; + version = "2022.1.5"; + sha256 = "1b5ihrac9xsq35a39vlq7krr1ffqpdjxdlhv9s056hs033kayazl"; }; buildInputs = [ nodePackages.pyright ]; @@ -275,8 +287,8 @@ let mktplcRef = { name = "scaladex-search"; publisher = "baccata"; - version = "0.0.1"; - sha256 = "1y8p4rr8qq5ng52g4pbx8ayq04gi2869wrx68k69rl7ga7bzcyp9"; + version = "0.2.0"; + sha256 = "0xbikwlrascmn9nzyl4fxb2ql1dczd00ragp30a3yv8bax173bnz"; }; meta = { license = lib.licenses.asl20; @@ -295,6 +307,18 @@ let }; }; + benfradet.vscode-unison = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-unison"; + publisher = "benfradet"; + version = "0.3.0"; + sha256 = "1x80s8l8djchg17553aiwaf4b49hf6awiayk49wyii0i26hlpjk1"; + }; + meta = with lib; { + license = licenses.asl20; + }; + }; + betterthantomorrow.calva = buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; @@ -399,8 +423,8 @@ let mktplcRef = { name = "gitignore"; publisher = "codezombiech"; - version = "0.6.0"; - sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b"; + version = "0.7.0"; + sha256 = "0fm4sxx1cb679vn4v85dw8dfp5x0p74m9p2b56gqkvdap0f2q351"; }; meta = with lib; { license = licenses.mit; @@ -479,8 +503,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.45.0"; - sha256 = "sha256-L7y+Lsx1DMS12JtxSl7WkT8jGQLipebNKxknF/Y1ke0="; + version = "0.46.0"; + sha256 = "sha256-2FvE+6fnZPtR0At4NjLKSMCbPu8T7o8xtpvYiEjh7ck="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -545,6 +569,16 @@ let meta = { license = lib.licenses.mit; }; }; + disneystreaming.smithy = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "disneystreaming"; + name = "smithy"; + version = "0.0.2"; + sha256 = "0rdh7b5s7ynsyfrq1r1170g65q9vvvfl3qbfvbh1b38ndvj2f0yq"; + }; + meta = { license = lib.licenses.asl20; }; + }; + divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension { mktplcRef = { name = "competitive-programming-helper"; @@ -652,8 +686,20 @@ let mktplcRef = { name = "vscode-command-runner"; publisher = "edonet"; - version = "0.0.116"; - sha256 = "0fxvplyk080m0cdsvzynp6wjillrd4flr5qz7af7fibb2jbmfdkn"; + version = "0.0.122"; + sha256 = "1lvwvcs18azqhkzyvhf83ckfhfdgcqrw2gxb2myspqj59783hfpg"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + eg2.vscode-npm-script = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-npm-script"; + publisher = "eg2"; + version = "0.3.24"; + sha256 = "sha256-XgdMLecyZQXsgQAUh8V4eFLKaUF4WVlgy9iIGNDnR/I="; }; meta = { license = lib.licenses.mit; @@ -693,8 +739,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.1.0"; - sha256 = "sha256-lR5BDbDYURCF1Gq5JIm7BcXVvKXPdNBYom0BiVX/3u0="; + version = "9.2.0"; + sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -855,6 +901,18 @@ let }; }; + humao.rest-client = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "humao"; + name = "rest-client"; + version = "0.24.6"; + sha256 = "196pm7gv0488bpv1lklh8hpwmdqc4yimz389gad6nsna368m4m43"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "jkillian"; @@ -885,8 +943,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.7.4421"; - sha256 = "1wvzf8rq8ligj079f1m74zzna2mfmhcbgvvrsw6w0wxw9x8fn4wy"; + version = "1.7.4812"; + sha256 = "1yl7m90m38pv8nz4dwcszjsa1sf253459xln17mngmc8z9wd3d3a"; }; meta = { license = lib.licenses.unfree; }; }; @@ -935,8 +993,8 @@ let mktplcRef = { name = "vscode-graphql"; publisher = "GraphQL"; - version = "0.3.13"; - sha256 = "sha256-JjEefVHQUYidUsr8Ce/dh7hLDm21WkyS+2RwsXHoY04="; + version = "0.3.50"; + sha256 = "1yf6v2vsgmq86ysb6vxzbg2gh6vz03fsz0d0rhpvpghayrjlk5az"; }; meta = { license = lib.licenses.mit; @@ -1100,8 +1158,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.1.18"; - sha256 = "sha256-dmmx/u+hRQfY/MCIaSdcVtbYnf5cLCDUwr75heQxcuw="; + version = "0.1.19"; + sha256 = "1ms96ij6z4bysdhqgdaxx2znvczyhzx57iifbqws50m1c3m7pkx7"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -1173,6 +1231,18 @@ let }; }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nickel-syntax"; + publisher = "kubukoz"; + version = "0.0.1"; + sha256 = "010zn58j9kdb2jpxmlfyyyais51pwn7v2c5cfi4051ayd02b9n3s"; + }; + meta = { + license = lib.licenses.asl20; + }; + }; + llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-clangd"; @@ -1238,8 +1308,8 @@ let mktplcRef = { name = "goto-next-previous-member"; publisher = "mishkinf"; - version = "0.0.5"; - sha256 = "0kgzap1k924i95al0a63hxcsv8skhaapgfpi9d7vvaxm0fc10l1i"; + version = "0.0.6"; + sha256 = "07rpnbkb51835gflf4fpr0v7fhj8hgbhsgcz2wpag8wdzdxc3025"; }; meta = { license = lib.licenses.mit; @@ -1332,6 +1402,18 @@ let }; }; + ms-vscode.anycode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "anycode"; + publisher = "ms-vscode"; + version = "0.0.57"; + sha256 = "sha256-XwL7I+vwZJ6zx5IDZdfOUbq6M9IH/gi7MBe92cG1kDs="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mvllow.rose-pine = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "mvllow"; @@ -1448,13 +1530,13 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ratsclub ]; }; mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.5.1"; - sha256 = "0jkxpcrbr8xmwfl8jphmarjz2jk54hvmc24ww89d4bgx1awayqfh"; + version = "1.8.4"; + sha256 = "sha256-T1eYAuYMv4B7rdECxYzNfIpydjzCDjeo7gmb1uhr6VM="; }; }; @@ -1462,8 +1544,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.11.0"; - sha256 = "1l2s8j645riqjmj09i3v71s8ycin5vd6brdp35z472fnk6wyi1y6"; + version = "4.12.1"; + sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A="; }; meta = { license = lib.licenses.mit; @@ -1494,6 +1576,18 @@ let }; }; + roman.ayu-next = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ayu-next"; + publisher = "roman"; + version = "1.2.9"; + sha256 = "sha256-rwZnqvHRmMquNq9PnU176vI4g8PtS6wSNvQaZ1BMa4I="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; @@ -1534,8 +1628,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.12.0"; - sha256 = "13zwjnrmkrs3wxh8c9nz9zxxs3p6lkj41q30v4a1md5pscfa1s44"; + version = "1.12.18"; + sha256 = "104h3qfdn0y4138g3mdw1209qqh3mj3jsdsbzpnw2plk1cmr3nx5"; }; meta = { license = lib.licenses.asl20; @@ -1579,6 +1673,18 @@ let }; }; + silvenon.mdx = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "mdx"; + publisher = "silvenon"; + version = "0.1.0"; + sha256 = "1mzsqgv0zdlj886kh1yx1zr966yc8hqwmiqrb1532xbmgyy6adz3"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; @@ -1636,8 +1742,8 @@ let mktplcRef = { publisher = "stkb"; name = "rewrap"; - version = "1.16.0"; - sha256 = "sha256-351zYmMupAv/8fQ+lOc0pYzy/wsE3JqTuxfKD+AdBAc="; + version = "1.16.1"; + sha256 = "sha256-OTPNbwoQmKd73g8IwLKMIbe6c7E2jKNkzwuBU/f8dmY="; }; meta = with lib; { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; @@ -1653,8 +1759,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.4"; - sha256 = "sha256-V8ug/EtDczjiofuL7HhpN1B+qbedpnvIlXnwiXJzD/g="; + version = "2.1.5"; + sha256 = "sha256-nIR3PtbtnSbAU0rS+qVtPsj++Dbfp/k86dWkx4xYcno="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -1682,8 +1788,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.9"; - sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; + version = "0.3.18"; + sha256 = "sha256-ypYqVH1ViJE7+mAJnxmpvUSmiImOo7rE7m+ijTEpmwg="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; @@ -1748,8 +1854,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.14.4"; - sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m"; + version = "0.18.4"; + sha256 = "00cii58md6v028h0xfvbdjvg3r44451mi0lfmjwiwif5xcw3wnlx"; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' @@ -1987,8 +2093,8 @@ let mktplcRef = { name = "material-theme"; publisher = "zhuangtongfa"; - version = "3.9.12"; - sha256 = "017h9hxplf2rhmlhn3vag0wypcx6gxi7p9fgllj5jzwrl2wsjl0g"; + version = "3.13.17"; + sha256 = "100riqnvc2j315i1lvnwxmgga17s369xxvds5skgnk2yi2xnm2g9"; }; meta = { license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index 393ea0f445..d91cbccb80 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -38,7 +38,13 @@ let rtDepsBinSrcs."${bSrcName}__${stdenv.targetPlatform.system}"; omnisharp = rtDepBinSrcByName "OmniSharp"; - vsdbg = rtDepBinSrcByName "Debugger"; + vsdbgs = [ + (rtDepBinSrcByName "Debugger") + ] ++ lib.optionals (stdenv.isDarwin) [ + # Include the aarch64-darwin debugger binaries on x86_64-darwin. Even though OmniSharp will be + # running under Rosetta 2, debugging will fail to start if both sets of binaries are not present. + (rtDepsBinSrcs."Debugger__aarch64-darwin") + ]; razor = rtDepBinSrcByName "Razor"; in @@ -46,8 +52,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "1.23.15"; - sha256 = "0b74jr45zl7lzirjgj8s2lbf3viy9pbwlgjh055rcwmy77wcml1x"; + version = "1.23.16"; + sha256 = "sha256-fM4vcSMi2tEjIox9Twh2sRiFhXgAeRwAM9to3vtcSqI="; }; nativeBuildInputs = [ @@ -112,20 +118,28 @@ vscode-utils.buildVscodeMarketplaceExtension { chmod a+x "$omnisharp_dir/run" touch "$omnisharp_dir/install.Lock" + '' + builtins.concatStringsSep "\n" (map (vsdbg: '' declare vsdbg_dir="$PWD/${vsdbg.installPath}" unzip_to "${vsdbg.bin-src}" "$vsdbg_dir" chmod a+x "$vsdbg_dir/vsdbg-ui" chmod a+x "$vsdbg_dir/vsdbg" touch "$vsdbg_dir/install.complete" touch "$vsdbg_dir/install.Lock" - patchelf_common "$vsdbg_dir/vsdbg" - patchelf_common "$vsdbg_dir/vsdbg-ui" + '') vsdbgs) + '' declare razor_dir="$PWD/${razor.installPath}" unzip_to "${razor.bin-src}" "$razor_dir" chmod a+x "$razor_dir/rzls" touch "$razor_dir/install.Lock" + + '' + lib.optionalString stdenv.isLinux '' + patchelf_common "$vsdbg_dir/vsdbg" + patchelf_common "$vsdbg_dir/vsdbg-ui" patchelf_common "$razor_dir/rzls" + + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $omnisharp_dir/etc/config \ + --replace "libmono-native-compat.dylib" "libmono-native.dylib" ''; meta = with lib; { @@ -133,6 +147,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/OmniSharp/omnisharp-vscode"; license = licenses.mit; maintainers = [ maintainers.jraygauthier ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json index 8f90fda228..13678d1097 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json @@ -1,15 +1,63 @@ { + "OmniSharp__x86_64-darwin": { + "installPath": ".omnisharp/1.37.16", + "binaries": [ + "./mono.osx", + "./run" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-osx-1.37.16.zip" + ], + "sha256": "0hhgfx7zs1rljhn3n9c7lci7j15yp2448z3f1d3c47a95l1hmlip" + }, "OmniSharp__x86_64-linux": { - "installPath": ".omnisharp/1.37.15", + "installPath": ".omnisharp/1.37.16", "binaries": [ "./mono.linux-x86_64", "./run" ], "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/b96375395e639233d546a4937be3bd32/omnisharp-linux-x64-1.37.15.zip", - "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-linux-x64-1.37.15.zip" + "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x64-1.37.16.zip" ], - "sha256": "0pchywkxy8niq0i6gq2r43cmf58blfhhj8w8zyibf0m9h09h165s" + "sha256": "0a2basc6dw42fnjv9zz93ff0bsw2i3446gvcjx5mn5d8dasi483i" + }, + "Debugger__x86_64-darwin": { + "installPath": ".debugger/x86_64", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/c1122f7141735472d9583c1124024c55/coreclr-debug-osx-x64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-x64.zip" + ], + "sha256": "08z3k0h25gdsbmlxwayd94672hp2z7zmwdmd0nyr9j82izj3ci2m" + }, + "Debugger__aarch64-darwin": { + "installPath": ".debugger/arm64", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/96a88189c7904a517f3bb59b2dba8bd1/coreclr-debug-osx-arm64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-arm64.zip" + ], + "sha256": "113kz02ihvb4y5fj01wamqz2jsql2q7n7f55s9kzs9dsrmq5ffa0" + }, + "Debugger__aarch64-linux": { + "installPath": ".debugger", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/7a723bfbda6d196c52084226b6835b36/coreclr-debug-linux-arm64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm64.zip" + ], + "sha256": "1d4a5q3f7qfk3jq2i4f6g50i9i4z8z7g8ss083y9n5c1yj3629kw" }, "Debugger__x86_64-linux": { "installPath": ".debugger", @@ -32,5 +80,15 @@ "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip" ], "sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b" + }, + "Razor__x86_64-darwin": { + "installPath": ".razor", + "binaries": [ + "./rzls" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/ad846449769eb2ae810d0236823a6aaa/razorlanguageserver-osx-x64-6.0.0-preview.5.21358.6.zip" + ], + "sha256": "0iqinpwwlqwajdq4i1qbb9hfpfmgy17av95bpw02ad2f9fnyh572" } } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs index 83230915d0..8c43231b1a 100755 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs @@ -10,7 +10,7 @@ scriptDir=$(cd "$(dirname "$0")"; pwd) declare extPublisher="ms-dotnettools" declare extName="csharp" -declare defaultExtVersion="1.23.15" +declare defaultExtVersion="1.23.16" declare extVersion="${1:-$defaultExtVersion}" formatExtRuntimeDeps \ diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index beaa8d557a..09c5c02aee 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -72,13 +72,15 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { icu curl openssl + ] ++ lib.optionals stdenv.isLinux [ lttng-ust-2-10 musl ]; nativeBuildInputs = [ - autoPatchelfHook python3.pkgs.wrapPython + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ]; pythonPath = with python3.pkgs; [ @@ -101,6 +103,8 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process declare kept_aside="${{ "x86_64-linux" = "attach_linux_amd64.so"; + "aarch64-darwin" = "attach_x86_64.dylib"; + "x86_64-darwin" = "attach_x86_64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" mv "$kept_aside" "$kept_aside.hidden" rm *.so *.dylib *.dll *.exe *.pdb @@ -118,7 +122,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { meta = with lib; { license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.jraygauthier ]; + platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; + maintainers = with maintainers; [ jraygauthier jfchevrette ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 2bc9321353..7f20d0e719 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.8"; + version = "1.6.10"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-/2iyWJfNjvk5n7KwWIu2gc24/21KWibU6IAPN/tJ8Q4="; + sha256 = "sha256-4PM/818UFHRZekfbdhS/Rz0Pu6HOjJEldi4YuBWECnI="; }; lldb = callPackage ./lldb.nix {}; @@ -25,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-rG+Qw8ac9cCgCjfLFXLlohLk+zV5s1OaqzU0/nXiqgU="; + cargoSha256 = "sha256-Ch1X2vN+p7oCqSs/GIu5IzG+pcSKmQ+VwP2T8ycRhos="; nativeBuildInputs = [ makeWrapper ]; @@ -98,7 +98,7 @@ in stdenv.mkDerivation { description = "A native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ nigelgbanks ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix index 3885da4cbe..4ff3262d27 100644 --- a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix +++ b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IkPv6oPdwfuIQrqQGqZAJ0b9OPRiA3GWDQuPXM/+fY4="; + sha256 = "sha256-IMNHsmL1L+zfGxfdTxJ4HBGiQOzWmYVE0P3ZInbMVl0="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-/56KsEg6deeROERWLd9lX+7v6n5Dx1VCzdr/GtPFuGo="; + cargoSha256 = "sha256-Q8Xl6L41cDeDN370owAAL9xZhdyUuDKrPlZxG3eg87c="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/duti/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/duti/default.nix index 9daed151ce..db0b1e1dcb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/duti/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/duti/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [matthewbauer]; platforms = platforms.darwin; license = licenses.publicDomain; - homepage = "http://duti.org/"; + homepage = "https://github.com/moretension/duti/"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/mysides/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/mysides/default.nix new file mode 100644 index 0000000000..cdbfee5046 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/mysides/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, libarchive, p7zip }: + +stdenv.mkDerivation rec { + pname = "mysides"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/mosen/mysides/releases/download/v${version}/mysides-${version}.pkg"; + sha256 = "sha256-dpRrj3xb9xQSXXXxragUDgNPBaniiMc6evRF12wqVRQ="; + }; + + dontBuild = true; + nativeBuildInputs = [ libarchive p7zip ]; + + unpackPhase = '' + 7z x $src + bsdtar -xf Payload~ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 usr/local/bin/mysides -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Manage macOS Finder sidebar favorites"; + homepage = "https://github.com/mosen/mysides"; + license = licenses.mit; + maintainers = with maintainers; [ tboerger ]; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/usr-include/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/usr-include/default.nix deleted file mode 100644 index 26b60ea44f..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/usr-include/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, darwin}: - -/* - * This is needed to build GCC on Darwin. - * - * These are the collection of headers that would normally be available under - * /usr/include in macOS machines with command line tools installed. They need - * to be in one folder for gcc to use them correctly. - */ - -stdenv.mkDerivation { - name = "darwin-usr-include"; - buildInputs = [ darwin.CF stdenv.libc ]; - buildCommand = '' - mkdir -p $out - cd $out - ln -sf ${stdenv.libc}/include/* . - mkdir CoreFoundation - ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation - ''; - - meta.platforms = lib.platforms.darwin; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch new file mode 100644 index 0000000000..b17df9a492 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch @@ -0,0 +1,232 @@ +diff --git a/src/control/control.c b/src/control/control.c +index d66ed75..42cecad 100644 +--- a/src/control/control.c ++++ b/src/control/control.c +@@ -838,6 +838,10 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + #ifndef PIC + extern void *snd_control_open_symbols(void); + #endif ++ ++ snd_config_t *libs = NULL; ++ const char *libs_lib = NULL; ++ + if (snd_config_get_type(ctl_conf) != SND_CONFIG_TYPE_COMPOUND) { + if (name) + SNDERR("Invalid type for CTL %s definition", name); +@@ -879,6 +883,19 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + SNDERR("Invalid type for %s", id); + goto _err; + } ++ ++ continue; ++ } ++ // Handle an array of extra libs. ++ if (strcmp(id, "libs") == 0) { ++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { ++ SNDERR("Invalid type for libs definition in CTL %s definition", ++ str); ++ goto _err; ++ } ++ ++ libs = n; ++ + continue; + } + if (strcmp(id, "open") == 0) { +@@ -903,7 +920,62 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + open_name = buf; + sprintf(buf, "_snd_ctl_%s_open", str); + } +- if (!lib) { ++ ++#ifndef PIC ++ snd_control_open_symbols(); ++#endif ++ ++ // Normal alsa behaviour when there is no libs array. ++ if (!libs) { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1); ++ } ++ } ++ // Handle libs array. ++ // Suppresses error messages if any function is loaded successfully. ++ else { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0); ++ } ++ ++ if (!open_func) { ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ err = snd_config_get_string(n, &libs_lib); ++ if (err < 0) { ++ SNDERR("Invalid entry in CTL %s libs definition", str); ++ goto _err; ++ } ++ ++ if (!open_func) { ++ open_func = snd_dlobj_cache_get(libs_lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0); ++ } ++ } ++ } ++ ++ // Print error messages. ++ if (!open_func) { ++ if (lib) { ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ lib, open_name); ++ } ++ ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ snd_config_get_string(n, &libs_lib); ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ libs_lib, open_name); ++ } ++ } ++ } ++ ++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look. ++ if (!lib && (!libs || !libs_lib)) { + const char *const *build_in = build_in_ctls; + while (*build_in) { + if (!strcmp(*build_in, str)) +@@ -919,12 +991,11 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + lib = buf1; + sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str); + } +- } +-#ifndef PIC +- snd_control_open_symbols(); +-#endif +- open_func = snd_dlobj_cache_get(lib, open_name, ++ ++ open_func = snd_dlobj_cache_get(lib, open_name, + SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1); ++ } ++ + if (open_func) { + err = open_func(ctlp, name, ctl_root, ctl_conf, mode); + if (err >= 0) { +diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c +index 2e24338..7f489f4 100644 +--- a/src/pcm/pcm.c ++++ b/src/pcm/pcm.c +@@ -2116,6 +2116,10 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + #ifndef PIC + extern void *snd_pcm_open_symbols(void); + #endif ++ ++ snd_config_t *libs = NULL; ++ const char *libs_lib = NULL; ++ + if (snd_config_get_type(pcm_conf) != SND_CONFIG_TYPE_COMPOUND) { + char *val; + id = NULL; +@@ -2160,6 +2164,19 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + SNDERR("Invalid type for %s", id); + goto _err; + } ++ ++ continue; ++ } ++ // Handle an array of extra libs. ++ if (strcmp(id, "libs") == 0) { ++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { ++ SNDERR("Invalid type for libs definition in PCM %s definition", ++ str); ++ goto _err; ++ } ++ ++ libs = n; ++ + continue; + } + if (strcmp(id, "open") == 0) { +@@ -2184,7 +2201,62 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + open_name = buf; + sprintf(buf, "_snd_pcm_%s_open", str); + } +- if (!lib) { ++ ++#ifndef PIC ++ snd_pcm_open_symbols(); /* this call is for static linking only */ ++#endif ++ ++ // Normal alsa behaviour when there is no libs array. ++ if (!libs) { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1); ++ } ++ } ++ // Handle libs array. ++ // Suppresses error messages if any function is loaded successfully. ++ else { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0); ++ } ++ ++ if (!open_func) { ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ err = snd_config_get_string(n, &libs_lib); ++ if (err < 0) { ++ SNDERR("Invalid entry in PCM %s libs definition", str); ++ goto _err; ++ } ++ ++ if (!open_func) { ++ open_func = snd_dlobj_cache_get(libs_lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0); ++ } ++ } ++ } ++ ++ // Print error messages. ++ if (!open_func) { ++ if (lib) { ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ lib, open_name); ++ } ++ ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ snd_config_get_string(n, &libs_lib); ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ libs_lib, open_name); ++ } ++ } ++ } ++ ++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look. ++ if (!lib && (!libs || !libs_lib)) { + const char *const *build_in = build_in_pcms; + while (*build_in) { + if (!strcmp(*build_in, str)) +@@ -2200,12 +2272,11 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + lib = buf1; + sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str); + } +- } +-#ifndef PIC +- snd_pcm_open_symbols(); /* this call is for static linking only */ +-#endif +- open_func = snd_dlobj_cache_get(lib, open_name, ++ ++ open_func = snd_dlobj_cache_get(lib, open_name, + SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1); ++ } ++ + if (open_func) { + err = open_func(pcmp, name, pcm_root, pcm_conf, stream, mode); + if (err >= 0) { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 445d171d31..58e5990ae0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-rVgpk9Us21+xWaC+q2CmrFfqsMwb34XcTbbWGX8CMz8="; }; + patches = [ + # Add a "libs" field to the syntax recognized in the /etc/asound.conf file. + # The nixos modules for pulseaudio, jack, and pipewire are leveraging this + # "libs" field to declare locations for both native and 32bit plugins, in + # order to support apps with 32bit sound running on x86_64 architecture. + ./alsa-plugin-conf-multilib.patch + ]; + enableParallelBuilding = true; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/default.nix index b293f8513b..241145a248 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -11,6 +11,7 @@ , expat , libffi , libselinux +, libdrm , udev , kernel ? null }: @@ -204,6 +205,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ + libdrm patchelf perl ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/anbox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/anbox/default.nix index d684e24db9..2a98aa82eb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/anbox/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/anbox/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation rec { pname = "anbox"; - version = "unstable-2020-11-29"; + version = "unstable-2021-10-20"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "6c10125a7f13908d2cbe56d2d9ab09872755f265"; - sha256 = "00bqssh4zcs0jj6w07b91719xkrpdw75vpcplwrvlhwsvl55f901"; + rev = "84f0268012cbe322ad858d76613f4182074510ac"; + sha256 = "sha256-QXWhatewiUDQ93cH1UZsYgbjUxpgB1ajtGFYZnKmabc="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index b8a017adcf..9e21955808 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation rec { ./busybox-in-store.patch ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; + separateDebugInfo = true; + postPatch = "patchShebangs ."; configurePhase = '' @@ -120,6 +122,8 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") ''; + makeFlags = [ "SKIP_STRIP=y" ]; + postInstall = '' sed -e ' 1 a busybox() { '$out'/bin/busybox "$@"; }\ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix index 939a7115e8..27f32c6481 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { version = "2.4.3"; outputs = [ "out" "dev" "man" ]; + separateDebugInfo = true; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix index 6cc22c2560..f1e942a439 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix @@ -20,22 +20,22 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.4.1-55.174"; + version = "5.5.0-beta-59.118"; src = requireFile rec { - name = "displaylink.zip"; - sha256 = "1biswvjz91gmx7xf9g05h3ra463hf2yv9mr2nkxclyrd283iiiqc"; + name = "displaylink-55.zip"; + sha256 = "0mid6p1mnkhbl96cr763ngdwrlgnpgs6c137rwc2sjf4v33g59ma"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.4.1 + https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.5-Beta Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu ${lib.versions.majorMinor version}.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu (Beta)5.5 Beta-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} ''; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dt $out/lib/displaylink *.spkg install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager - mkdir -p $out/lib/udev/rules.d + mkdir -p $out/lib/udev/rules.d $out/share cp ${./99-displaylink.rules} $out/lib/udev/rules.d/99-displaylink.rules patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { $out/bin/DisplayLinkManager wrapProgram $out/bin/DisplayLinkManager \ --run "cd $out/lib/displaylink" + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/workspace_dependencies.pin" ''; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index 7592be483f..1e4f50e42d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -1,9 +1,9 @@ { stdenv, lib , kernel , fetchurl -, pkg-config, meson, ninja +, pkg-config, meson, ninja, makeWrapper , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core -, doxygen, python3 +, doxygen, python3, pciutils , withExamples ? [] , shared ? false }: @@ -20,6 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ + makeWrapper doxygen meson ninja @@ -31,22 +32,27 @@ in stdenv.mkDerivation rec { buildInputs = [ jansson libbpf - libbsd libelf libpcap numactl openssl.dev zlib + python3 ] ++ lib.optionals mod kernel.moduleBuildDependencies; - # Propagated to support current DPDK users in nixpkgs which statically link - # with the framework (e.g. odp-dpdk). propagatedBuildInputs = [ + # Propagated to support current DPDK users in nixpkgs which statically link + # with the framework (e.g. odp-dpdk). rdma-core + # Requested by pkg-config. + libbsd ]; postPatch = '' patchShebangs config/arm buildtools + '' + lib.optionalString mod '' + # kernel_install_dir is hardcoded to `/lib/modules`; patch that. + sed -i "s,kernel_install_dir *= *['\"].*,kernel_install_dir = '$kmod/lib/modules/${kernel.modDirVersion}'," kernel/linux/meson.build ''; mesonFlags = [ @@ -59,30 +65,25 @@ in stdenv.mkDerivation rec { ++ lib.optional (!shared) "-Ddefault_library=static" ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" ++ lib.optional stdenv.isAarch64 "-Dmachine=generic" - ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}" + ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; - # dpdk meson script does not support separate kernel source and installion - # dirs (except via destdir), so we temporarily link the former into the latter. - preConfigure = lib.optionalString mod '' - mkdir -p $kmod/lib/modules/${kernel.modDirVersion} - ln -sf ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - $kmod/lib/modules/${kernel.modDirVersion} - ''; - - postBuild = lib.optionalString mod '' - rm -f $kmod/lib/modules/${kernel.modDirVersion}/build - ''; - postInstall = '' # Remove Sphinx cache files. Not only are they not useful, but they also # contain store paths causing spurious dependencies. rm -rf $out/share/doc/dpdk/html/.doctrees + + wrapProgram $out/bin/dpdk-devbind.py \ + --prefix PATH : "${lib.makeBinPath [ pciutils ]}" '' + lib.optionalString (withExamples != []) '' - find examples -type f -executable -exec install {} $out/bin \; + mkdir -p $examples/bin + find examples -type f -executable -exec install {} $examples/bin \; ''; - outputs = [ "out" ] ++ lib.optional mod "kmod"; + outputs = + [ "out" "doc" ] + ++ lib.optional mod "kmod" + ++ lib.optional (withExamples != []) "examples"; meta = with lib; { description = "Set of libraries and drivers for fast packet processing"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix index e0d1c46d64..e40448be43 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-2021-07-07"; + version = "1.10.0"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "b0b2c80eb63f9b858b71afa772135f434aea192a"; - sha256 = "sha256-io+CbZovGjEJjwtmARFH23Djt933ONoHMDoea+i6xFo="; + rev = "v${version}"; + sha256 = "sha256-vMcmUWdnO9JmImxz4vO3/UONlsrCGc8VH/o38YwCIzg="; }; + NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel libdrm ]; @@ -33,6 +35,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ lgpl21Only gpl2Only ]; homepage = "https://www.displaylink.com/"; - broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "5.15" || stdenv.isAarch64; + broken = kernel.kernelOlder "4.19" || stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index 348be83056..c3dc819b5b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "firejail"; - version = "0.9.66"; + version = "0.9.68"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "sha256-oKstTiGt0r4wePaZ9u1o78GZ1XWJ27aS0BdLxmfYk9Q="; + sha256 = "18yy1mykx7h78yj7sz729i3dlsrgi25m17m5x9gbrvsx7f87rw7j"; }; nativeBuildInputs = [ @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { # By default fbuilder hardcodes the firejail binary to the install path. # On NixOS the firejail binary is a setuid wrapper available in $PATH. ./fbuilder-call-firejail-on-path.patch - # Disable symlink check on /etc/hosts, see - # https://github.com/netblue30/firejail/issues/2758#issuecomment-805174951 - ./remove-link-check.patch ]; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch index 6016891655..548bb80e7b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch @@ -1,11 +1,11 @@ --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c -@@ -67,7 +67,7 @@ - errExit("asprintf"); - - char *cmdlist[] = { -- BINDIR "/firejail", -+ "firejail", - "--quiet", - "--noprofile", - "--caps.drop=all", +@@ -48,7 +48,7 @@ + // build command + char *cmd[len]; + unsigned curr_len = 0; +- cmd[curr_len++] = BINDIR "/firejail"; ++ cmd[curr_len++] = "firejail"; + cmd[curr_len++] = "--quiet"; + cmd[curr_len++] = "--noprofile"; + cmd[curr_len++] = "--caps.drop=all"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch index 685314f907..6493eb4fdf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch @@ -1,6 +1,6 @@ ---- a/src/firejail/fs.c -+++ b/src/firejail/fs.c -@@ -1143,6 +1143,16 @@ +--- a/src/firejail/fs_overlayfs.c ++++ b/src/firejail/fs_overlayfs.c +@@ -327,6 +327,16 @@ errExit("mounting /dev"); fs_logger("whitelist /dev"); @@ -17,7 +17,7 @@ // mount-bind run directory if (arg_debug) printf("Mounting /run\n"); -@@ -1201,6 +1211,7 @@ +@@ -384,6 +394,7 @@ free(odiff); free(owork); free(dev); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/remove-link-check.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/remove-link-check.patch deleted file mode 100644 index 477df57a24..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/remove-link-check.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ccc726f8ec877d8cda720daa2498e43629b6dd48 Mon Sep 17 00:00:00 2001 -From: Jonas Heinrich -Date: Sun, 19 Sep 2021 11:48:06 +0200 -Subject: [PATCH 1/2] remove hosts file link check - ---- - src/firejail/fs_hostname.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c -index 42255070c4..97ce70f9c1 100644 ---- a/src/firejail/fs_hostname.c -+++ b/src/firejail/fs_hostname.c -@@ -132,10 +132,6 @@ char *fs_check_hosts_file(const char *fname) { - invalid_filename(fname); - char *rv = expand_home(fname, cfg.homedir); - -- // no a link -- if (is_link(rv)) -- goto errexit; -- - // the user has read access to the file - if (access(rv, R_OK)) - goto errexit; - -From c2c51e7ca56075e7388b4f50922b148615d1b125 Mon Sep 17 00:00:00 2001 -From: Jonas Heinrich -Date: Sun, 19 Sep 2021 11:49:08 +0200 -Subject: [PATCH 2/2] remove hosts file link check - ---- - src/firejail/fs_hostname.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c -index 97ce70f9c1..b228707131 100644 ---- a/src/firejail/fs_hostname.c -+++ b/src/firejail/fs_hostname.c -@@ -154,9 +154,6 @@ void fs_mount_hosts_file(void) { - struct stat s; - if (stat("/etc/hosts", &s) == -1) - goto errexit; -- // not a link -- if (is_link("/etc/hosts")) -- goto errexit; - // owned by root - if (s.st_uid != 0) - goto errexit; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix index baa92decd9..e600e163ad 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fnotifystat/default.nix @@ -1,22 +1,26 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fnotifystat"; version = "0.02.07"; - src = fetchurl { - url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "0ipfg2gymbgx7bqlx1sq5p2y89k5j18iqnb0wa27n5s3kh9sh8w0"; + src = fetchFromGitHub { + owner = "ColinIanKing"; + repo = pname; + rev = "V${version}"; + sha256 = "sha256-5oYM1t+vmWywYRbgXI2RGQlOuNJluj2gwCMf3pTpDC0="; }; - installFlags = [ "DESTDIR=$(out)" ]; - postInstall = '' - mv $out/usr/* $out - rm -r $out/usr - ''; + + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/share/man/man8" + "BASHDIR=${placeholder "out"}/share/bash-completion/completions" + ]; + meta = with lib; { description = "File activity monitoring tool"; - homepage = "https://kernel.ubuntu.com/~cking/fnotifystat/"; - license = licenses.gpl2; + homepage = "https://github.com/ColinIanKing/fnotifystat"; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ womfoo ]; + maintainers = with maintainers; [ womfoo dtzWill ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/config-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/config-paths.patch deleted file mode 100644 index 88358038bc..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/config-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in ---- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in 2009-11-20 17:53:12.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in 2012-02-25 15:16:12.758849219 +0100 -@@ -224,7 +224,7 @@ - # - # broker_list= - # --broker_list=tsp-broker-list.txt -+broker_list=/var/lib/gogoc/tsp-broker-list.txt - - # - # Last Server Used File Name: -@@ -234,7 +234,7 @@ - # - # last_server= - # --last_server=tsp-last-server.txt -+last_server=/var/lib/gogoc/tsp-last-server.txt - - # - # Always Use Last Known Working Server: -@@ -294,7 +294,7 @@ - # - # log_filename= - # --log_filename=gogoc.log -+log_filename=/var/log/gogoc.log - - # - # Log File Rotation: -@@ -313,7 +313,7 @@ - # - # log_rotation= - # --log_rotation=yes -+log_rotation=no - - # - # Log File Rotation Size: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix deleted file mode 100644 index 75c0f1c3d1..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}: - -stdenv.mkDerivation rec { - pname = "gogoclient"; - version = "1.2"; - - src = fetchurl { - #url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz"; - url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz"; - sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; - }; - patches = [./gcc46-include-fix.patch ./config-paths.patch ]; - makeFlags = ["target=linux"]; - installFlags = ["installdir=$(out)"]; - - hardeningDisable = [ "format" ]; - - buildInputs = [openssl]; - - preFixup = '' - mkdir -p $out/share/gogoclient-${version} - chmod 444 $out/bin/gogoc.conf - mv $out/bin/gogoc.conf $out/share/gogoclient-${version}/gogoc.conf.sample - rm $out/bin/gogoc.conf.sample - - substituteInPlace "$out/template/linux.sh" \ - --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ - --replace "/sbin/route" "${nettools}/bin/route" \ - --replace "/sbin/ip" "${iproute2}/sbin/ip" \ - --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" - sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh - ''; - - meta = with lib; { - homepage = "https://ipv6.ernet.in/Tunnel_broker"; - description = "Client to connect to the Freenet6 IPv6 tunnel broker service"; - maintainers = [ maintainers.bluescreen303 ]; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch b/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch deleted file mode 100644 index 22ecad187d..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc ---- gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc 2009-11-20 17:34:55.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc 2012-02-25 15:06:20.764698284 +0100 -@@ -15,6 +15,7 @@ - // ************************************************************************** - #include - #include -+#include - - - namespace gogocmessaging -diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc ---- gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc 2009-11-20 17:34:56.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc 2012-02-25 15:06:36.722740288 +0100 -@@ -15,6 +15,7 @@ - // ************************************************************************** - #include - #include -+#include - - - namespace gogocmessaging diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/greetd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/greetd/default.nix index cfde703cd6..744b43f6f8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/greetd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/greetd/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { that makes no assumptions about what you want to launch. Comes with agreety, a simple, text-based greeter. ''; - homepage = "https://kl.wtf/projects/greetd/"; + homepage = "https://sr.ht/~kennylevinsen/greetd/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix index fbd4d8efda..c988167469 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl popt ]; + # Disable parallel build, errors: + # *** No rule to make target 'libipvs/libipvs.a', needed by 'ipvsadm'. Stop. + enableParallelBuilding = false; + preBuild = '' makeFlagsArray+=( INCLUDE=$(pkg-config --cflags libnl-genl-3.0) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index 3c7e899cba..8335984488 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -81,12 +81,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.15.5"; in + linuxHeaders = let version = "5.16"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-6VZaMBUlrIHBQs64MvkFPdVoXhB9vPdT0N5MWLyYhR8="; + sha256 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms 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 012833a538..34e1b10b32 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 @@ -452,6 +452,8 @@ let }; security = { + FORTIFY_SOURCE = whenAtLeast "4.13" (option yes); + # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html DEBUG_LIST = yes; # Detect writes to read-only module pages 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 43bc291ede..881757efd3 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 @@ -2,51 +2,51 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.262-hardened1.patch", - "sha256": "0z2vdqbsqngdm1w7dh65c1ir25x6vrpmyrjx3c8vgzql67c5xb4b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.262-hardened1/linux-hardened-4.14.262-hardened1.patch" + "name": "linux-hardened-4.14.264-hardened1.patch", + "sha256": "1zlsww0mqaw5cswwqjvc9magh2a31v6ii7a4ivdra6nsv1xrdimy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.264-hardened1/linux-hardened-4.14.264-hardened1.patch" }, - "sha256": "05yl51r5n3q9l8pq6azx3bbl69l79lk8vkdivy3cvgzdh59pizac", - "version": "4.14.262" + "sha256": "1d1588f0zrq93dk9j8gmvfm9mlniyw98s0i3gmg2sa7h1p04pc2m", + "version": "4.14.264" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.225-hardened1.patch", - "sha256": "0wqwgsk0giwcp0kwp39nkv5bdqk4s2np7gsjymaqimq9187cnkvv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.225-hardened1/linux-hardened-4.19.225-hardened1.patch" + "name": "linux-hardened-4.19.227-hardened1.patch", + "sha256": "127l8s1wb71iyb4iw1bxkxn48qcchz50qwjpx9r2vm81cihasxs7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.227-hardened1/linux-hardened-4.19.227-hardened1.patch" }, - "sha256": "15k7b04zx5ggfjagp8sfrylr9xgwgz3hb2bygdml7ka1jnbv76jb", - "version": "4.19.225" + "sha256": "0d1jyyxdrpyi35033fjg8g6zz99ffry2ks1wlldfaxfa6wh9dp39", + "version": "4.19.227" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.93-hardened1.patch", - "sha256": "0ka3vnd1pwdjkz10hpn4jpxbg6s00kf5jj47847vhbi7fmbgvbg5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.93-hardened1/linux-hardened-5.10.93-hardened1.patch" + "name": "linux-hardened-5.10.96-hardened1.patch", + "sha256": "000mpwvyxkiw0kn0wdz8c97a39wafc8pia4rqraf7z21hbavbiav", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.96-hardened1/linux-hardened-5.10.96-hardened1.patch" }, - "sha256": "1jxv7can60rc5i2yjgj8frcjvwi1jnba1jl8i3070xmb1d1qqy56", - "version": "5.10.93" + "sha256": "0j70nbsxy6qpynr3f9igl9wf14wx40diazf4j7w7mlwxh51a1r9m", + "version": "5.10.96" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.16-hardened1.patch", - "sha256": "0a8cdxw2s0jr39j072pn7xr5j8zfdmrbsfl5rbvcjqrfnj4ijc15", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.16-hardened1/linux-hardened-5.15.16-hardened1.patch" + "name": "linux-hardened-5.15.19-hardened1.patch", + "sha256": "0nkwf7dzvgm30hl24g8rpk3raqcxlplga0ksk8f9w7s87axpr5lm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.19-hardened1/linux-hardened-5.15.19-hardened1.patch" }, - "sha256": "150pzxra564z9xaaclmbbd29x4x9il8y78zz7szi50lzx0a0l2ms", - "version": "5.15.16" + "sha256": "0l70ckc0imnn7x9p9dawprzblszadk79468wx3zqz951yb4k5gh1", + "version": "5.15.19" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.173-hardened1.patch", - "sha256": "1zpczgxyh76lazsjgf7n1872aayaxg660x6phyr6db667wa8x3r4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.173-hardened1/linux-hardened-5.4.173-hardened1.patch" + "name": "linux-hardened-5.4.176-hardened1.patch", + "sha256": "0w8zh2kcaclancivr65ij6mgbgyvf5vmlmf3mls4n1yj0ld15ghd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.176-hardened1/linux-hardened-5.4.176-hardened1.patch" }, - "sha256": "0ff2jvwxj55547wvwp94a8bsd610s72906d4nsyhiirrn9sy5s4r", - "version": "5.4.173" + "sha256": "0h67d34n8cwq60rv8nw0a7n9mkihs0cg0b5zl6ihfyjflqj0jq6r", + "version": "5.4.176" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7b9013fbaf..3b6262f4f9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.263"; + version = "4.14.264"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0bn17p1mmkc37bqv7bvksli4xpyp660mbcjm6jmh6k348i1bfwqf"; + sha256 = "1d1588f0zrq93dk9j8gmvfm9mlniyw98s0i3gmg2sa7h1p04pc2m"; }; } // (args.argsOverride or {})) 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 98cc139273..5a00b8b4c1 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.226"; + version = "4.19.227"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1b9qvl994n09708sql3q3g5l3xq2hxam83fnws5asd8mdnk7i7wk"; + sha256 = "0d1jyyxdrpyi35033fjg8g6zz99ffry2ks1wlldfaxfa6wh9dp39"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index d2de100ad3..9271aa0182 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.300"; + version = "4.4.302"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19mpqg48yi7qm1a2mncqax7pj42accryj6yrkbywd7kj4q0b64kg"; + sha256 = "1cvnydc7y5xrb1c4yfmsl846dd1jfrr7xf62gxbhnkk01fs7n09m"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 70457c1b3b..50a803892b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.298"; + version = "4.9.299"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0nrhjqn6bfp9h5dc7yacgkbfvfdhlks8ph4dzqyfjljmx9cf95ym"; + sha256 = "1n0y8hi7ljs9jr3viqhbpshq0wapmyqb8d9vlh4yzg2n5y5qs3l1"; }; } // (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 90bd4dc2ae..a62d1d5545 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.94"; + version = "5.10.98"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "023mrm8wjmxi6qp21p1d0kzs8k0pls6l8kp75ajix2ls9am49zr8"; + sha256 = "0hwl1ypllx9l5pv04yavz627qb31ki9mhznsak5bq48hbz0wc90v"; }; } // (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 336ee4149a..9ae9f4c7fa 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.17"; + version = "5.15.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1pmbf3xin533z4jpqj8p733ii5zk0k36v4cpzl14k62rrk0gb1r7"; + sha256 = "1lgvf3mrsbwjdjfvznbf5c3np76a7xxqr2rw7i6196ywsxnfnki9"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix index 096c48c008..8d604ff9e6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.3"; + version = "5.16.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cdmp7k6qfm8gyr8zv589y6bgmyj7n6wyk36f98m0w2vq3ljyh5s"; + sha256 = "1kd6v31z9rylnpyrv6b3i622ismxbiv165dcjh2fn5aliqzgalap"; }; } // (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 fd47f8c0ec..edbeb91952 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.174"; + version = "5.4.177"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1a88hfcskrcbz7gyh8pkcymka4djdhdy6fdh4i0b9ygsmvjipkg8"; + sha256 = "0wvb5is8rqvfxia1i8lw4yd3fm2bhb6wdl0bdjq90dx7y46wpxqq"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 4d078e45fe..b647f6c4e1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18517"; - sha256 = "1i4gppn3lyi3aqzscrdhm2dsvfa84xqhymcc468sakn9in3g85gg"; + rev = "18587"; + sha256 = "01h3mvj36b3wnkjm932ya5prsyfw7fszifdb9bvqwrd2ggawxng9"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index e417ee6d38..52fc24e101 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2021-12-26" -, commit ? "b034dfb24fece43a7677b9a29781495aeb62767f" -, diffHash ? "0m7qrnfrcx3dki9lmsq3jk3mcrfm99djh83gwwjh401ql0cycx5p" +, date ? "2022-01-12" +, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9" +, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 00e9fd0a09..64934724c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.12"; + version = "5.15.19"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-XGIq0OjC9nGQ8oUIoLIBT+Nj3pjleDeKvkz2QrZWJcI="; + sha256 = "sha256-4DChsTFWm/9X0iV9yhWZqOz7dxfNbok7cFLKAYKs+Dw="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index 257485645f..c1f2429d12 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.11-zen1"; + modDirVersion = "5.16.3-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-KOy1bmNnfa8LtnE+03Y+0pr9r1OCimY0bjGsVmGnPN4="; + sha256 = "sha256-7OoNbDYTFpgE47oNhVA54nAj0keRyYMJvuccFW3ah4c="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch new file mode 100644 index 0000000000..61ad2a474f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch @@ -0,0 +1,28 @@ +From 59d91e57d103fb4686d2f45ee3c688878244367a Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Tue, 24 Nov 2020 22:12:40 +0100 +Subject: [PATCH] Remove unused function 'after_eq' + +--- + keyctl_watch.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/keyctl_watch.c b/keyctl_watch.c +index a70a19a..c4ca7f7 100644 +--- a/keyctl_watch.c ++++ b/keyctl_watch.c +@@ -47,11 +47,6 @@ static struct watch_notification_filter filter = { + }, + }; + +-static inline bool after_eq(unsigned int a, unsigned int b) +-{ +- return (signed int)(a - b) >= 0; +-} +- + static void consumer_term(int sig) + { + consumer_stop = 1; +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix index 71f708e210..f307bd56d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm"; }) ./conf-symlink.patch + # This patch solves a duplicate symbol error when building with a clang stdenv + # Before removing this patch, please ensure the package still builds by running eg. + # nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.llvmPackages_latest.stdenv; }' + ./0001-Remove-unused-function-after_eq.patch ]; makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix index 8b979d4795..aeb261aaac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.185"; + version = "11.2.203"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg"; + sha256 = "sha256-W5Mg5ATUARMFAy1VVpMKPar0VpbKfrkxa6bDhqVYpoc="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix new file mode 100644 index 0000000000..cf2da7d164 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lsirec/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "lsirec"; + version = "unstable-2019-03-03"; + + src = fetchFromGitHub { + owner = "marcan"; + repo = "lsirec"; + rev = "2dfb6dc92649feb01a3ddcfd117d4a99098084f2"; + sha256 = "sha256-8v+KKjAJlJNpUT0poedRTQfPiDiwahrosXD35Bmh3jM="; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + install -Dm755 'lsirec' "$out/bin/lsirec" + install -Dm755 'sbrtool.py' "$out/bin/sbrtool" + + runHook postInstall + ''; + + meta = with lib; { + description = "LSI SAS2008/SAS2108 low-level recovery tool for Linux"; + homepage = "https://github.com/marcan/lsirec"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index 1f5fd88957..923047ead1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20210608"; + version = "20220207"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "08nk353z2lcqsjbm2qdsfapfgrvlfw0rj7r9scr9pllzkjj5n9x3"; + sha256 = "sha256-yNHYAf8AX8C8iSaFWa6u7knUryaUgvI6nIH9jkD4jjw="; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 1de783a559..bfe03ecc5d 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -71,7 +71,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net|--offline|--impure) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--print-build-logs|--refresh|--no-net|--offline|--impure) extraBuildFlags+=("$i") ;; --option) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix index ba972bb691..0946d5050d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix @@ -1,17 +1,32 @@ -{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, numactl, ncurses, check }: stdenv.mkDerivation rec { pname = "numatop"; - version = "2.1"; - src = fetchurl { - url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; + version = "2.2"; + src = fetchFromGitHub { + owner = "intel"; + repo = "numatop"; + rev = "v${version}"; + sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ numactl ncurses ]; checkInputs = [ check ]; + patches = [ + (fetchpatch { + url = "https://github.com/intel/numatop/pull/54.patch"; + sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM="; + name = "fix-string-operations.patch"; + }) + (fetchpatch { + url = "https://github.com/intel/numatop/pull/64.patch"; + sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM="; + name = "fix-format-strings-mvwprintw.patch"; + }) + ]; + doCheck = true; meta = with lib; { @@ -20,8 +35,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; platforms = [ - { kernel.name = "linux"; cpu.family = "x86"; } - { kernel.name = "linux"; cpu.family = "power"; } + "i686-linux" "x86_64-linux" + "powerpc64-linux" "powerpc64le-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index d108ca0d00..24ab34c4ea 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -89,10 +89,11 @@ installPhase() { sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed fi + # nvidia currently only supports x86_64 and i686 if [ "$system" = "i686-linux" ]; then install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json else - install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json + install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.x86_64.json fi fi 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 250ebbb59f..3f58b0a536 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 @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "495.46"; - sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU="; - settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk="; - persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI="; + version = "510.47.03"; + sha256_64bit = "8qQh2ug2MY08DZZFnMs68n6Q5QyVsPqkKIr3Ynnl1pA="; + settingsSha256 = "lQRh8dG4NW2vLe4R6xx42BzAu3R6iLyrk3GOGKLfufQ="; + persistencedSha256 = "I8pIdBhbX9rfyhjQHGD5zjCwLF2zl2jc1Id+CTbSHKc="; } else legacy_390; @@ -77,6 +77,7 @@ rec { persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; + broken = with kernel; kernelAtLeast "5.5"; patches = [ ./vm_operations_struct-fault.patch ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index 3b4ed64bda..c7e062534a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -115,7 +115,7 @@ let description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix index e2346cca95..380d76844c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.15.1"; + version = "2.16.2"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0vgijwycf3wvzv9v811jrfr5rlwmihlxwpf16spl6k9n6zaswysw"; + sha256 = "sha256-A6xMMpmzjlbAtNTCejKclYsAOgjztUigo8qLmU8tSTQ="; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix index 33ab4f784f..1476ae4900 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix @@ -5,13 +5,15 @@ stdenv.mkDerivation rec { pname = "linux-pam"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; - sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; + sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0="; }; + patches = [ ./suid-wrapper-path.patch ]; + outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch new file mode 100644 index 0000000000..71533c51a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch @@ -0,0 +1,6 @@ +It needs the SUID version during runtime, and that can't be in /nix/store/** +--- a/modules/pam_unix/Makefile.in ++++ b/modules/pam_unix/Makefile.in +@@ -651 +651 @@ +- -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ ++ -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procdump/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/procdump/default.nix index 0b40a4dd03..05ec4b90ed 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/procdump/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/procdump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, coreutils, gdb, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }: stdenv.mkDerivation rec { pname = "procdump"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc="; }; + patches = [ + # Pull upstream patch to fix parallel builds: + # https://github.com/Sysinternals/ProcDump-for-Linux/pull/133 + (fetchpatch { + name = "parallel.patch"; + url = "https://github.com/Sysinternals/ProcDump-for-Linux/commit/0d735836f11281cc6134be93eac8acb302f2055e.patch"; + sha256 = "sha256-zsqllPHF8ZuXAIDSAPvbzdKa43uSSx9ilUKM1vFVW90="; + }) + ]; + nativeBuildInputs = [ zlib ]; buildInputs = [ bash coreutils gdb ]; @@ -27,6 +37,8 @@ stdenv.mkDerivation rec { "MANDIR=/share/man/man1" ]; + enableParallelBuilding = true; + doCheck = false; # needs sudo root doInstallCheck = true; 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 02321d8435..f7543291de 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 @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "38.1"; + version = "39.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "05r5f9agpn7dcx5jmggrsm9953w2k6ly6gfbg9b8wjdc853apqp7"; + sha256 = "sha256-7Z06bdCtv/gdZKzKfcU+JrWl4+b6b/cdKp8pMLCZZo0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/samples/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/samples/default.nix new file mode 100644 index 0000000000..f9c5ae4505 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/samples/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, lib +, makeWrapper +, sgx-sdk +, sgx-psw +, which + # "SIM" or "HW" +, sgxMode +}: +let + isSimulation = sgxMode == "SIM"; + buildSample = name: stdenv.mkDerivation { + pname = name; + version = sgxMode; + + src = sgx-sdk.out; + sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}"; + + nativeBuildInputs = [ + makeWrapper + which + ]; + + buildInputs = [ + sgx-sdk + ]; + + # The samples don't have proper support for parallel building + # causing them to fail randomly. + enableParallelBuilding = false; + + buildFlags = [ + "SGX_MODE=${sgxMode}" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + install -m 755 app $out/bin + install *.so $out/lib + + wrapProgram "$out/bin/app" \ + --run "cd $out/lib" \ + ${lib.optionalString (!isSimulation) + ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} + + runHook postInstall + ''; + + # Breaks the signature of the enclaves + dontFixup = true; + + # We don't have access to real SGX hardware during the build + doInstallCheck = isSimulation; + installCheckPhase = '' + runHook preInstallCheck + + pushd / + echo a | $out/bin/app + popd + + runHook preInstallCheck + ''; + }; +in +{ + cxx11SGXDemo = buildSample "Cxx11SGXDemo"; + localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: { + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + install -m 755 bin/app* $out/bin + install bin/*.so $out/lib + + for bin in $out/bin/*; do + wrapProgram $bin \ + --run "cd $out/lib" \ + ${lib.optionalString (!isSimulation) + ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} + done + + runHook postInstall + ''; + }); + powerTransition = buildSample "PowerTransition"; + protobufSGXDemo = buildSample "ProtobufSGXDemo"; + remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: { + # Makefile sets rpath to point to $TMPDIR + preFixup = '' + patchelf --remove-rpath $out/bin/app + ''; + + postInstall = '' + install sample_libcrypto/*.so $out/lib + ''; + }); + sampleEnclave = buildSample "SampleEnclave"; + sampleEnclavePCL = buildSample "SampleEnclavePCL"; + sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP"; + sealUnseal = (buildSample "SealUnseal").overrideAttrs (oldAttrs: { + prePatch = '' + substituteInPlace App/App.cpp \ + --replace '"sealed_data_blob.txt"' '"/tmp/sealed_data_blob.txt"' + ''; + }); + switchless = buildSample "Switchless"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix index 93c12da94a..baa4ad2a33 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -3,15 +3,16 @@ , fetchFromGitHub , fetchpatch , fetchzip -, callPackage , autoconf , automake , binutils +, callPackage , cmake , file , gdb , git , libtool +, linkFarmFromDrvs , nasm , ocaml , ocamlPackages @@ -20,6 +21,7 @@ , python3 , texinfo , validatePkgConfig +, writeShellApplication , writeShellScript , writeText , debug ? false @@ -262,7 +264,25 @@ stdenv.mkDerivation rec { postHooks+=(sgxsdk) ''; - passthru.tests = callPackage ./samples.nix { }; + passthru.tests = callPackage ../samples { sgxMode = "SIM"; }; + + # Run tests in SGX hardware mode on an SGX-enabled machine + # $(nix-build -A sgx-sdk.runTestsHW)/bin/run-tests-hw + passthru.runTestsHW = + let + testsHW = lib.filterAttrs (_: v: v ? "name") (callPackage ../samples { sgxMode = "HW"; }); + testsHWLinked = linkFarmFromDrvs "sgx-samples-hw-bundle" (lib.attrValues testsHW); + in + writeShellApplication { + name = "run-tests-hw"; + text = '' + for test in ${testsHWLinked}/*; do + printf '*** Running test %s ***\n\n' "$(basename "$test")" + printf 'a\n' | "$test/bin/app" + printf '\n' + done + ''; + }; meta = with lib; { description = "Intel SGX SDK for Linux built with IPP Crypto Library"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/samples.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/samples.nix deleted file mode 100644 index 21b31f8244..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/samples.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, sgx-sdk -, which -}: -let - buildSample = name: stdenv.mkDerivation rec { - inherit name; - - src = sgx-sdk.out; - sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}"; - - buildInputs = [ - sgx-sdk - ]; - - # The samples don't have proper support for parallel building - # causing them to fail randomly. - enableParallelBuilding = false; - - buildFlags = [ - "SGX_MODE=SIM" - ]; - - installPhase = '' - mkdir $out - install -m 755 app $out/app - install *.so $out/ - ''; - - doInstallCheck = true; - installCheckInputs = [ which ]; - installCheckPhase = '' - pushd $out - ./app - popd - ''; - }; -in -{ - cxx11SGXDemo = buildSample "Cxx11SGXDemo"; - localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: { - installPhase = '' - mkdir $out - cp -r bin/. $out/ - ''; - }); - powerTransition = (buildSample "PowerTransition").overrideAttrs (oldAttrs: { - # Requires interaction - doInstallCheck = false; - }); - protobufSGXDemo = buildSample "ProtobufSGXDemo"; - remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: { - dontFixup = true; - installCheckPhase = '' - echo "a" | LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/sample_libcrypto ./app - ''; - }); - sampleEnclave = buildSample "SampleEnclave"; - sampleEnclavePCL = buildSample "SampleEnclavePCL"; - sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP"; - sealUnseal = buildSample "SealUnseal"; - switchless = buildSample "Switchless"; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix index e20023b2b6..2e4ae1649e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix @@ -11,7 +11,7 @@ let else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc; dots_in_usernames = fetchpatch { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix index 2d5b3e2ab5..5389caaa33 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sysstat"; - version = "12.4.3"; + version = "12.4.4"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; - sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; + sha256 = "sha256-lRLnR54E+S4lHFxrS9lLj2Q9ISvQ6Yao6k0Uem6UPSQ="; }; buildInputs = [ gettext ]; 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 f17dd02e7c..3a3a419093 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -594,16 +594,20 @@ stdenv.mkDerivation { rm -rf $out/share/doc ''; - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; + passthru = { + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + interfaceVersion = 2; - passthru.tests = { - inherit (nixosTests) switchTest; + inherit withCryptsetup; + + tests = { + inherit (nixosTests) switchTest; + }; }; meta = with lib; { @@ -612,6 +616,6 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ eelco flokli kloenk ]; + maintainers = with maintainers; [ flokli kloenk mic92 ]; }; } 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 afdf335e1b..8485565e0a 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 @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.37.2"; + version = "2.37.3"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-agdkwarn+2B++KbdLA9sR9Xl/SeqCIIKuq2ewU4o6dk="; + sha256 = "sha256-WQxZLljNa/OFGctGevBc5qGrGAQOPjQY8kvPsvVfl3Y="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wlgreet/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wlgreet/default.nix index 4758945e41..932aa47fd7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wlgreet/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wlgreet/default.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "wlgreet"; - version = "0.3"; + pname = "wlgreet-unstable"; + version = "2022-01-25"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; - sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc"; + repo = "wlgreet"; + rev = "8517e578cb64a8fb3bd8f8a438cdbe46f208b87c"; + sha256 = "0la4xlikw61cxvbkil1d22dgvazi7rs17n5i2z02090fvnfxxzxh"; }; - cargoSha256 = "1lwy8xmkl9n3fj3wlf80wp728nn9p5rjnbgmm2cbpqxklcgbmxhm"; + cargoSha256 = "651d2bf01612534f1c4b0472c812095a86eb064d16879380c87f684c04fe0d8d"; meta = with lib; { description = "Raw wayland greeter for greetd, to be run under sway or similar"; diff --git a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix index d45a2f0665..d51219e69a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }: +{ lib, stdenv, fetchurl, dosfstools, libseccomp, makeWrapper, mtools, parted +, pkg-config, qemu, syslinux, util-linux }: let version = "0.6.9"; @@ -15,7 +16,7 @@ in stdenv.mkDerivation { pname = "solo5"; inherit version; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux) libseccomp; src = fetchurl { @@ -47,6 +48,14 @@ in stdenv.mkDerivation { [ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind} '') targets} + substituteInPlace $out/bin/solo5-virtio-mkimage \ + --replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \ + --replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \ + --replace "cp " "cp --no-preserve=mode " + + wrapProgram $out/bin/solo5-virtio-mkimage \ + --prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]} + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/servers/alps/default.nix b/third_party/nixpkgs/pkgs/servers/alps/default.nix index f367dc5940..fb10a5369f 100644 --- a/third_party/nixpkgs/pkgs/servers/alps/default.nix +++ b/third_party/nixpkgs/pkgs/servers/alps/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug="; }; - vendorSha256 = "sha256-8fmbv5uPRfzUqsYU95YzsnuFkq4cwj+LN2X3W/yBHyA="; + vendorSha256 = "sha256-Vg0k+YSMg6Ree/jkVV2VQ8RbSbQFUhmUN2MeTBxPeLo="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix index 475541231b..4d0c07b0bf 100644 --- a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; }; - vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz"; + vendorSha256 = "1w9c0qzah2f9rbjdxqajwrfkia25cwbn30gidviaid3b7ddpd7r8"; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix index a317925d22..f6cb86e409 100644 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "calibre-web"; - version = "0.6.15"; + version = "0.6.16"; src = fetchFromGitHub { owner = "janeczku"; repo = "calibre-web"; rev = version; - sha256 = "02caq07rzx23iad13wxg8g9z0z77f5ycdrav6fp7z5rl1wi0yc3r"; + sha256 = "sha256-vRnzsV9pubAmyVSxZpBK+mD9Bkbt6BQYo5S0Jsl26Ns="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 19b3a25de5..5aa702e28d 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -9,18 +9,17 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.16"; + version = "9.16.25"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bJE5Aq34eOfcXiKc6pT678nUD0R3WjAhPt0Ihg92HXs="; + sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch - ./remove-mkdir-var.patch ]; nativeBuildInputs = [ perl pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index ceb887e678..89c5822657 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,20 +1,22 @@ -diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h ---- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200 -+++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200 -@@ -69,7 +69,9 @@ - EXTERN const char *named_g_product INIT(PRODUCT); - EXTERN const char *named_g_description INIT(DESCRIPTION); - EXTERN const char *named_g_srcid INIT(SRCID); +diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +index 82b632ef04..dedfd4d33b 100644 +--- a/bin/named/include/named/globals.h ++++ b/bin/named/include/named/globals.h +@@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION); + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char *named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char *named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); -diff -ru a/bin/named/main.c b/bin/named/main.c ---- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200 -+++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200 -@@ -506,7 +506,9 @@ + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); +diff --git a/bin/named/main.c b/bin/named/main.c +index 9ad2d0e277..9729a2b3fc 100644 +--- a/bin/named/main.c ++++ b/bin/named/main.c +@@ -521,7 +521,9 @@ printversion(bool verbose) { } printf("running on %s\n", named_os_uname()); @@ -24,7 +26,7 @@ diff -ru a/bin/named/main.c b/bin/named/main.c #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else /* ifdef __clang__ */ -@@ -1102,9 +1104,11 @@ +@@ -1089,9 +1091,11 @@ setup(void) { NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", named_os_uname()); diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/remove-mkdir-var.patch b/third_party/nixpkgs/pkgs/servers/dns/bind/remove-mkdir-var.patch deleted file mode 100644 index d0dcd580c2..0000000000 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/remove-mkdir-var.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -53,8 +53,7 @@ docclean manclean maintainer-clean:: - doc man:: ${MANOBJS} - - installdirs: -- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \ -- ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} -+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir} - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 - - install:: isc-config.sh installdirs 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 1938e9c02b..80939b8df4 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2da6e50b0662297d55f80e349568224e07fe88cad20bee1d2e22f54bb32da064"; + sha256 = "e9ba1305d750dc08fb08687aec7ac55737ca073deaa0b867c884e0c0f2fdb753"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix index eee65c3a5d..0efadc6524 100644 --- a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; + homepage = "https://github.com/gnosek/fcgiwrap"; description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/servers/firebird/default.nix b/third_party/nixpkgs/pkgs/servers/firebird/default.nix index 7924f6e6ab..5348862ed6 100644 --- a/third_party/nixpkgs/pkgs/servers/firebird/default.nix +++ b/third_party/nixpkgs/pkgs/servers/firebird/default.nix @@ -54,13 +54,13 @@ let base = { }); firebird_3 = stdenv.mkDerivation (base // rec { - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; - rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-8nGan10qjW8dFF89BL/tUWtwMGhahBiODbOqRrHSrbs="; + rev = "v${version}"; + sha256 = "sha256-l1V3CGxTybPY8pl6WhsExqdWJLiYsOv5BCrU/iD+I7k="; }; buildInputs = base.buildInputs ++ [ zlib libtommath ]; @@ -69,13 +69,13 @@ let base = { }); firebird_4 = stdenv.mkDerivation (base // rec { - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - sha256 = "sha256-Pc3hUAhXgpa6VOkjidfh/vS/60Gtjenid8nHnIH7s0E="; + sha256 = "sha256-0XUu1g/VTrklA3vCpX6HWr7sdW2eQupnelpFNSGcouM="; }; buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix index 2a94008a4e..98fd6ca798 100644 --- a/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix +++ b/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix @@ -123,7 +123,7 @@ let homepage = "https://www.foundationdb.org"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice lostnet ]; }; }; in makeFdb diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix b/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix index b3a876546e..69e4ad9bd0 100644 --- a/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix @@ -2,7 +2,7 @@ , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk -, python2, python3, openjdk, mono, libressl, boost +, python2, python3, openjdk, mono, libressl, boost168 }@args: let @@ -10,6 +10,7 @@ let cmakeBuild = import ./cmake.nix (args // { gccStdenv = gccStdenv; llvmPackages = llvmPackages; + boost = boost168; }); python3-six-patch = fetchpatch { diff --git a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix index 2c45d7c75a..d712855e32 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.1.0"; + version = "3.2.2"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA="; + sha256 = "sha256-o4tjEIgDTj2EUbfaKCHZfvEKCwxNpsabU437kU+Vpnk="; }; - cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4="; + cargoSha256 = "sha256-rE0I13dKbGgJmh6vF/cWvIZfqtKzzgn7pTiB3HJ7cgY="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix index 803945c7a2..80b5fbda81 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "1.7.5"; + version = "1.8"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-BBd0AL5jRRslxzDnxcTZRR+8J5D23NAQ7mp9K+leXAQ="; + sha256 = "sha256-CwJPaZefRDyn2fliOd9FnOLXq70HFu2RsUZhzWQdE3E"; }; - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/omar-polo/gmid/commit/eb77afa8d308a2f4f422df2ff19f023b5b2cc591.patch"; - sha256 = "sha256-rTTZUpfXOg7X0Ad0Y9evyU7k+aVYpJ0t9SEkNA/sSdk="; - }) - ]; - nativeBuildInputs = [ bison ]; buildInputs = [ libressl libevent ]; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix index 8d8ad16e78..81e1c17467 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mime-types, scdoc }: +{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mailcap, scdoc }: stdenv.mkDerivation rec { pname = "gmnisrv"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" ''; - MIMEDB = "${mime-types}/etc/mime.types"; + MIMEDB = "${mailcap}/etc/mime.types"; nativeBuildInputs = [ pkg-config scdoc ]; - buildInputs = [ openssl mime-types ]; + buildInputs = [ openssl mailcap ]; meta = with lib; { description = "A simple Gemini protocol server"; diff --git a/third_party/nixpkgs/pkgs/servers/h2/default.nix b/third_party/nixpkgs/pkgs/servers/h2/default.nix index d05232193d..ee673b53aa 100644 --- a/third_party/nixpkgs/pkgs/servers/h2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/h2/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "h2"; - - version = "1.4.199"; + version = "2.1.210"; src = fetchzip { - url = "https://h2database.com/h2-2019-03-13.zip"; - sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj"; + url = "https://github.com/h2database/h2database/releases/download/version-${version}/h2-2022-01-17.zip"; + sha256 = "0zcjblhjj98dsj954ia3by9vx5w7mix1dzi85jnvp18kxmbldmf4"; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = @@ -24,8 +25,9 @@ stdenv.mkDerivation rec { fi ''; in '' - mkdir -p $out - cp -R * $out + mkdir -p $out $doc/share/doc/ + cp -R bin $out/ + cp -R docs $doc/share/doc/h2 echo '${h2ToolScript}' > $out/bin/h2tool.sh diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index 8057b56e9f..cba689df11 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-PgSjxDmPahGd2o3QBfvytMva+LHWeLPm500DsNdB77Q="; + sha256 = "sha256-0SIQninNnJZ6KN5RKIMJzJQZRV7ThfJZal1lhsBnTIY="; }; - vendorSha256 = "sha256-gD4jGaR4KQiYL6+yA8g2u6cTEbfySTMErNqerw76Ook="; + vendorSha256 = "sha256-n5E6pzswenMJrThCys0UM2LVXKDXqCXDW7uR0V4H56w="; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ]; @@ -44,6 +44,6 @@ buildGoModule rec { Headscale implements this coordination server. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nkje jk ]; + maintainers = with maintainers; [ nkje jk kradalby ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix index 48aa24b2b8..cfbf1c1fb9 100644 --- a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rQBmg1CBourj/dDJ7P108gGMRdXWp6nwvHIBiQbJLQ0="; + sha256 = "sha256-c+YP4pEGvLi7wZsDXrkoqR/isuYfXQmTwQp9gN5jHkQ="; }; postPatch = '' 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 7a325693a0..8f4ba61e86 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,14 +2,14 @@ # Do not edit! { - version = "2021.12.10"; + version = "2022.2.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; - "adax" = ps: with ps; [ adax ]; + "adax" = ps: with ps; [ adax-local adax ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -45,18 +45,18 @@ "apcupsd" = ps: with ps; [ apcaccess ]; "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ pyatv ]; + "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ aprslib geopy ]; "aqualogic" = ps: with ps; [ aqualogic ]; "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ arcam-fmj ]; - "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg pyarlo ]; "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect ]; "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "aseko_pool_live" = ps: with ps; [ aioaseko ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ aioasuswrt ]; @@ -65,7 +65,8 @@ "atome" = ps: with ps; [ pyatome ]; "august" = ps: with ps; [ yalexs ]; "aurora" = ps: with ps; [ auroranoaa ]; - "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy + "aurora_abb_powerone" = ps: with ps; [ aurorapy ]; + "aussie_broadband" = ps: with ps; [ pyaussiebb ]; "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; @@ -121,7 +122,7 @@ "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; - "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook + "circuit" = ps: with ps; [ circuit-webhook ]; "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; "cisco_webex_teams" = ps: with ps; [ webexteamssdk ]; @@ -181,6 +182,7 @@ "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; "dht" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-dht + "diagnostics" = ps: with ps; [ aiohttp-cors ]; "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower @@ -223,6 +225,7 @@ "elgato" = ps: with ps; [ elgato ]; "eliqonline" = ps: with ps; [ eliqonline ]; "elkm1" = ps: with ps; [ elkm1-lib ]; + "elmax" = ps: with ps; [ elmax-api ]; "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; "emoncms" = ps: with ps; [ ]; @@ -282,7 +285,7 @@ "flume" = ps: with ps; [ pyflume ]; "flunearyou" = ps: with ps; [ pyflunearyou ]; "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ flux-led ]; + "flux_led" = ps: with ps; [ aiohttp-cors flux-led ifaddr ]; "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ foobot-async ]; @@ -325,6 +328,7 @@ "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; + "goodwe" = ps: with ps; [ goodwe ]; "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -371,6 +375,7 @@ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; + "homewizard" = ps: with ps; [ aiohwenergy ]; "homeworks" = ps: with ps; [ pyhomeworks ]; "honeywell" = ps: with ps; [ somecomfort ]; "horizon" = ps: with ps; [ ]; # missing inputs: horimote @@ -402,12 +407,14 @@ "incomfort" = ps: with ps; [ incomfort-client ]; "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; + "input_button" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; "input_select" = ps: with ps; [ ]; "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ pyinsteon ]; "integration" = ps: with ps; [ ]; + "intellifire" = ps: with ps; [ intellifire4py ]; "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; @@ -482,7 +489,7 @@ "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ lupupy ]; "lutron" = ps: with ps; [ pylutron ]; - "lutron_caseta" = ps: with ps; [ aiolip pylutron-caseta ]; + "lutron_caseta" = ps: with ps; [ pylutron-caseta ]; "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ aiohttp-cors aiolyric ]; "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed @@ -574,6 +581,7 @@ "nightscout" = ps: with ps; [ py-nightscout ]; "niko_home_control" = ps: with ps; [ niko-home-control ]; "nilu" = ps: with ps; [ niluclient ]; + "nina" = ps: with ps; [ pynina ]; "nissan_leaf" = ps: with ps; [ pycarwings2 ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail @@ -601,10 +609,12 @@ "ombi" = ps: with ps; [ pyombi ]; "omnilogic" = ps: with ps; [ omnilogic ]; "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "oncue" = ps: with ps; [ aiooncue ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async + "open_meteo" = ps: with ps; [ open-meteo ]; "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless @@ -626,6 +636,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; + "overkiz" = ps: with ps; [ ]; # missing inputs: pyoverkiz "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; @@ -673,7 +684,7 @@ "pushbullet" = ps: with ps; [ pushbullet ]; "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; + "pvoutput" = ps: with ps; [ pvo ]; "pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ]; "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython ]; @@ -682,7 +693,7 @@ "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar "quantum_gateway" = ps: with ps; [ quantum-gateway ]; - "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro + "qvr_pro" = ps: with ps; [ pyqvrpro ]; "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; @@ -729,6 +740,7 @@ "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; + "rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors rtsp-to-webrtc ]; "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound @@ -749,6 +761,7 @@ "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ sense-energy ]; "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat + "senseme" = ps: with ps; [ aiosenseme ]; "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ sqlalchemy ]; "sentry" = ps: with ps; [ sentry-sdk ]; @@ -803,7 +816,7 @@ "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco zeroconf ]; + "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ]; "sony_projector" = ps: with ps; [ pysdcp ]; "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -822,9 +835,10 @@ "statistics" = ps: with ps; [ sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd + "steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ]; "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ aiohttp-cors ha-av ]; + "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ streamlabswater ]; "stt" = ps: with ps; [ aiohttp-cors ]; "subaru" = ps: with ps; [ subarulink ]; @@ -848,11 +862,10 @@ "syslog" = ps: with ps; [ ]; "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ]; "system_health" = ps: with ps; [ aiohttp-cors ]; - "system_log" = ps: with ps; [ aiohttp-cors ]; + "system_log" = ps: with ps; [ ]; "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ python-tado ]; "tag" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ tahoma-api ]; "tailscale" = ps: with ps; [ tailscale ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; @@ -877,7 +890,7 @@ "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ pytibber ]; + "tibber" = ps: with ps; [ pytibber sqlalchemy ]; "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; @@ -910,7 +923,7 @@ "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twinkly" = ps: with ps; [ twinkly-client ]; + "twinkly" = ps: with ps; [ ttls ]; "twitch" = ps: with ps; [ python-twitch-client ]; "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; @@ -919,6 +932,7 @@ "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ unifiled ]; + "unifiprotect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyunifiprotect unifi-discovery "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; @@ -935,7 +949,7 @@ "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp - "velbus" = ps: with ps; [ velbus-aio ]; + "velbus" = ps: with ps; [ aiohttp-cors pyserial pyudev velbus-aio ]; "velux" = ps: with ps; [ pyvlx ]; "venstar" = ps: with ps; [ venstarcolortouch ]; "vera" = ps: with ps; [ pyvera ]; @@ -967,11 +981,11 @@ "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ aiopylgtv ]; + "webostv" = ps: with ps; [ aiowebostv sqlalchemy ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ pywemo ]; "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; - "whois" = ps: with ps; [ python-whois ]; + "whois" = ps: with ps; [ whois ]; "wiffi" = ps: with ps; [ wiffi ]; "wilight" = ps: with ps; [ pywilight ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy @@ -1052,10 +1066,13 @@ "aprs" "arcam_fmj" "arlo" + "aseko_pool_live" "asuswrt" "atag" "august" "aurora" + "aurora_abb_powerone" + "aussie_broadband" "auth" "automation" "awair" @@ -1103,6 +1120,7 @@ "coronavirus" "counter" "cover" + "cpuspeed" "crownstone" "daikin" "darksky" @@ -1120,10 +1138,12 @@ "devolo_home_network" "dexcom" "dhcp" + "diagnostics" "dialogflow" "directv" "discovery" "dlna_dmr" + "dnsip" "doorbird" "dsmr" "dte_energy_bridge" @@ -1135,6 +1155,7 @@ "efergy" "elgato" "elkm1" + "elmax" "emonitor" "emulated_hue" "emulated_kasa" @@ -1162,6 +1183,7 @@ "fireservicerota" "firmata" "fjaraskupan" + "flic" "flick_electric" "flipr" "flo" @@ -1194,9 +1216,11 @@ "geonetnz_quakes" "geonetnz_volcano" "gios" + "github" "glances" "goalzero" "gogogate2" + "goodwe" "google" "google_assistant" "google_domains" @@ -1229,6 +1253,7 @@ "homekit_controller" "homematic" "homematicip_cloud" + "homewizard" "honeywell" "html5" "http" @@ -1249,12 +1274,14 @@ "imap_email_content" "influxdb" "input_boolean" + "input_button" "input_datetime" "input_number" "input_select" "input_text" "insteon" "integration" + "intellifire" "intent" "intent_script" "ios" @@ -1277,6 +1304,7 @@ "kraken" "kulersky" "lastfm" + "launch_library" "lcn" "light" "litterrobot" @@ -1343,6 +1371,7 @@ "network" "nexia" "nightscout" + "nina" "no_ip" "notify" "notion" @@ -1355,7 +1384,9 @@ "octoprint" "omnilogic" "onboarding" + "oncue" "ondilo_ico" + "open_meteo" "openalpr_cloud" "openalpr_local" "openerz" @@ -1389,6 +1420,7 @@ "proximity" "push" "pushbullet" + "pvoutput" "pvpc_hourly_pricing" "python_script" "qld_bushfire" @@ -1417,6 +1449,7 @@ "roon" "rpi_power" "rss_feed_template" + "rtsp_to_webrtc" "ruckus_unleashed" "safe_mode" "samsungtv" @@ -1427,6 +1460,7 @@ "season" "select" "sense" + "senseme" "sensor" "sentry" "seventeentrack" @@ -1453,6 +1487,7 @@ "snips" "solaredge" "solarlog" + "solax" "soma" "somfy" "somfy_mylink" @@ -1473,6 +1508,7 @@ "startca" "statistics" "statsd" + "steamist" "stream" "stt" "subaru" @@ -1560,6 +1596,7 @@ "websocket_api" "wemo" "whirlpool" + "whois" "wiffi" "wilight" "wled" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index e26c38bc87..adbbc204f3 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -25,19 +25,6 @@ let defaultOverrides = [ - # aiounify 29 breaks integration tests - (self: super: { - aiounifi = super.aiounifi.overridePythonAttrs (oldAttrs: rec { - version = "28"; - src = fetchFromGitHub { - owner = "Kane610"; - repo = "aiounifi"; - rev = "v${version}"; - sha256 = "1r86pk80sa1la2s7c6v9svh5cpkci6jcw1xziz0h09jdvv5j5iff"; - }; - }); - }) - # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") @@ -54,36 +41,6 @@ let }); }) - # Pinned due to API changes in iaqualink>=2.0, remove after - # https://github.com/home-assistant/core/pull/48137 was merged - (self: super: { - iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { - version = "0.3.90"; - src = fetchFromGitHub { - owner = "flz"; - repo = "iaqualink-py"; - rev = "v${version}"; - sha256 = "0c8ckbbr1n8gx5k63ymgyfkbz3d0rbdvghg8fqdvbg4nrigrs5v0"; - }; - checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ]; - }); - }) - - # Pinned due to API changes in influxdb-client>1.21.0 - (self: super: { - influxdb-client = super.influxdb-client.overridePythonAttrs (oldAttrs: rec { - version = "1.21.0"; - src = fetchFromGitHub { - owner = "influxdata"; - repo = "influxdb-client-python"; - rev = "v${version}"; - sha256 = "081pwd3aa7kbgxqcl1hfi2ny4iapnxkcp9ypsfslr69d0khvfc4s"; - }; - }); - }) - - (mkOverride "jinja2" "3.0.3" "1mvwr02s86zck5wsmd9wjxxb9iaqr17hdi5xza9vkwv8rmrv46v1") - # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { @@ -97,24 +54,11 @@ let }); }) - # Pinned due to API changes in eebrightbox>=0.0.5 - (self: super: { - eebrightbox = super.eebrightbox.overridePythonAttrs (oldAttrs: rec { - version = "0.0.4"; - src = fetchFromGitHub { - owner = "krygal"; - repo = "eebrightbox"; - rev = version; - sha256 = "0d8mmpwgrd7gymw5263r1v2wjv6dx6w6pq13d62fkfm4h2hya4a4"; - }; - }); - }) - # Pinned due to API changes in 0.1.0 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") # Requirements for recorder not found: ['sqlalchemy==1.4.27']. - (mkOverride "sqlalchemy" "1.4.27" "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p") + #(mkOverride "sqlalchemy" "1.4.27" "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p") # Pinned due to API changes in 0.4.0 (self: super: { @@ -177,14 +121,15 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.12.10"; + hassVersion = "2022.2.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; version = assert (componentPackages.version == hassVersion); hassVersion; + format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.8"; + disabled = python.pythonOlder "3.9"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -194,7 +139,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:0nyddcjy4diq5bakpb76frax44i0jraj2vvpfxrj50h9l5pdwsaf"; + hash = "sha256:OqyWm7O8ajxBlWGzvNhZvFmy5p2dINfMQ3cQ304Er18="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -223,9 +168,9 @@ in python.pkgs.buildPythonApplication rec { in '' sed -r -i \ ${lib.concatStringsSep "\n" (map (package: - ''-e 's@${package}[<>=]+.*@${package}",@g' \'' + ''-e 's@${package}[<>=]+.*@${package}@g' \'' ) relaxedConstraints)} - setup.py + setup.cfg substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -256,8 +201,6 @@ in python.pkgs.buildPythonApplication rec { yarl # Not in setup.py, but used in homeassistant/util/package.py setuptools - ] ++ lib.optionals (pythonOlder "3.9") [ - backports-zoneinfo ] ++ componentBuildInputs ++ extraBuildInputs; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -280,6 +223,9 @@ in python.pkgs.buildPythonApplication rec { respx stdlib-list tqdm + # required by tests/pylint + astroid + pylint # required by tests/auth/mfa_modules pyotp ] ++ lib.concatMap (component: getPackages component python.pkgs) [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index cdb60172fa..6ee68c368f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,15 @@ 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 = "20211229.1"; + version = "20220203.0"; + format = "wheel"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-glVjJ9iOmhAIGD65PHQu9l7Wc/lr5XRya2mi20/UVgs="; + inherit version format; + pname = "home_assistant_frontend"; + dist = "py3"; + python = "py3"; + sha256 = "sha256-5iODXctmkw+MIdf/GECGhhWOMruMqeWBDWwwwrNQMjU="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 8e552ed15e..25bd411b76 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -50,17 +50,14 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( ++ extraPytestFlagsArray.${component} or [ ] ++ [ "tests/components/${component}" ]; - preCheck = old.preCheck + lib.optionalString (component != "network") '' + preCheck = old.preCheck + lib.optionalString (builtins.elem component [ "emulated_hue" "songpal" "system_log" ]) '' patch -p1 < ${./patches/tests-mock-source-ip.patch} ''; meta = old.meta // { broken = lib.elem component [ "airtouch4" - "glances" - "ridwell" - "venstar" - "yamaha_musiccast" + "dnsip" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 86c9ad6c00..a67ea3cc03 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,12 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }: -let - apache-24-patch = fetchurl { - name = "compile-against-apache24.diff"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; - sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; - }; -in stdenv.mkDerivation rec { pname = "mod_fastcgi"; version = "2.4.7.1"; @@ -18,8 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg="; }; - patches = [ apache-24-patch ]; - buildInputs = [ apacheHttpd ]; preBuild = '' @@ -43,6 +34,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; - broken = true; # patch 'compile-against-apache24.diff' no longer works }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix index ffeead30a2..da4715c543 100644 --- a/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.48.0"; + version = "1.49.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-oSimHF4qiI2zcMSx51qxs88AcrrewHIbhaRW8s4Ut7Q="; + sha256 = "sha256-9orJEt0w0ORHKEOpp40Aubj/pfnNO/A3oHEgWIdk+vM="; }; - vendorSha256 = "sha256-dzYO1yAQSVJmDJvjB5XPRBiYCk+ko1n928CTtUXbHBc="; + vendorSha256 = "sha256-/dmEsoeB3UDOBZ/9rbnywRtpXVKaJKGF6xPeWTA4PPE="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index a15e882dea..b560c8d42c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -156,6 +156,21 @@ in }; }; + geoip2 = { + src = fetchFromGitHub { + name = "geoip2"; + owner = "leev"; + repo = "ngx_http_geoip2_module"; + rev = "3.3"; + sha256 = "EEn/qxPsBFgVBqOgPYTrRhaLPwSBlSPWYYSr3SL8wZA="; + }; + inputs = [ pkgs.libmaxminddb ]; + + meta = { + maintainers = with lib.maintainers; [ pinpox ]; + }; + }; + http_proxy_connect_module_v18 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { supports = with lib.versions; version: major version == "1" && minor version == "18"; }; diff --git a/third_party/nixpkgs/pkgs/servers/hydron/default.nix b/third_party/nixpkgs/pkgs/servers/hydron/default.nix index ced4a6dec1..ba163a719b 100644 --- a/third_party/nixpkgs/pkgs/servers/hydron/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hydron/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-TxeHfO5IUVsKmKZ1e0/KXi+6dk2nn6AoNG0eB3jyGkY="; + vendorSha256 = "sha256-hvmIOCqVZTfV7EnkDUWiChynGkwTpHClMbW4LpbdAgo="; proxyVendor = true; buildInputs = [ ffmpeg ]; diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix index 00dfd7c481..1731da3587 100644 --- a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix @@ -87,6 +87,10 @@ stdenv.mkDerivation { openldap # optional pam # optional ]; + # Disable parallel build, errors: + # *** No rule to make target '../util/libfaxutil.so.7.0.4', needed by 'faxmsg'. Stop. + enableParallelBuilding = false; + postPatch = ". ${postPatch}"; dontAddPrefix = true; postInstall = ". ${postInstall}"; diff --git a/third_party/nixpkgs/pkgs/servers/irc/atheme/default.nix b/third_party/nixpkgs/pkgs/servers/irc/atheme/default.nix index eb6f9345b2..9db7ef3aac 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/atheme/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/atheme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "atheme"; - version = "7.2.11"; + version = "7.2.12"; src = fetchgit { url = "https://github.com/atheme/atheme.git"; rev = "v${version}"; - sha256 = "15fs48cgzxblh2g4abl5v647ndfx9hg8cih2x67v3y7s9wz68wk2"; + sha256 = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM="; leaveDotGit = true; }; diff --git a/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix b/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix index 1aa5f5158a..57f79ff916 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/ergochat/default.nix @@ -1,6 +1,6 @@ -{ buildGo117Module, fetchFromGitHub, lib, nixosTests }: +{ buildGoModule, fetchFromGitHub, lib, nixosTests }: -buildGo117Module rec { +buildGoModule rec { pname = "ergo"; version = "2.9.1"; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 6327f50793..5bae5c8b23 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.20.428"; + version = "0.20.539"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "Wf1eQkKovRIMUQeqadmOQl5R0syoKWiZENjRR4jGUdk="; + sha256 = "TTaPXPEnxKYQFtYD+7AkTydtQbQgdrkaoZL6p3EFkYc="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/deps.nix b/third_party/nixpkgs/pkgs/servers/jackett/deps.nix index 3b99b59529..3b0fb8cb78 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/deps.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/deps.nix @@ -8,7 +8,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.1.0"; sha256 = "1rx5x2zks2aryy6mbly86a83gxzm0y7bbx9834b3224673rs7ra0"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.1.0"; sha256 = "17khlhfl3pg2619pyn3rbyw5hbjwra3rwzrkiqcwkikfla5185gf"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.2.0"; sha256 = "07jsyhlrg0jb1cjn1p20wp2c9rsjqxv7kh6vvd0xv0mjd88idchr"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.2.0"; sha256 = "10zhr7hgzm9w0gfg0sa0h2qdlna0w7n2jl72s4j7hi6mf68px2xm"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) diff --git a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix b/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix index 1ccaca4213..681d7b2ded 100644 --- a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "0.11.5"; + version = "0.11.7"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+ojBVdglOTqdmWT8QPUzJRT7RgtXxEOLNC5GqP0vO6Y="; + sha256 = "sha256-7Q/mbY3Sh2Hl1iXDN/ZM3sLz0FCsYdT8QxiyCQC2qN0="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index 7d5ae0c74f..fd80dc4b87 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-12-24"; + version = "unstable-2022-02-07"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "247cd753e283e70a9949e76d0ba669d99c0eb144"; - sha256 = "sha256-65wxhE/XqNK6ly+fxZFLjtImvpJlgU54RStUve40CJA="; + rev = "6d7c03365ad13c4661675aaccd0a3dc5be544493"; + sha256 = "sha256-xFSZkOFETGcJXA6CUCReoyNZXhDAfgKkWoeDRqueBVw="; }; sourceRoot = "source/klippy"; diff --git a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix b/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix index e71ff33e2f..d74e1a0fab 100644 --- a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix +++ b/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "limesurvey"; - version = "3.23.7+201006"; + version = "3.27.33+220125"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - sha256 = "19p978p0flknsg3iqlrrbr76qsk5ha2a84nxywqsvjrjvqrh5jrc"; + sha256 = "sha256-iwTsn+glh8fwt1IaH9iDKDhEAnx1s1zvv1dmsdzUk8g="; }; phpConfig = writeText "config.php" '' @@ -37,10 +37,5 @@ stdenv.mkDerivation rec { homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; - knownVulnerabilities = [ - # https://github.com/LimeSurvey/LimeSurvey/blob/3.x-LTS/docs/release_notes.txt - "Unauthorized access to statistics of a survey with certain permission configurations" - "Persistent XSS in browse response" - ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix index e5d282e64e..046ad48145 100644 --- a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { version = "0.5.20"; proxyVendor = true; - vendorSha256 = "sha256-pyPxONcWniJoA0qYusHktF3/taYda2StaMiMhyRYEm4="; + vendorSha256 = "sha256-aRZoAEnRai8i5H08ReW8lEFlbmarYxU0lBRhR/Llw+M="; src = fetchFromGitHub { owner = "livepeer"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix index 45300a8073..266bb0a383 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.17.1"; + version = "2.3.18"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "1f525bvpjvi4rnwqjsqaqrbdii08sqmc1v8xq03m19w1vk6cqrqw"; + hash = "sha256-Buc/ZoxsCTxFve7rfCA5irjcSTFyNPS1eBrF4sxdbDM="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 2b75a36c6c..3f1f2d270a 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.17.1"; + version = "0.5.18"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - sha256 = "04j5z3y8yyci4ni9j9i7cy0zg1qj2sm9zfarmjcvs9vydpga7i1w"; + hash = "sha256-ptgo+Nby3sulEFND7OXHplJFvZTkaorkQyptl1QxCKU="; }; buildInputs = [ dovecot openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix index b33e4535ca..8d73542bec 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix @@ -100,9 +100,9 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://nuclearelephant.com/"; + homepage = "http://dspam.sourceforge.net/"; description = "Community Driven Antispam Filter"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index f66b0a9f6b..d1e4581789 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -43,6 +43,9 @@ buildPythonPackage rec { postPatch = '' # isort is a development dependency sed -i '/isort/d' setup.py + # Fix mistune imports for mistune >= 2.0.0 + # https://gitlab.com/mailman/hyperkitty/-/merge_requests/379 + sed -i 's/mistune.scanner/mistune.util/' hyperkitty/lib/renderer.py ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix index ea59f73b88..f18145ec47 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix @@ -2392,15 +2392,15 @@ version = "1.11.0"; }; ruby-saml = { - dependencies = ["nokogiri"]; + dependencies = ["nokogiri" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ps79g3f39iy6dpc9z4z5wwxdkbaciqjfbi0pfl7dbkz1d8q14qi"; + sha256 = "1706dyk5jdma75bnl9rhmx8vgzjw12ixnj3y32inmpcgzgsvs76k"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby2_keywords = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/package.json b/third_party/nixpkgs/pkgs/servers/mastodon/package.json index b81940521c..4c3e64141f 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/package.json +++ b/third_party/nixpkgs/pkgs/servers/mastodon/package.json @@ -1,5 +1,5 @@ { - "version": "3.4.4", + "version": "3.4.6", "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix index 4b1cd55b5e..921066e5df 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/tootsuite/mastodon.git"; - rev = "v3.4.4"; - sha256 = "0gi818ns7ws63g7izhcqq5b28kifzmvg0p278lq82h02ysg9grj3"; + rev = "v3.4.6"; + sha256 = "1lg25m6wsnb7iabbn1vpvn85csv6ywyvcm0ji6d8iq7wwgyq77xs"; }; in applyPatches { inherit src; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/version.nix b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix index 852b6be5f4..77b242e897 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/version.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.4.4" +"3.4.6" diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/version.patch b/third_party/nixpkgs/pkgs/servers/mastodon/version.patch index 2d8d600716..2182de89b8 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/version.patch +++ b/third_party/nixpkgs/pkgs/servers/mastodon/version.patch @@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag +++ b/package.json @@ -1,4 +1,5 @@ { -+ "version": "3.4.4", ++ "version": "3.4.6", "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix index be436875f9..3ceff9187d 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/yarn.nix @@ -6,7 +6,7 @@ path = fetchurl { name = "_babel_code_frame___code_frame_7.12.11.tgz"; url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; } { @@ -14,7 +14,7 @@ path = fetchurl { name = "_babel_code_frame___code_frame_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; } { @@ -22,7 +22,7 @@ path = fetchurl { name = "_babel_compat_data___compat_data_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; - sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; + sha512 = "i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ=="; }; } { @@ -30,7 +30,7 @@ path = fetchurl { name = "_babel_core___core_7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz"; - sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38"; + sha512 = "jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg=="; }; } { @@ -38,7 +38,7 @@ path = fetchurl { name = "_babel_generator___generator_7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz"; - sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"; + sha512 = "bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA=="; }; } { @@ -46,7 +46,7 @@ path = fetchurl { name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; + sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha1 = "0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"; + sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; }; } { @@ -62,7 +62,7 @@ path = fetchurl { name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha1 = "6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"; + sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; } { @@ -70,7 +70,7 @@ path = fetchurl { name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.12.13.tgz"; - sha1 = "df6a76fb83feb6b8e6dcfb46bb49010098cb51f0"; + sha512 = "QN7Z5FByIOFESQXxoNYVPU7xONzrDW2fv7oKKVkj+62N3Dx1IZaVu/RF9QhV9XyCZE/xiYNfuQ1JsiL1jduT1A=="; }; } { @@ -78,7 +78,7 @@ path = fetchurl { name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; - sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; + sha512 = "JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA=="; }; } { @@ -86,7 +86,7 @@ path = fetchurl { name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz"; - sha1 = "832111bcf4f57ca57a4c5b1a000fc125abc6554a"; + sha512 = "BnEfi5+6J2Lte9LeiL6TxLWdIlEv9Woacc1qXzXBgbikcOzMRM2Oya5XGg/f/ngotv1ej2A/b+3iJH8wbS1+lQ=="; }; } { @@ -94,7 +94,7 @@ path = fetchurl { name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz"; - sha1 = "abf888d836a441abee783c75229279748705dc42"; + sha512 = "idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw=="; }; } { @@ -102,7 +102,7 @@ path = fetchurl { name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.13.tgz"; - sha1 = "0996d370a92896c612ae41a4215544bd152579c0"; + sha512 = "XC+kiA0J3at6E85dL5UnCYfVOcIZ834QcAY0TIpgUVnz0zDzg+0TtvZTnJ4g9L1dPRGe30Qi03XCIS4tYCLtqw=="; }; } { @@ -110,7 +110,7 @@ path = fetchurl { name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz"; - sha1 = "a640051772045fedaaecc6f0c6c69f02bdd34bf1"; + sha512 = "JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw=="; }; } { @@ -118,7 +118,7 @@ path = fetchurl { name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz"; - sha1 = "0e46990da9e271502f77507efa4c9918d3d8634a"; + sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw=="; }; } { @@ -126,7 +126,7 @@ path = fetchurl { name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; + sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; }; } { @@ -134,7 +134,7 @@ path = fetchurl { name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; - sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2"; + sha512 = "NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ=="; }; } { @@ -142,7 +142,7 @@ path = fetchurl { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; }; } { @@ -150,7 +150,7 @@ path = fetchurl { name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; - sha1 = "5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"; + sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g=="; }; } { @@ -158,7 +158,7 @@ path = fetchurl { name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz"; - sha1 = "c5715695b4f8bab32660dbdcdc2341dec7e3df40"; + sha512 = "B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ=="; }; } { @@ -166,7 +166,7 @@ path = fetchurl { name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; + sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw=="; }; } { @@ -174,7 +174,7 @@ path = fetchurl { name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; + sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; }; } { @@ -182,7 +182,7 @@ path = fetchurl { name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; - sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"; + sha512 = "OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA=="; }; } { @@ -190,7 +190,7 @@ path = fetchurl { name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; + sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; }; } { @@ -198,7 +198,7 @@ path = fetchurl { name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; + sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; }; } { @@ -206,7 +206,7 @@ path = fetchurl { name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha1 = "376a760d9f7b4b2077a9dd05aa9c3927cadb2209"; + sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; }; } { @@ -214,7 +214,7 @@ path = fetchurl { name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; - sha1 = "00ec4fb6862546bd3d0aff9aac56074277173121"; + sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg=="; }; } { @@ -222,7 +222,7 @@ path = fetchurl { name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; - sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804"; + sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw=="; }; } { @@ -230,7 +230,7 @@ path = fetchurl { name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz"; - sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600"; + sha512 = "Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA=="; }; } { @@ -238,7 +238,7 @@ path = fetchurl { name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; - sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; + sha512 = "zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ=="; }; } { @@ -246,7 +246,7 @@ path = fetchurl { name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; + sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; }; } { @@ -254,7 +254,7 @@ path = fetchurl { name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; + sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; } { @@ -262,7 +262,7 @@ path = fetchurl { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; + sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; }; } { @@ -270,7 +270,7 @@ path = fetchurl { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; } { @@ -278,7 +278,7 @@ path = fetchurl { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; + sha512 = "V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="; }; } { @@ -286,7 +286,7 @@ path = fetchurl { name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; + sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; }; } { @@ -294,7 +294,7 @@ path = fetchurl { name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha1 = "bdb5c66fda8526ec235ab894ad53a1235c79fcc4"; + sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; }; } { @@ -302,7 +302,7 @@ path = fetchurl { name = "_babel_helpers___helpers_7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; - sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; + sha512 = "+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg=="; }; } { @@ -310,7 +310,7 @@ path = fetchurl { name = "_babel_highlight___highlight_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz"; - sha1 = "8ab538393e00370b26271b01fa08f7f27f2e795c"; + sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww=="; }; } { @@ -318,7 +318,7 @@ path = fetchurl { name = "_babel_parser___parser_7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz"; - sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298"; + sha512 = "7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ=="; }; } { @@ -326,7 +326,7 @@ path = fetchurl { name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; - sha1 = "a3484d84d0b549f3fc916b99ee4783f26fabad2a"; + sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ=="; }; } { @@ -334,7 +334,7 @@ path = fetchurl { name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz"; - sha1 = "3a2085abbf5d5f962d480dbc81347385ed62eb1e"; + sha512 = "b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ=="; }; } { @@ -342,7 +342,7 @@ path = fetchurl { name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha1 = "146376000b94efd001e57a40a88a525afaab9f37"; + sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; }; } { @@ -350,7 +350,7 @@ path = fetchurl { name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz"; - sha1 = "5a527e2cae4a4753119c3a3e7f64ecae8ccf1360"; + sha512 = "HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ=="; }; } { @@ -358,7 +358,7 @@ path = fetchurl { name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.2.tgz"; - sha1 = "e68c3c5e4a6a08834456568256fc3e71b93590cf"; + sha512 = "LauAqDd/VjQDtae58QgBcEOE42NNP+jB2OE+XeC3KBI/E+BhhRjtr5viCIrj1hmu1YvrguLipIPRJZmS5yUcFw=="; }; } { @@ -366,7 +366,7 @@ path = fetchurl { name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz"; - sha1 = "01ebabd7c381cff231fa43e302939a9de5be9d9f"; + sha512 = "oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA=="; }; } { @@ -374,7 +374,7 @@ path = fetchurl { name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; - sha1 = "62542f94aa9ce8f6dba79eec698af22112253791"; + sha512 = "sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ=="; }; } { @@ -382,7 +382,7 @@ path = fetchurl { name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz"; - sha1 = "830b4e2426a782e8b2878fbfe2cba85b70cbf98c"; + sha512 = "w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA=="; }; } { @@ -390,7 +390,7 @@ path = fetchurl { name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz"; - sha1 = "222348c080a1678e0e74ea63fe76f275882d1fd7"; + sha512 = "1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg=="; }; } { @@ -398,7 +398,7 @@ path = fetchurl { name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz"; - sha1 = "425b11dc62fc26939a2ab42cbba680bdf5734546"; + sha512 = "ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q=="; }; } { @@ -406,7 +406,7 @@ path = fetchurl { name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; - sha1 = "82b4cc06571143faf50626104b335dd71baa4f9e"; + sha512 = "DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg=="; }; } { @@ -414,7 +414,7 @@ path = fetchurl { name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz"; - sha1 = "0e2b4de419915dc0b409378e829412e2031777c4"; + sha512 = "AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA=="; }; } { @@ -422,7 +422,7 @@ path = fetchurl { name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz"; - sha1 = "150d4e58e525b16a9a1431bd5326c4eed870d717"; + sha512 = "XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ=="; }; } { @@ -430,7 +430,7 @@ path = fetchurl { name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz"; - sha1 = "df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"; + sha512 = "qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA=="; }; } { @@ -438,7 +438,7 @@ path = fetchurl { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha1 = "04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"; + sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; }; } { @@ -446,7 +446,7 @@ path = fetchurl { name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; - sha1 = "b1a1f2030586b9d3489cc26179d2eb5883277636"; + sha512 = "59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg=="; }; } { @@ -454,7 +454,7 @@ path = fetchurl { name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha1 = "bebde51339be829c17aaaaced18641deb62b39ba"; + sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; }; } { @@ -462,7 +462,7 @@ 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"; - sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; } { @@ -470,7 +470,7 @@ path = fetchurl { name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; - sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"; + sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; } { @@ -478,7 +478,7 @@ 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"; - sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; } { @@ -486,7 +486,7 @@ path = fetchurl { name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; - sha1 = "8e3d674b0613e67975ceac2776c97b60cafc5c9c"; + sha512 = "ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A=="; }; } { @@ -494,7 +494,7 @@ path = fetchurl { name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz"; - sha1 = "fac829bf3c7ef4a1bc916257b403e58c6bdaf648"; + sha512 = "Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA=="; }; } { @@ -502,7 +502,7 @@ 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"; - sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; + sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; } { @@ -510,7 +510,7 @@ 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"; - sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; } { @@ -518,7 +518,7 @@ path = fetchurl { name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; - sha1 = "ee601348c370fa334d2207be158777496521fd51"; + sha512 = "Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="; }; } { @@ -526,7 +526,7 @@ 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"; - sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; } { @@ -534,7 +534,7 @@ path = fetchurl { name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; - sha1 = "044fb81ebad6698fe62c478875575bcbb9b70f15"; + sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; }; } { @@ -542,7 +542,7 @@ 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"; - sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; }; } { @@ -550,7 +550,7 @@ 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"; - sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; }; } { @@ -558,7 +558,7 @@ 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"; - sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; }; } { @@ -566,7 +566,7 @@ 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"; - sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; }; } { @@ -574,7 +574,7 @@ 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"; - sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; }; } { @@ -582,7 +582,7 @@ 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"; - sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; } { @@ -590,7 +590,7 @@ path = fetchurl { name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; - sha1 = "762a4babec61176fec6c88480dec40372b140c0b"; + sha512 = "bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w=="; }; } { @@ -598,7 +598,7 @@ path = fetchurl { name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; + sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; }; } { @@ -606,7 +606,7 @@ path = fetchurl { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha1 = "10a59bebad52d637a027afa692e8d5ceff5e3dae"; + sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; }; } { @@ -614,7 +614,7 @@ path = fetchurl { name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha1 = "8e112bf6771b82bf1e974e5e26806c5c99aa516f"; + sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; }; } { @@ -622,7 +622,7 @@ path = fetchurl { name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha1 = "a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"; + sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; }; } { @@ -630,7 +630,7 @@ path = fetchurl { name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz"; - sha1 = "caf140b0b2e2462c509553d140e6d0abefb61ed8"; + sha512 = "5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g=="; }; } { @@ -638,7 +638,7 @@ path = fetchurl { name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz"; - sha1 = "a83c15503fc71a0f99e876fdce7dadbc6575ec3a"; + sha512 = "p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ=="; }; } { @@ -646,7 +646,7 @@ path = fetchurl { name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha1 = "845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"; + sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; }; } { @@ -654,7 +654,7 @@ path = fetchurl { name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz"; - sha1 = "acbec502e9951f30f4441eaca1d2f29efade59ed"; + sha512 = "JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA=="; }; } { @@ -662,7 +662,7 @@ path = fetchurl { name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha1 = "3f1601cc29905bfcb67f53910f197aeafebb25ad"; + sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; }; } { @@ -670,7 +670,7 @@ path = fetchurl { name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha1 = "6f06b87a8b803fd928e54b81c258f0a0033904de"; + sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; }; } { @@ -678,7 +678,7 @@ path = fetchurl { name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha1 = "4d52390b9a273e651e4aba6aee49ef40e80cd0a1"; + sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; }; } { @@ -686,7 +686,7 @@ path = fetchurl { name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha1 = "c799f881a8091ac26b54867a845c3e97d2696062"; + sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; }; } { @@ -694,7 +694,7 @@ path = fetchurl { name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha1 = "bb024452f9aaed861d374c8e7a24252ce3a50051"; + sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; }; } { @@ -702,7 +702,7 @@ path = fetchurl { name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha1 = "2ca45bafe4a820197cf315794a4d26560fe4bdb9"; + sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; }; } { @@ -710,7 +710,7 @@ path = fetchurl { name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha1 = "5ffa66cd59b9e191314c9f1f803b938e8c081e40"; + sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; }; } { @@ -718,7 +718,7 @@ path = fetchurl { name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz"; - sha1 = "6622806fe1a7c07a1388444222ef9535f2ca17b0"; + sha512 = "hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw=="; }; } { @@ -726,7 +726,7 @@ path = fetchurl { name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; - sha1 = "52bc199cb581e0992edba0f0f80356467587f161"; + sha512 = "EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ=="; }; } { @@ -734,7 +734,7 @@ path = fetchurl { name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha1 = "6d066ee2bff3c7b3d60bf28dec169ad993831ae3"; + sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; }; } { @@ -742,7 +742,7 @@ path = fetchurl { name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; - sha1 = "2f8179d1bbc9263665ce4a65f305526b2ea8ac34"; + sha512 = "nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw=="; }; } { @@ -750,7 +750,7 @@ path = fetchurl { name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha1 = "2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"; + sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; }; } { @@ -758,7 +758,7 @@ path = fetchurl { name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha1 = "e22d8c3af24b150dd528cbd6e685e799bf1c351c"; + sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; }; } { @@ -766,7 +766,7 @@ path = fetchurl { name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha1 = "b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"; + sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; }; } { @@ -774,7 +774,7 @@ path = fetchurl { name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz"; - sha1 = "e4290f72e0e9e831000d066427c4667098decc31"; + sha512 = "NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A=="; }; } { @@ -782,7 +782,7 @@ path = fetchurl { name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha1 = "4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"; + sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; }; } { @@ -790,7 +790,7 @@ path = fetchurl { name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; - sha1 = "c28effd771b276f4647411c9733dbb2d2da954bd"; + sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA=="; }; } { @@ -798,7 +798,7 @@ path = fetchurl { name = "_babel_plugin_transform_react_inline_elements___plugin_transform_react_inline_elements_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.12.13.tgz"; - sha1 = "0a9e1496e51c9e9cf8751165a23c79bd753dba7d"; + sha512 = "FkqNco564LsuwJFEtTzDihxNGqNAstTfP9hORNYaNtYqdlOEIF5jsD4K5R3BfmVaIsGRPBGvsgmCwm0KCkkSFw=="; }; } { @@ -806,7 +806,7 @@ path = fetchurl { name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; - sha1 = "f510c0fa7cd7234153539f9a362ced41a5ca1447"; + sha512 = "BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ=="; }; } { @@ -814,7 +814,7 @@ path = fetchurl { name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; - sha1 = "1df5dfaf0f4b784b43e96da6f28d630e775f68b3"; + sha512 = "jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA=="; }; } { @@ -822,7 +822,7 @@ path = fetchurl { name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; - sha1 = "05d46f0ab4d1339ac59adf20a1462c91b37a1a42"; + sha512 = "RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg=="; }; } { @@ -830,7 +830,7 @@ path = fetchurl { name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; - sha1 = "e5eb28945bf8b6563e7f818945f966a8d2997f39"; + sha512 = "Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ=="; }; } { @@ -838,7 +838,7 @@ path = fetchurl { name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha1 = "7d9988d4f06e0fe697ea1d9803188aa18b472695"; + sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; } { @@ -846,7 +846,7 @@ path = fetchurl { name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.14.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz"; - sha1 = "1fd885a2d0de1d3c223795a4e9be72c2db4515cf"; + sha512 = "t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg=="; }; } { @@ -854,7 +854,7 @@ path = fetchurl { name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha1 = "db755732b70c539d504c6390d9ce90fe64aff7ad"; + sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; }; } { @@ -862,7 +862,7 @@ path = fetchurl { name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha1 = "84887710e273c1815ace7ae459f6f42a5d31d5fd"; + sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; }; } { @@ -870,7 +870,7 @@ path = fetchurl { name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha1 = "760ffd936face73f860ae646fb86ee82f3d06d1f"; + sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; }; } { @@ -878,7 +878,7 @@ path = fetchurl { name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha1 = "a36049127977ad94438dee7443598d1cefdf409d"; + sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; }; } { @@ -886,7 +886,7 @@ path = fetchurl { name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha1 = "785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"; + sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; } { @@ -894,7 +894,7 @@ path = fetchurl { name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha1 = "840ced3b816d3b5127dd1d12dcedc5dead1a5e74"; + sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; }; } { @@ -902,7 +902,7 @@ path = fetchurl { name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha1 = "b52521685804e155b1202e83fc188d34bb70f5ac"; + sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; }; } { @@ -910,7 +910,7 @@ path = fetchurl { name = "_babel_preset_env___preset_env_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.4.tgz"; - sha1 = "73fc3228c59727e5e974319156f304f0d6685a2d"; + sha512 = "GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA=="; }; } { @@ -918,7 +918,7 @@ path = fetchurl { name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; - sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; } { @@ -926,7 +926,7 @@ path = fetchurl { name = "_babel_preset_react___preset_react_7.13.13.tgz"; url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz"; - sha1 = "fa6895a96c50763fe693f9148568458d5a839761"; + sha512 = "gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA=="; }; } { @@ -934,7 +934,7 @@ path = fetchurl { name = "_babel_runtime_corejs3___runtime_corejs3_7.10.3.tgz"; url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.3.tgz"; - sha1 = "931ed6941d3954924a7aa967ee440e60c507b91a"; + sha512 = "HA7RPj5xvJxQl429r5Cxr2trJwOfPjKiqhCXcdQPSqO2G0RHPZpXu4fkYmBaTKCp2c/jRaMK9GB/lN+7zvvFPw=="; }; } { @@ -942,7 +942,7 @@ path = fetchurl { name = "_babel_runtime___runtime_7.0.0.tgz"; url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz"; - sha1 = "adeb78fedfc855aa05bc041640f3f6f98e85424c"; + sha512 = "7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA=="; }; } { @@ -950,7 +950,7 @@ path = fetchurl { name = "_babel_runtime___runtime_7.14.0.tgz"; url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz"; - sha1 = "46794bc20b612c5f75e62dd071e24dfd95f1cbe6"; + sha512 = "JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA=="; }; } { @@ -958,7 +958,7 @@ path = fetchurl { name = "_babel_template___template_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; - sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; } { @@ -966,7 +966,7 @@ path = fetchurl { name = "_babel_traverse___traverse_7.14.2.tgz"; url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz"; - sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b"; + sha512 = "TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA=="; }; } { @@ -974,7 +974,7 @@ path = fetchurl { name = "_babel_types___types_7.14.4.tgz"; url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; - sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; + sha512 = "lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw=="; }; } { @@ -982,7 +982,7 @@ path = fetchurl { name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; - sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39"; + sha512 = "0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="; }; } { @@ -990,7 +990,7 @@ path = fetchurl { name = "_cnakazawa_watch___watch_1.0.4.tgz"; url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; - sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; + sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ=="; }; } { @@ -998,7 +998,7 @@ path = fetchurl { name = "_emotion_cache___cache_11.4.0.tgz"; url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz"; - sha1 = "293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"; + sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g=="; }; } { @@ -1006,7 +1006,7 @@ path = fetchurl { name = "_emotion_hash___hash_0.8.0.tgz"; url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; - sha1 = "bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"; + sha512 = "kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="; }; } { @@ -1014,7 +1014,7 @@ path = fetchurl { name = "_emotion_memoize___memoize_0.7.5.tgz"; url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz"; - sha1 = "2c40f81449a4e554e9fc6396910ed4843ec2be50"; + sha512 = "igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="; }; } { @@ -1022,7 +1022,7 @@ path = fetchurl { name = "_emotion_react___react_11.1.4.tgz"; url = "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.4.tgz"; - sha1 = "ddee4247627ff7dd7d0c6ae52f1cfd6b420357d2"; + sha512 = "9gkhrW8UjV4IGRnEe4/aGPkUxoGS23aD9Vu6JCGfEDyBYL+nGkkRBoMFGAzCT9qFdyUvQp4UUtErbKWxq/JS4A=="; }; } { @@ -1030,7 +1030,7 @@ path = fetchurl { name = "_emotion_serialize___serialize_1.0.0.tgz"; url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.0.tgz"; - sha1 = "1a61f4f037cf39995c97fc80ebe99abc7b191ca9"; + sha512 = "zt1gm4rhdo5Sry8QpCOpopIUIKU+mUSpV9WNmFILUraatm5dttNEaYzUWWSboSMUE6PtN2j1cAsuvcugfdI3mw=="; }; } { @@ -1038,7 +1038,7 @@ path = fetchurl { name = "_emotion_sheet___sheet_1.0.1.tgz"; url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz"; - sha1 = "245f54abb02dfd82326e28689f34c27aa9b2a698"; + sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="; }; } { @@ -1046,7 +1046,7 @@ path = fetchurl { name = "_emotion_unitless___unitless_0.7.5.tgz"; url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz"; - sha1 = "77211291c1900a700b8a78cfafda3160d76949ed"; + sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; } { @@ -1054,7 +1054,7 @@ path = fetchurl { name = "_emotion_utils___utils_1.0.0.tgz"; url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz"; - sha1 = "abe06a83160b10570816c913990245813a2fd6af"; + sha512 = "mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="; }; } { @@ -1062,7 +1062,7 @@ path = fetchurl { name = "_emotion_weak_memoize___weak_memoize_0.2.5.tgz"; url = "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"; - sha1 = "8eed982e2ee6f7f4e44c253e12962980791efd46"; + sha512 = "6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="; }; } { @@ -1070,7 +1070,7 @@ path = fetchurl { name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; + sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ=="; }; } { @@ -1078,7 +1078,7 @@ path = fetchurl { name = "_formatjs_intl_unified_numberformat___intl_unified_numberformat_3.3.6.tgz"; url = "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.6.tgz"; - sha1 = "ab69818f7568894023cb31fdb5b5c7eed62c6537"; + sha512 = "VQYswh9Pxf4kN6FQvKprAQwSJrF93eJstCDPM1HIt3c3O6NqPFWNWhZ91PLTppOV11rLYsFK11ZxiGbnLNiPTg=="; }; } { @@ -1086,7 +1086,7 @@ path = fetchurl { name = "_formatjs_intl_utils___intl_utils_2.2.5.tgz"; url = "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.2.5.tgz"; - sha1 = "eaafd94df3d102ee13e54e80f992a33868a6b1e8"; + sha512 = "p7gcmazKROteL4IECCp03Qrs790fZ8tbemUAjQu0+K0AaAlK49rI1SIFFq3LzDUAqXIshV95JJhRe/yXxkal5g=="; }; } { @@ -1094,7 +1094,7 @@ path = fetchurl { name = "_gamestdio_websocket___websocket_0.3.2.tgz"; url = "https://registry.yarnpkg.com/@gamestdio/websocket/-/websocket-0.3.2.tgz"; - sha1 = "321ba0976ee30fd14e51dbf8faa85ce7b325f76a"; + sha512 = "J3n5SKim+ZoLbe44hRGI/VYAwSMCeIJuBy+FfP6EZaujEpNchPRFcIsVQLWAwpU1bP2Ji63rC+rEUOd1vjUB6Q=="; }; } { @@ -1102,7 +1102,7 @@ path = fetchurl { name = "_github_webauthn_json___webauthn_json_0.5.7.tgz"; url = "https://registry.yarnpkg.com/@github/webauthn-json/-/webauthn-json-0.5.7.tgz"; - sha1 = "143bc67f6e0f75f8d188e565741507bb08c31214"; + sha512 = "SUYsttDxFSvWvvJssJpwzjmRCqYfdfqC9VCmAHQYfdKCVelyJteCHo9/lK1CB72mx/jrl6cFNY08aua4J2jIyg=="; }; } { @@ -1110,7 +1110,7 @@ path = fetchurl { name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; - sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced"; + sha512 = "VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ=="; }; } { @@ -1118,7 +1118,7 @@ path = fetchurl { name = "_istanbuljs_schema___schema_0.1.2.tgz"; url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz"; - sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd"; + sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; } { @@ -1126,7 +1126,7 @@ path = fetchurl { name = "_jest_console___console_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz"; - sha1 = "4e04bc464014358b03ab4937805ee36a0aeb98f2"; + sha512 = "IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g=="; }; } { @@ -1134,7 +1134,7 @@ path = fetchurl { name = "_jest_core___core_26.6.3.tgz"; url = "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz"; - sha1 = "7639fcb3833d748a4656ada54bde193051e45fad"; + sha512 = "xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw=="; }; } { @@ -1142,7 +1142,7 @@ path = fetchurl { name = "_jest_environment___environment_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz"; - sha1 = "ba364cc72e221e79cc8f0a99555bf5d7577cf92c"; + sha512 = "nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA=="; }; } { @@ -1150,7 +1150,7 @@ path = fetchurl { name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz"; - sha1 = "459c329bcf70cee4af4d7e3f3e67848123535aad"; + sha512 = "14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA=="; }; } { @@ -1158,7 +1158,7 @@ path = fetchurl { name = "_jest_globals___globals_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz"; - sha1 = "5b613b78a1aa2655ae908eba638cc96a20df720a"; + sha512 = "85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA=="; }; } { @@ -1166,7 +1166,7 @@ path = fetchurl { name = "_jest_reporters___reporters_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz"; - sha1 = "1f518b99637a5f18307bd3ecf9275f6882a667f6"; + sha512 = "h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw=="; }; } { @@ -1174,7 +1174,7 @@ path = fetchurl { name = "_jest_source_map___source_map_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz"; - sha1 = "29af5e1e2e324cafccc936f218309f54ab69d535"; + sha512 = "YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA=="; }; } { @@ -1182,7 +1182,7 @@ path = fetchurl { name = "_jest_test_result___test_result_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz"; - sha1 = "55da58b62df134576cc95476efa5f7949e3f5f18"; + sha512 = "5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ=="; }; } { @@ -1190,7 +1190,7 @@ path = fetchurl { name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz"; - sha1 = "98e8a45100863886d074205e8ffdc5a7eb582b17"; + sha512 = "YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw=="; }; } { @@ -1198,7 +1198,7 @@ path = fetchurl { name = "_jest_transform___transform_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz"; - sha1 = "5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"; + sha512 = "E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA=="; }; } { @@ -1206,7 +1206,7 @@ path = fetchurl { name = "_jest_transform___transform_27.0.2.tgz"; url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; - sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; + sha512 = "H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw=="; }; } { @@ -1214,7 +1214,7 @@ path = fetchurl { name = "_jest_types___types_25.5.0.tgz"; url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; - sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; } { @@ -1222,7 +1222,7 @@ path = fetchurl { name = "_jest_types___types_26.6.2.tgz"; url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz"; - sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e"; + sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; } { @@ -1230,7 +1230,7 @@ path = fetchurl { name = "_jest_types___types_27.0.2.tgz"; url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; - sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; + sha512 = "XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg=="; }; } { @@ -1238,7 +1238,7 @@ path = fetchurl { name = "_npmcli_move_file___move_file_1.0.1.tgz"; url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz"; - sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464"; + sha512 = "Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw=="; }; } { @@ -1246,7 +1246,7 @@ path = fetchurl { name = "_polka_url___url_1.0.0_next.11.tgz"; url = "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz"; - sha1 = "aeb16f50649a91af79dbe36574b66d0f9e4d9f71"; + sha512 = "3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA=="; }; } { @@ -1254,7 +1254,7 @@ path = fetchurl { name = "_rails_ujs___ujs_6.1.3.tgz"; url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.3.tgz"; - sha1 = "90ef26caa0925492b1a3b1495db09cfbe49e745e"; + sha512 = "9mip5o+LVouWAqLMNJWhxda+D5uP+4RziNECgOGJlL6k3rc5SC/ljCHpV9Cym4i3oeGZkpZJ2tu4frCwt84kzQ=="; }; } { @@ -1262,7 +1262,7 @@ path = fetchurl { name = "_sinonjs_commons___commons_1.8.1.tgz"; url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; - sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw=="; }; } { @@ -1270,7 +1270,7 @@ path = fetchurl { name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; - sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40"; + sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; }; } { @@ -1278,7 +1278,7 @@ path = fetchurl { name = "_testing_library_dom___dom_7.28.1.tgz"; url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.28.1.tgz"; - sha1 = "dea78be6e1e6db32ddcb29a449e94d9700c79eb9"; + sha512 = "acv3l6kDwZkQif/YqJjstT3ks5aaI33uxGNVIQmdKzbZ2eMKgg3EV2tB84GDdc72k3Kjhl6mO8yUt6StVIdRDg=="; }; } { @@ -1286,7 +1286,7 @@ path = fetchurl { name = "_testing_library_jest_dom___jest_dom_5.12.0.tgz"; url = "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.12.0.tgz"; - sha1 = "6a5d340b092c44b7bce17a4791b47d9bc2c61443"; + sha512 = "N9Y82b2Z3j6wzIoAqajlKVF1Zt7sOH0pPee0sUHXHc5cv2Fdn23r+vpWm0MBBoGJtPOly5+Bdx1lnc3CD+A+ow=="; }; } { @@ -1294,7 +1294,7 @@ path = fetchurl { name = "_testing_library_react___react_11.2.7.tgz"; url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.7.tgz"; - sha1 = "b29e2e95c6765c815786c0bc1d5aed9cb2bf7818"; + sha512 = "tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA=="; }; } { @@ -1302,7 +1302,7 @@ path = fetchurl { name = "_types_aria_query___aria_query_4.2.0.tgz"; url = "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz"; - sha1 = "14264692a9d6e2fa4db3df5e56e94b5e25647ac0"; + sha512 = "iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A=="; }; } { @@ -1310,7 +1310,7 @@ path = fetchurl { name = "_types_babel__core___babel__core_7.1.14.tgz"; url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; - sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; + sha512 = "zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g=="; }; } { @@ -1318,7 +1318,7 @@ path = fetchurl { name = "_types_babel__generator___babel__generator_7.6.1.tgz"; url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; - sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; + sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew=="; }; } { @@ -1326,7 +1326,7 @@ path = fetchurl { name = "_types_babel__template___babel__template_7.0.2.tgz"; url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz"; - sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307"; + sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; } { @@ -1334,7 +1334,7 @@ path = fetchurl { name = "_types_babel__traverse___babel__traverse_7.0.13.tgz"; url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; - sha1 = "1874914be974a492e1b4cb00585cabb274e8ba18"; + sha512 = "i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ=="; }; } { @@ -1342,7 +1342,7 @@ path = fetchurl { name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; - sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; + sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A=="; }; } { @@ -1350,7 +1350,7 @@ path = fetchurl { name = "_types_color_name___color_name_1.1.1.tgz"; url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; - sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; }; } { @@ -1358,7 +1358,7 @@ path = fetchurl { name = "_types_events___events_3.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; - sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; } { @@ -1366,7 +1366,7 @@ path = fetchurl { name = "_types_glob___glob_7.1.1.tgz"; url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; - sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; }; } { @@ -1374,7 +1374,7 @@ path = fetchurl { name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; - sha1 = "039af35fe26bec35003e8d86d2ee9c586354348f"; + sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; }; } { @@ -1382,7 +1382,7 @@ path = fetchurl { name = "_types_hoist_non_react_statics___hoist_non_react_statics_3.3.1.tgz"; url = "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"; - sha1 = "1124aafe5118cb591977aeb1ceaaed1070eb039f"; + sha512 = "iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA=="; }; } { @@ -1390,7 +1390,7 @@ path = fetchurl { name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; - sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; + sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; }; } { @@ -1398,7 +1398,7 @@ path = fetchurl { name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; + sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; }; } { @@ -1406,7 +1406,7 @@ path = fetchurl { name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; - sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; + sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; } { @@ -1414,7 +1414,7 @@ path = fetchurl { name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; }; } { @@ -1422,7 +1422,7 @@ path = fetchurl { name = "_types_jest___jest_26.0.3.tgz"; url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.3.tgz"; - sha1 = "79534e0e94857171c0edc596db0ebe7cb7863251"; + sha512 = "v89ga1clpVL/Y1+YI0eIu1VMW+KU7Xl8PhylVtDKVWaSUHBHYPLXMQGBdrpHewaKoTvlXkksbYqPgz8b4cmRZg=="; }; } { @@ -1430,7 +1430,7 @@ path = fetchurl { name = "_types_json_schema___json_schema_7.0.6.tgz"; url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; }; } { @@ -1438,7 +1438,7 @@ path = fetchurl { name = "_types_json5___json5_0.0.29.tgz"; url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; - sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + sha1 = "7ihweulOEdK4J7y+UnC86n8+ce4="; }; } { @@ -1446,7 +1446,7 @@ path = fetchurl { name = "_types_minimatch___minimatch_3.0.3.tgz"; url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; } { @@ -1454,7 +1454,7 @@ path = fetchurl { name = "_types_node___node_14.11.1.tgz"; url = "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz"; - sha1 = "56af902ad157e763f9ba63d671c39cda3193c835"; + sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; } { @@ -1462,7 +1462,7 @@ path = fetchurl { name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; } { @@ -1470,7 +1470,7 @@ path = fetchurl { name = "_types_parse_json___parse_json_4.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; } { @@ -1478,7 +1478,7 @@ path = fetchurl { name = "_types_prettier___prettier_2.0.2.tgz"; url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz"; - sha1 = "5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"; + sha512 = "IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA=="; }; } { @@ -1486,7 +1486,7 @@ path = fetchurl { name = "_types_prop_types___prop_types_15.7.3.tgz"; url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; - sha1 = "2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"; + sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; }; } { @@ -1494,7 +1494,7 @@ path = fetchurl { name = "_types_q___q_1.5.2.tgz"; url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; - sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; + sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="; }; } { @@ -1502,7 +1502,7 @@ path = fetchurl { name = "_types_react_redux___react_redux_7.1.16.tgz"; url = "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.16.tgz"; - sha1 = "0fbd04c2500c12105494c83d4a3e45c084e3cb21"; + sha512 = "f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw=="; }; } { @@ -1510,7 +1510,7 @@ path = fetchurl { name = "_types_react___react_17.0.3.tgz"; url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz"; - sha1 = "ba6e215368501ac3826951eef2904574c262cc79"; + sha512 = "wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg=="; }; } { @@ -1518,7 +1518,7 @@ path = fetchurl { name = "_types_scheduler___scheduler_0.16.1.tgz"; url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz"; - sha1 = "18845205e86ff0038517aab7a18a62a6b9f71275"; + sha512 = "EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA=="; }; } { @@ -1526,7 +1526,7 @@ path = fetchurl { name = "_types_schema_utils___schema_utils_1.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-1.0.0.tgz"; - sha1 = "295d36f01e2cb8bc3207ca1d9a68e210db6b40cb"; + sha512 = "YesPanU1+WCigC/Aj1Mga8UCOjHIfMNHZ3zzDsUY7lI8GlKnh/Kv2QwJOQ+jNQ36Ru7IfzSedlG14hppYaN13A=="; }; } { @@ -1534,7 +1534,7 @@ path = fetchurl { name = "_types_stack_utils___stack_utils_2.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz"; - sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff"; + sha512 = "RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw=="; }; } { @@ -1542,7 +1542,7 @@ path = fetchurl { name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.9.1.tgz"; url = "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.1.tgz"; - sha1 = "aba5ee062b7880f69c212ef769389f30752806e5"; + sha512 = "yYn5EKHO3MPEMSOrcAb1dLWY+68CG29LiXKsWmmpVHqoP5+ZRiAVLyUHvPNrO2dABDdUGZvavMsaGpWNjM6N2g=="; }; } { @@ -1550,7 +1550,7 @@ path = fetchurl { name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; } { @@ -1558,7 +1558,7 @@ path = fetchurl { name = "_types_yargs___yargs_15.0.5.tgz"; url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; - sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; + sha512 = "Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w=="; }; } { @@ -1566,7 +1566,7 @@ path = fetchurl { name = "_types_yargs___yargs_16.0.3.tgz"; url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz"; - sha1 = "4b6d35bb8e680510a7dc2308518a80ee1ef27e01"; + sha512 = "YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ=="; }; } { @@ -1574,7 +1574,7 @@ path = fetchurl { name = "_webassemblyjs_ast___ast_1.9.0.tgz"; url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"; - sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964"; + sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; }; } { @@ -1582,7 +1582,7 @@ 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"; - sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4"; + sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; }; } { @@ -1590,7 +1590,7 @@ 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"; - sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2"; + sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; }; } { @@ -1598,7 +1598,7 @@ 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"; - sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; } { @@ -1606,7 +1606,7 @@ 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"; - sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27"; + sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; }; } { @@ -1614,7 +1614,7 @@ 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"; - sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8"; + sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; }; } { @@ -1622,7 +1622,7 @@ 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"; - sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07"; + sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; }; } { @@ -1630,7 +1630,7 @@ 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"; - sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790"; + sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; }; } { @@ -1638,7 +1638,7 @@ 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"; - sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; } { @@ -1646,7 +1646,7 @@ path = fetchurl { name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; - sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"; + sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; }; } { @@ -1654,7 +1654,7 @@ path = fetchurl { name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; - sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95"; + sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; }; } { @@ -1662,7 +1662,7 @@ path = fetchurl { name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; - sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab"; + sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; }; } { @@ -1670,7 +1670,7 @@ 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"; - sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; } { @@ -1678,7 +1678,7 @@ 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"; - sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; } { @@ -1686,7 +1686,7 @@ 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"; - sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; } { @@ -1694,7 +1694,7 @@ 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"; - sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e"; + sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; }; } { @@ -1702,7 +1702,7 @@ 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"; - sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914"; + sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; }; } { @@ -1710,7 +1710,7 @@ 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"; - sha1 = "4935d54c85fef637b00ce9f52377451d00d47899"; + sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; } { @@ -1718,7 +1718,7 @@ path = fetchurl { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; }; } { @@ -1726,7 +1726,7 @@ path = fetchurl { name = "_xtuc_long___long_4.2.2.tgz"; url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; - sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; } { @@ -1734,7 +1734,7 @@ path = fetchurl { name = "abab___abab_2.0.5.tgz"; url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; - sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; + sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; } { @@ -1742,7 +1742,7 @@ path = fetchurl { name = "accepts___accepts_1.3.7.tgz"; url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; - sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; } { @@ -1750,7 +1750,7 @@ path = fetchurl { name = "acorn_globals___acorn_globals_6.0.0.tgz"; url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; - sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; } { @@ -1758,7 +1758,7 @@ path = fetchurl { name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; - sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; + sha1 = "r9+UiPsezvyDSPb7IvRk4ypYs2s="; }; } { @@ -1766,7 +1766,7 @@ path = fetchurl { name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; }; } { @@ -1774,7 +1774,7 @@ path = fetchurl { name = "acorn_walk___acorn_walk_7.2.0.tgz"; url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; } { @@ -1782,7 +1782,7 @@ path = fetchurl { name = "acorn_walk___acorn_walk_8.0.0.tgz"; url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz"; - sha1 = "56ae4c0f434a45fff4a125e7ea95fa9c98f67a16"; + sha512 = "oZRad/3SMOI/pxbbmqyurIx7jHw1wZDcR9G44L8pUVFEomX/0dH89SrM1KaDXuv1NpzAXz6Op/Xu/Qd5XXzdEA=="; }; } { @@ -1790,7 +1790,7 @@ path = fetchurl { name = "acorn___acorn_3.3.0.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + sha1 = "ReN/s56No/JbruP/U2niu18iAXo="; }; } { @@ -1798,7 +1798,7 @@ path = fetchurl { name = "acorn___acorn_5.7.3.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; } { @@ -1806,7 +1806,7 @@ path = fetchurl { name = "acorn___acorn_6.4.1.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; - sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; + sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; }; } { @@ -1814,7 +1814,7 @@ path = fetchurl { name = "acorn___acorn_7.4.1.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; } { @@ -1822,7 +1822,7 @@ path = fetchurl { name = "acorn___acorn_8.0.4.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-8.0.4.tgz"; - sha1 = "7a3ae4191466a6984eee0fe3407a4f3aa9db8354"; + sha512 = "XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ=="; }; } { @@ -1830,7 +1830,7 @@ path = fetchurl { name = "aggregate_error___aggregate_error_3.1.0.tgz"; url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; } { @@ -1838,7 +1838,7 @@ path = fetchurl { name = "ajv_errors___ajv_errors_1.0.1.tgz"; url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; - sha1 = "f35986aceb91afadec4102fbd85014950cefa64d"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; } { @@ -1846,7 +1846,7 @@ path = fetchurl { name = "ajv_keywords___ajv_keywords_1.5.1.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; - sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; + sha1 = "MU3QpLM2j609/NxU7eYXG4htrzw="; }; } { @@ -1854,7 +1854,7 @@ path = fetchurl { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } { @@ -1862,7 +1862,7 @@ path = fetchurl { name = "ajv___ajv_4.11.8.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + sha1 = "gv+wKynmYq5TvcIK8VlHcGc5xTY="; }; } { @@ -1870,7 +1870,7 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { @@ -1878,7 +1878,7 @@ path = fetchurl { name = "ajv___ajv_8.5.0.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; - sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + sha512 = "Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ=="; }; } { @@ -1886,7 +1886,7 @@ 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 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + sha1 = "l6ERlkmyEa0zaR2fn0hqjsn74KM="; }; } { @@ -1894,7 +1894,7 @@ path = fetchurl { name = "ansi_colors___ansi_colors_3.2.4.tgz"; url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; - sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; }; } { @@ -1902,7 +1902,7 @@ path = fetchurl { name = "ansi_colors___ansi_colors_4.1.1.tgz"; url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; } { @@ -1910,7 +1910,7 @@ path = fetchurl { name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; - sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + sha1 = "06ioOzGapneTZisT52HHkRQiMG4="; }; } { @@ -1918,7 +1918,7 @@ path = fetchurl { name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; }; } { @@ -1926,7 +1926,7 @@ path = fetchurl { name = "ansi_html___ansi_html_0.0.7.tgz"; url = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz"; - sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + sha1 = "gTWEAhliqenm/QOflA0S9WynhZ4="; }; } { @@ -1934,7 +1934,7 @@ 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 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -1942,7 +1942,7 @@ 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 = "ed0317c322064f79466c02966bddb605ab37d998"; + sha1 = "7QMXwyIGT3lGbAKWa922Bas32Zg="; }; } { @@ -1950,7 +1950,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_4.1.0.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; } { @@ -1958,7 +1958,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_5.0.0.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; }; } { @@ -1966,7 +1966,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + sha1 = "tDLdM1i2NM914eRmQ2gkBTPB3b4="; }; } { @@ -1974,7 +1974,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -1982,7 +1982,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; }; } { @@ -1990,7 +1990,7 @@ path = fetchurl { name = "anymatch___anymatch_2.0.0.tgz"; url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; - sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; } { @@ -1998,7 +1998,7 @@ path = fetchurl { name = "anymatch___anymatch_3.1.1.tgz"; url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; - sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; } { @@ -2006,7 +2006,7 @@ path = fetchurl { name = "aproba___aproba_1.2.0.tgz"; url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; } { @@ -2014,7 +2014,7 @@ path = fetchurl { name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; }; } { @@ -2022,7 +2022,7 @@ path = fetchurl { name = "argparse___argparse_1.0.10.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; } { @@ -2030,7 +2030,7 @@ path = fetchurl { name = "argparse___argparse_2.0.1.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { @@ -2038,7 +2038,7 @@ path = fetchurl { name = "aria_query___aria_query_4.2.2.tgz"; url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz"; - sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"; + sha512 = "o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA=="; }; } { @@ -2046,7 +2046,7 @@ 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 = "d6461074febfec71e7e15235761a329a5dc7c520"; + sha1 = "1kYQdP6/7HHn4VI1dhoyml3HxSA="; }; } { @@ -2054,7 +2054,7 @@ path = fetchurl { name = "arr_flatten___arr_flatten_1.1.0.tgz"; url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; }; } { @@ -2062,7 +2062,7 @@ 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 = "e39b09aea9def866a8f206e288af63919bae39c4"; + sha1 = "45sJrqne+Gao8gbiiK9jkZuuOcQ="; }; } { @@ -2070,7 +2070,7 @@ 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 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + sha1 = "ml9pkFGx5wczKPKgCJaLZOopVdI="; }; } { @@ -2078,7 +2078,7 @@ path = fetchurl { name = "array_flatten___array_flatten_2.1.2.tgz"; url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz"; - sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; } { @@ -2086,7 +2086,7 @@ path = fetchurl { name = "array_includes___array_includes_3.1.3.tgz"; url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz"; - sha1 = "c7f619b382ad2afaf5326cddfdc0afc61af7690a"; + sha512 = "gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A=="; }; } { @@ -2094,7 +2094,7 @@ 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 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + sha1 = "mjRBDk9OPaI96jdb5b5w8kd47Dk="; }; } { @@ -2102,7 +2102,7 @@ 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 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + sha1 = "r2rId6Jcx/dOBYiUdThY39sk/bY="; }; } { @@ -2110,7 +2110,7 @@ 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 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + sha1 = "qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="; }; } { @@ -2118,7 +2118,7 @@ path = fetchurl { name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; - sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123"; + sha512 = "4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg=="; }; } { @@ -2126,7 +2126,7 @@ 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"; - sha1 = "94cfd47cc1556ec0747d97f7c7738c58122004c9"; + sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q=="; }; } { @@ -2134,7 +2134,7 @@ path = fetchurl { name = "arrow_key_navigation___arrow_key_navigation_1.2.0.tgz"; url = "https://registry.yarnpkg.com/arrow-key-navigation/-/arrow-key-navigation-1.2.0.tgz"; - sha1 = "edefc5f8b4fc4e384e7c20ddecf81db7ffc970a9"; + sha512 = "ch4WOwtjXHFisaa7ey2duW1Qf2VJxoa+8llbsbWDP6wsCzm0DGAi8upv6GDhf5xGvbxhKW3Co9SDEhXq34xCtg=="; }; } { @@ -2142,7 +2142,7 @@ path = fetchurl { name = "asn1.js___asn1.js_5.4.1.tgz"; url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; - sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; + sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; }; } { @@ -2150,7 +2150,7 @@ path = fetchurl { name = "asn1___asn1_0.2.4.tgz"; url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; } { @@ -2158,7 +2158,7 @@ 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 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; }; } { @@ -2166,7 +2166,7 @@ path = fetchurl { name = "assert___assert_1.5.0.tgz"; url = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz"; - sha1 = "55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; } { @@ -2174,7 +2174,7 @@ 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 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + sha1 = "WWZ/QfrdTyDMvCu5a41Pf3jsA2c="; }; } { @@ -2182,7 +2182,7 @@ path = fetchurl { name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz"; - sha1 = "f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"; + sha1 = "9wtzXGvKGlycItmCw+Oef+ujva0="; }; } { @@ -2190,7 +2190,7 @@ path = fetchurl { name = "astral_regex___astral_regex_2.0.0.tgz"; url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { @@ -2198,7 +2198,7 @@ path = fetchurl { name = "async_each___async_each_1.0.3.tgz"; url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; - sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; } { @@ -2206,7 +2206,7 @@ path = fetchurl { name = "async_limiter___async_limiter_1.0.1.tgz"; url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; - sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; } { @@ -2214,7 +2214,7 @@ path = fetchurl { name = "async___async_2.6.3.tgz"; url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; } { @@ -2222,7 +2222,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; }; } { @@ -2230,7 +2230,7 @@ path = fetchurl { name = "atob___atob_2.1.2.tgz"; url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; - sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; } { @@ -2238,7 +2238,7 @@ path = fetchurl { name = "autoprefixer___autoprefixer_9.8.6.tgz"; url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; - sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; + sha512 = "XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg=="; }; } { @@ -2246,7 +2246,7 @@ 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 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + sha1 = "tG6JCTSpWR8tL2+G1+ap8bP+dqg="; }; } { @@ -2254,7 +2254,7 @@ path = fetchurl { name = "aws4___aws4_1.10.1.tgz"; url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; - sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; + sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; }; } { @@ -2262,7 +2262,7 @@ path = fetchurl { name = "axe_core___axe_core_4.0.2.tgz"; url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz"; - sha1 = "c7cf7378378a51fcd272d3c09668002a4990b1cb"; + sha512 = "arU1h31OGFu+LPrOLGZ7nB45v940NMDMEJeNmbutu57P+UFDVnkZg3e+J1I2HJRZ9hT7gO8J91dn/PMrAiKakA=="; }; } { @@ -2270,7 +2270,7 @@ path = fetchurl { name = "axios___axios_0.21.1.tgz"; url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; - sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; + sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; }; } { @@ -2278,7 +2278,7 @@ path = fetchurl { name = "axobject_query___axobject_query_2.2.0.tgz"; url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; - sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; + sha512 = "Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="; }; } { @@ -2286,7 +2286,7 @@ path = fetchurl { name = "babel_eslint___babel_eslint_10.1.0.tgz"; url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; + sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; }; } { @@ -2294,7 +2294,7 @@ path = fetchurl { name = "babel_jest___babel_jest_26.6.3.tgz"; url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz"; - sha1 = "d87d25cb0037577a0c89f82e5755c5d293c01056"; + sha512 = "pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA=="; }; } { @@ -2302,7 +2302,7 @@ path = fetchurl { name = "babel_jest___babel_jest_27.0.2.tgz"; url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; - sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; + sha512 = "9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q=="; }; } { @@ -2310,7 +2310,7 @@ path = fetchurl { name = "babel_loader___babel_loader_8.2.2.tgz"; url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz"; - sha1 = "9363ce84c10c9a40e6c753748e1441b60c8a0b81"; + sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="; }; } { @@ -2318,7 +2318,7 @@ 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"; - sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; } { @@ -2326,7 +2326,7 @@ path = fetchurl { name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; - sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765"; + sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; } { @@ -2334,7 +2334,7 @@ path = fetchurl { name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz"; - sha1 = "8185bd030348d254c6d7dd974355e6a28b21e62d"; + sha512 = "PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw=="; }; } { @@ -2342,7 +2342,7 @@ path = fetchurl { name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz"; - sha1 = "a6d10e484c93abff0f4e95f437dad26e5736ea11"; + sha512 = "sqBF0owAcCDBVEDtxqfYr2F36eSHdx7lAVGyYuOBRnKdD6gzcy0I0XrAYCZgOA3CRrLhmR+Uae9nogPzmAtOfQ=="; }; } { @@ -2350,7 +2350,7 @@ path = fetchurl { name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz"; - sha1 = "4f6844358a1340baed182adbeffa8df9967bc196"; + sha512 = "yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg=="; }; } { @@ -2358,7 +2358,7 @@ path = fetchurl { name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; - sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; + sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; }; } { @@ -2366,7 +2366,7 @@ path = fetchurl { name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz"; - sha1 = "686775bf9a5aa757e10520903675e3889caeedc4"; + sha512 = "9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg=="; }; } { @@ -2374,7 +2374,7 @@ path = fetchurl { name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz"; - sha1 = "f4b4bb7b19329827df36ff56f6e6d367026cb7a2"; + sha512 = "zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg=="; }; } { @@ -2382,7 +2382,7 @@ path = fetchurl { name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz"; - sha1 = "853f5f5716f4691d98c84f8069c7636ea8da7ab8"; + sha512 = "J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg=="; }; } { @@ -2390,7 +2390,7 @@ path = fetchurl { name = "babel_plugin_preval___babel_plugin_preval_5.0.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz"; - sha1 = "6cabb947ecc241664966e1f99eb56a3b4bb63d1e"; + sha512 = "8DqJq6/LPUjSZ0Qq6bVIFpsj2flCEE0Cbnbut9TvGU6jP9g3dOWEXtQ/sdvsA9d6souza8eNGh04WRXpuH9ThA=="; }; } { @@ -2398,7 +2398,7 @@ path = fetchurl { name = "babel_plugin_react_intl___babel_plugin_react_intl_6.2.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-6.2.0.tgz"; - sha1 = "ac51ca757f318938792fc91e1747515e9225386a"; + sha512 = "ajGpa14mLzyDgdOS75DRlQ0aEL+q7iSCB77613YUPOZbxnAvfB0wg+gLngbd/43eKRw7a4y+IzO3P8kDHl40nA=="; }; } { @@ -2406,7 +2406,7 @@ path = fetchurl { name = "babel_plugin_transform_react_remove_prop_types___babel_plugin_transform_react_remove_prop_types_0.4.24.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz"; - sha1 = "f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"; + sha512 = "eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="; }; } { @@ -2414,7 +2414,7 @@ path = fetchurl { name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz"; - sha1 = "cf5feef29551253471cfa82fc8e0f5063df07a77"; + sha512 = "mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q=="; }; } { @@ -2422,7 +2422,7 @@ path = fetchurl { name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz"; - sha1 = "747872b1171df032252426586881d62d31798fee"; + sha512 = "YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ=="; }; } { @@ -2430,7 +2430,7 @@ path = fetchurl { name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz"; - sha1 = "7a50c75d16647c23a2cf5158d5bb9eb206b10e20"; + sha512 = "nIBIqCEpuiyhvjQs2mVNwTxQQa2xk70p9Dd/0obQGBf8FBzbnI8QhQKzLsWMN2i6q+5B0OcWDtrboBX5gmOLyA=="; }; } { @@ -2438,7 +2438,7 @@ path = fetchurl { name = "babel_runtime___babel_runtime_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4="; }; } { @@ -2446,7 +2446,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.0.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + sha1 = "ibTRmasr7kneFk6gK4nORi1xt2c="; }; } { @@ -2454,7 +2454,7 @@ path = fetchurl { name = "base64_js___base64_js_1.3.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; } { @@ -2462,7 +2462,7 @@ path = fetchurl { name = "base___base_0.11.2.tgz"; url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; - sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; } { @@ -2470,7 +2470,7 @@ path = fetchurl { name = "batch___batch_0.6.1.tgz"; url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; - sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + sha1 = "3DQxT05nkxgJP8dgJyUl+UvyXBY="; }; } { @@ -2478,7 +2478,7 @@ 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 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + sha1 = "pDAdOJtqQ/m2f/PKEaP2Y342Dp4="; }; } { @@ -2486,7 +2486,7 @@ path = fetchurl { name = "big.js___big.js_3.2.0.tgz"; url = "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz"; - sha1 = "a5fc298b81b9e0dca2e458824784b65c52ba588e"; + sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; }; } { @@ -2494,7 +2494,7 @@ path = fetchurl { name = "big.js___big.js_5.2.2.tgz"; url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; - sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; } { @@ -2502,7 +2502,7 @@ path = fetchurl { name = "binary_extensions___binary_extensions_1.13.1.tgz"; url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; - sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; } { @@ -2510,7 +2510,7 @@ path = fetchurl { name = "binary_extensions___binary_extensions_2.1.0.tgz"; url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; + sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; }; } { @@ -2518,7 +2518,7 @@ path = fetchurl { name = "bindings___bindings_1.5.0.tgz"; url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; - sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; } { @@ -2526,7 +2526,7 @@ path = fetchurl { name = "bluebird___bluebird_3.7.2.tgz"; url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; } { @@ -2534,7 +2534,7 @@ path = fetchurl { name = "blurhash___blurhash_1.1.3.tgz"; url = "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz"; - sha1 = "dc325af7da836d07a0861d830bdd63694382483e"; + sha512 = "yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw=="; }; } { @@ -2542,7 +2542,7 @@ path = fetchurl { name = "bmp_js___bmp_js_0.1.0.tgz"; url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz"; - sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; + sha1 = "4Fpj95amwf8l9Hcex62twUjAcjM="; }; } { @@ -2550,7 +2550,7 @@ path = fetchurl { name = "bn.js___bn.js_4.12.0.tgz"; url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; - sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; } { @@ -2558,7 +2558,7 @@ path = fetchurl { name = "bn.js___bn.js_5.1.3.tgz"; url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; - sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; + sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="; }; } { @@ -2566,7 +2566,7 @@ path = fetchurl { name = "body_parser___body_parser_1.19.0.tgz"; url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; - sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; } { @@ -2574,7 +2574,7 @@ path = fetchurl { name = "bonjour___bonjour_3.5.0.tgz"; url = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz"; - sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + sha1 = "jokKGD2O6aI5OzhExpGkK897yfU="; }; } { @@ -2582,7 +2582,7 @@ path = fetchurl { name = "boolbase___boolbase_1.0.0.tgz"; url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; - sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + sha1 = "aN/1++YMUes3cl6p4+0xDcwed24="; }; } { @@ -2590,7 +2590,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -2598,7 +2598,7 @@ path = fetchurl { name = "braces___braces_2.3.2.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; - sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; } { @@ -2606,7 +2606,7 @@ path = fetchurl { name = "braces___braces_3.0.2.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; } { @@ -2614,7 +2614,7 @@ path = fetchurl { name = "bricks.js___bricks.js_1.8.0.tgz"; url = "https://registry.yarnpkg.com/bricks.js/-/bricks.js-1.8.0.tgz"; - sha1 = "8fdeb3c0226af251f4d5727a7df7f9ac0092b4b2"; + sha1 = "j96zwCJq8lH01XJ6fff5rACStLI="; }; } { @@ -2622,7 +2622,7 @@ path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; }; } { @@ -2630,7 +2630,7 @@ path = fetchurl { name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; - sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; + sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; } { @@ -2638,7 +2638,7 @@ path = fetchurl { name = "browserify_aes___browserify_aes_1.2.0.tgz"; url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha1 = "326734642f403dabc3003209853bb70ad428ef48"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; }; } { @@ -2646,7 +2646,7 @@ path = fetchurl { name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; } { @@ -2654,7 +2654,7 @@ path = fetchurl { name = "browserify_des___browserify_des_1.0.2.tgz"; url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz"; - sha1 = "3af4f1f59839403572f1c66204375f7a7f703e9c"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; } { @@ -2662,7 +2662,7 @@ path = fetchurl { name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + sha1 = "IeCr+vbyApzy+vsTNWenAdQTVSQ="; }; } { @@ -2670,7 +2670,7 @@ path = fetchurl { name = "browserify_sign___browserify_sign_4.2.1.tgz"; url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; - sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; + sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; }; } { @@ -2678,7 +2678,7 @@ path = fetchurl { name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; } { @@ -2686,7 +2686,7 @@ path = fetchurl { name = "browserslist___browserslist_4.16.6.tgz"; url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; - sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; + sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; }; } { @@ -2694,7 +2694,7 @@ path = fetchurl { name = "bser___bser_2.1.1.tgz"; url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; - sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; } { @@ -2702,7 +2702,7 @@ path = fetchurl { name = "buffer_from___buffer_from_1.1.1.tgz"; url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; } { @@ -2710,7 +2710,7 @@ path = fetchurl { name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; url = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha1 = "52fabcc6a606d1a00302802648ef68f639da268c"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; } { @@ -2718,7 +2718,7 @@ path = fetchurl { name = "buffer_writer___buffer_writer_2.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha1 = "ce7eb81a38f7829db09c873f2fbb792c0c98ec04"; + sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; } { @@ -2726,7 +2726,7 @@ 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 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + sha1 = "JuYe0UIvtw3ULm42cp7VHYVf6Nk="; }; } { @@ -2734,7 +2734,7 @@ path = fetchurl { name = "buffer___buffer_4.9.2.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; - sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; + sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; } { @@ -2742,7 +2742,7 @@ path = fetchurl { name = "bufferutil___bufferutil_4.0.3.tgz"; url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz"; - sha1 = "66724b756bed23cd7c28c4d306d7994f9943cc6b"; + sha512 = "yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw=="; }; } { @@ -2750,7 +2750,7 @@ 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 = "85982878e21b98e1c66425e03d0174788f569ee8"; + sha1 = "hZgoeOIbmOHGZCXgPQF0eI9Wnug="; }; } { @@ -2758,7 +2758,7 @@ path = fetchurl { name = "bytes___bytes_3.0.0.tgz"; url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + sha1 = "0ygVQE1olpn4Wk6k+odV3ROpYEg="; }; } { @@ -2766,7 +2766,7 @@ path = fetchurl { name = "bytes___bytes_3.1.0.tgz"; url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; } { @@ -2774,7 +2774,7 @@ path = fetchurl { name = "cacache___cacache_12.0.4.tgz"; url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; - sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; + sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; } { @@ -2782,7 +2782,7 @@ path = fetchurl { name = "cacache___cacache_15.0.5.tgz"; url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz"; - sha1 = "69162833da29170d6732334643c60e005f5f17d0"; + sha512 = "lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A=="; }; } { @@ -2790,7 +2790,7 @@ path = fetchurl { name = "cache_base___cache_base_1.0.1.tgz"; url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; - sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; } { @@ -2798,7 +2798,7 @@ path = fetchurl { name = "call_bind___call_bind_1.0.2.tgz"; url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; } { @@ -2806,7 +2806,7 @@ 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 = "847e0fce0a223750a9a027c54b33731ad3154134"; + sha1 = "hH4PzgoiN1CpoCfFSzNzGtMVQTQ="; }; } { @@ -2814,7 +2814,7 @@ path = fetchurl { name = "caller_path___caller_path_0.1.0.tgz"; url = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz"; - sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; + sha1 = "lAhe9jWB7NPaqSREqP6U6CV3dR8="; }; } { @@ -2822,7 +2822,7 @@ 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 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + sha1 = "Ro+DBE42mrIBD6xfBs7uFbsssfQ="; }; } { @@ -2830,7 +2830,7 @@ path = fetchurl { name = "callsites___callsites_0.2.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz"; - sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + sha1 = "r6uWJikQp/M8GaV3WCXGnzTjUMo="; }; } { @@ -2838,7 +2838,7 @@ path = fetchurl { name = "callsites___callsites_2.0.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + sha1 = "BuuE8A7qQT2oav/vrL/7Ngk7PFA="; }; } { @@ -2846,7 +2846,7 @@ path = fetchurl { name = "callsites___callsites_3.1.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; } { @@ -2854,7 +2854,7 @@ path = fetchurl { name = "camelcase___camelcase_5.3.1.tgz"; url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; } { @@ -2862,7 +2862,7 @@ path = fetchurl { name = "camelcase___camelcase_6.2.0.tgz"; url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; - sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; } { @@ -2870,7 +2870,7 @@ path = fetchurl { name = "caniuse_api___caniuse_api_3.0.0.tgz"; url = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha1 = "5e4d90e2274961d46291997df599e3ed008ee4c0"; + sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; } { @@ -2878,7 +2878,7 @@ path = fetchurl { name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; - sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; + sha512 = "QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A=="; }; } { @@ -2886,7 +2886,7 @@ path = fetchurl { name = "capture_exit___capture_exit_2.0.0.tgz"; url = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz"; - sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4"; + sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; }; } { @@ -2894,7 +2894,7 @@ path = fetchurl { name = "caseless___caseless_0.12.0.tgz"; url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + sha1 = "G2gcIf+EAzyCZUMJBolCDRhxUdw="; }; } { @@ -2902,7 +2902,7 @@ path = fetchurl { name = "chalk___chalk_1.1.3.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + sha1 = "qBFcVeSnAv5NFQq9OHKCKn4J/Jg="; }; } { @@ -2910,7 +2910,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -2918,7 +2918,7 @@ path = fetchurl { name = "chalk___chalk_3.0.0.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; } { @@ -2926,7 +2926,7 @@ path = fetchurl { name = "chalk___chalk_4.1.0.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; } { @@ -2934,7 +2934,7 @@ path = fetchurl { name = "char_regex___char_regex_1.0.2.tgz"; url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; - sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf"; + sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; } { @@ -2942,7 +2942,7 @@ path = fetchurl { name = "chokidar___chokidar_3.5.1.tgz"; url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; - sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; }; } { @@ -2950,7 +2950,7 @@ path = fetchurl { name = "chokidar___chokidar_2.1.8.tgz"; url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; - sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; } { @@ -2958,7 +2958,7 @@ path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } { @@ -2966,7 +2966,7 @@ path = fetchurl { name = "chownr___chownr_2.0.0.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; - sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; } { @@ -2974,7 +2974,7 @@ path = fetchurl { name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; } { @@ -2982,7 +2982,7 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { @@ -2990,7 +2990,7 @@ path = fetchurl { name = "ci_info___ci_info_3.2.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; - sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; + sha512 = "dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="; }; } { @@ -2998,7 +2998,7 @@ path = fetchurl { name = "cipher_base___cipher_base_1.0.4.tgz"; url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; - sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; } { @@ -3006,7 +3006,7 @@ path = fetchurl { name = "circular_json___circular_json_0.3.3.tgz"; url = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz"; - sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; + sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; } { @@ -3014,7 +3014,7 @@ path = fetchurl { name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz"; - sha1 = "4186fcca0eae175970aee870b9fe2d6cf8d5655f"; + sha512 = "uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw=="; }; } { @@ -3022,7 +3022,7 @@ path = fetchurl { name = "class_utils___class_utils_0.3.6.tgz"; url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; - sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; } { @@ -3030,7 +3030,7 @@ path = fetchurl { name = "classnames___classnames_2.3.1.tgz"; url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz"; - sha1 = "dfcfa3891e306ec1dad105d0e88f4417b8535e8e"; + sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="; }; } { @@ -3038,7 +3038,7 @@ path = fetchurl { name = "clean_stack___clean_stack_2.2.0.tgz"; url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; - sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; } { @@ -3046,7 +3046,7 @@ path = fetchurl { name = "cli_cursor___cli_cursor_1.0.2.tgz"; url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz"; - sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + sha1 = "ZNo/fValRBLll5S9Ytw1KV6PKYc="; }; } { @@ -3054,7 +3054,7 @@ path = fetchurl { name = "cli_width___cli_width_2.2.1.tgz"; url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; - sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; + sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; } { @@ -3062,7 +3062,7 @@ path = fetchurl { name = "cliui___cliui_5.0.0.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; - sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; } { @@ -3070,7 +3070,7 @@ path = fetchurl { name = "cliui___cliui_6.0.0.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; - sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; } { @@ -3078,7 +3078,7 @@ path = fetchurl { name = "cliui___cliui_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz"; - sha1 = "ef180f26c8d9bff3927ee52428bfec2090427981"; + sha512 = "Gj3QHTkVMPKqwP3f7B4KPkBZRMR9r4rfi5bXFpg1a+Svvj8l7q5CnkBkVQzfxT5DFSsGk2+PascOgL0JYkL2kw=="; }; } { @@ -3086,7 +3086,7 @@ path = fetchurl { name = "clone_deep___clone_deep_4.0.1.tgz"; url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; - sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; }; } { @@ -3094,7 +3094,7 @@ path = fetchurl { name = "co___co_4.6.0.tgz"; url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ="; }; } { @@ -3102,7 +3102,7 @@ path = fetchurl { name = "coa___coa_2.0.2.tgz"; url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; - sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; + sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; } { @@ -3110,7 +3110,7 @@ path = fetchurl { name = "code_point_at___code_point_at_1.1.0.tgz"; url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -3118,7 +3118,7 @@ path = fetchurl { name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; - sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59"; + sha512 = "iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="; }; } { @@ -3126,7 +3126,7 @@ 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 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + sha1 = "S8A3PBZLwykbTTaMgpzxqApZ3KA="; }; } { @@ -3134,7 +3134,7 @@ path = fetchurl { name = "color_blend___color_blend_3.0.1.tgz"; url = "https://registry.yarnpkg.com/color-blend/-/color-blend-3.0.1.tgz"; - sha1 = "3882ed1190ca18760ffe11570d8537960171172b"; + sha512 = "KueDvNiKHAvVeApic0SxHZLyy4x3NELfTLzMHRpRRLi+9e2kWhpeWvtuH3Sjb92mOJYEUhRjb8z7lr4OqDv17Q=="; }; } { @@ -3142,7 +3142,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -3150,7 +3150,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -3158,7 +3158,7 @@ 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 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -3166,7 +3166,7 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { @@ -3174,7 +3174,7 @@ path = fetchurl { name = "color_string___color_string_1.5.3.tgz"; url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; - sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; } { @@ -3182,7 +3182,7 @@ path = fetchurl { name = "color___color_3.1.2.tgz"; url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz"; - sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; + sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; }; } { @@ -3190,7 +3190,7 @@ path = fetchurl { name = "colorette___colorette_1.2.2.tgz"; url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; - sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; }; } { @@ -3198,7 +3198,7 @@ path = fetchurl { name = "combined_stream___combined_stream_1.0.8.tgz"; url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } { @@ -3206,7 +3206,7 @@ path = fetchurl { name = "commander___commander_2.20.3.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; } { @@ -3214,7 +3214,7 @@ path = fetchurl { name = "commander___commander_6.2.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz"; - sha1 = "b990bfb8ac030aedc6d11bc04d1488ffef56db75"; + sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; }; } { @@ -3222,7 +3222,7 @@ path = fetchurl { name = "commondir___commondir_1.0.1.tgz"; url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; - sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + sha1 = "3dgA2gxmEnOTzKWVDqloo6rxJTs="; }; } { @@ -3230,7 +3230,7 @@ path = fetchurl { name = "component_emitter___component_emitter_1.3.0.tgz"; url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; - sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; } { @@ -3238,7 +3238,7 @@ path = fetchurl { name = "compressible___compressible_2.0.18.tgz"; url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; - sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; }; } { @@ -3246,7 +3246,7 @@ path = fetchurl { name = "compression_webpack_plugin___compression_webpack_plugin_6.1.1.tgz"; url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz"; - sha1 = "ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"; + sha512 = "BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ=="; }; } { @@ -3254,7 +3254,7 @@ path = fetchurl { name = "compression___compression_1.7.4.tgz"; url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; - sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; }; } { @@ -3262,7 +3262,7 @@ 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 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -3270,7 +3270,7 @@ path = fetchurl { name = "concat_stream___concat_stream_1.6.2.tgz"; url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } { @@ -3278,7 +3278,7 @@ 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"; - sha1 = "8b32089359308d111115d81cad3fceab888f97bc"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; }; } { @@ -3286,7 +3286,7 @@ path = fetchurl { name = "console_browserify___console_browserify_1.2.0.tgz"; url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; - sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; }; } { @@ -3294,7 +3294,7 @@ path = fetchurl { name = "console_control_strings___console_control_strings_1.1.0.tgz"; url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { @@ -3302,7 +3302,7 @@ 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 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + sha1 = "wguW2MYXdIqvHBYCF2DNJ/y4y3U="; }; } { @@ -3310,7 +3310,7 @@ path = fetchurl { name = "content_disposition___content_disposition_0.5.3.tgz"; url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; - sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; } { @@ -3318,7 +3318,7 @@ path = fetchurl { name = "content_type___content_type_1.0.4.tgz"; url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; } { @@ -3326,7 +3326,7 @@ path = fetchurl { name = "convert_source_map___convert_source_map_1.7.0.tgz"; url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; }; } { @@ -3334,7 +3334,7 @@ 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 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + sha1 = "4wOogrNCzD7oylE6eZmXNNqzriw="; }; } { @@ -3342,7 +3342,7 @@ path = fetchurl { name = "cookie___cookie_0.4.0.tgz"; url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; - sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; } { @@ -3350,7 +3350,7 @@ path = fetchurl { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; }; } { @@ -3358,7 +3358,7 @@ 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 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + sha1 = "Z29us8OZl8LuGsOpJP1hJHSPV40="; }; } { @@ -3366,7 +3366,7 @@ path = fetchurl { name = "core_js_compat___core_js_compat_3.10.1.tgz"; url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.1.tgz"; - sha1 = "62183a3a77ceeffcc420d907a3e6fc67d9b27f1c"; + sha512 = "ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg=="; }; } { @@ -3374,7 +3374,7 @@ path = fetchurl { name = "core_js_pure___core_js_pure_3.6.5.tgz"; url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; - sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; + sha512 = "lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="; }; } { @@ -3382,7 +3382,7 @@ path = fetchurl { name = "core_js___core_js_2.6.11.tgz"; url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; } { @@ -3390,7 +3390,7 @@ path = fetchurl { name = "core_js___core_js_2.6.12.tgz"; url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; - sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; } { @@ -3398,7 +3398,7 @@ 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 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; }; } { @@ -3406,7 +3406,7 @@ path = fetchurl { name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; } { @@ -3414,7 +3414,7 @@ path = fetchurl { name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; - sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; }; } { @@ -3422,7 +3422,7 @@ path = fetchurl { name = "create_ecdh___create_ecdh_4.0.4.tgz"; url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; - sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; + sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; } { @@ -3430,7 +3430,7 @@ path = fetchurl { name = "create_hash___create_hash_1.2.0.tgz"; url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; - sha1 = "889078af11a63756bcfb59bd221996be3a9ef196"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; }; } { @@ -3438,7 +3438,7 @@ path = fetchurl { name = "create_hmac___create_hmac_1.1.7.tgz"; url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; - sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; } { @@ -3446,7 +3446,7 @@ path = fetchurl { name = "cross_env___cross_env_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz"; - sha1 = "865264b29677dc015ba8418918965dd232fc54cf"; + sha512 = "+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="; }; } { @@ -3454,7 +3454,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; } { @@ -3462,7 +3462,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -3470,7 +3470,7 @@ path = fetchurl { name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; } { @@ -3478,7 +3478,7 @@ 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 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + sha1 = "gIrcLnnPhHOAabZGyyDsJ762KeA="; }; } { @@ -3486,7 +3486,7 @@ 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"; - sha1 = "c198940f63a76d7e36c1e71018b001721054cb22"; + sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; } { @@ -3494,7 +3494,7 @@ path = fetchurl { name = "css_font_size_keywords___css_font_size_keywords_1.0.0.tgz"; url = "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz"; - sha1 = "854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"; + sha1 = "hUh1rOmspqjS7g00WkSq6btttss="; }; } { @@ -3502,7 +3502,7 @@ path = fetchurl { name = "css_font_stretch_keywords___css_font_stretch_keywords_1.0.1.tgz"; url = "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz"; - sha1 = "50cee9b9ba031fb5c952d4723139f1e107b54b10"; + sha1 = "UM7puboDH7XJUtRyMTnx4Qe1SxA="; }; } { @@ -3510,7 +3510,7 @@ path = fetchurl { name = "css_font_style_keywords___css_font_style_keywords_1.0.1.tgz"; url = "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz"; - sha1 = "5c3532813f63b4a1de954d13cea86ab4333409e4"; + sha1 = "XDUygT9jtKHelU0TzqhqtDM0CeQ="; }; } { @@ -3518,7 +3518,7 @@ path = fetchurl { name = "css_font_weight_keywords___css_font_weight_keywords_1.0.0.tgz"; url = "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz"; - sha1 = "9bc04671ac85bc724b574ef5d3ac96b0d604fd97"; + sha1 = "m8BGcayFvHJLV07106yWsNYE/Zc="; }; } { @@ -3526,7 +3526,7 @@ path = fetchurl { name = "css_global_keywords___css_global_keywords_1.0.1.tgz"; url = "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz"; - sha1 = "72a9aea72796d019b1d2a3252de4e5aaa37e4a69"; + sha1 = "cqmupyeW0Bmx0qMlLeTlqqN+Smk="; }; } { @@ -3534,7 +3534,7 @@ path = fetchurl { name = "css_list_helpers___css_list_helpers_1.0.1.tgz"; url = "https://registry.yarnpkg.com/css-list-helpers/-/css-list-helpers-1.0.1.tgz"; - sha1 = "fff57192202db83240c41686f919e449a7024f7d"; + sha1 = "//VxkiAtuDJAxBaG+RnkSacCT30="; }; } { @@ -3542,7 +3542,7 @@ path = fetchurl { name = "css_loader___css_loader_5.2.6.tgz"; url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.6.tgz"; - sha1 = "c3c82ab77fea1f360e587d871a6811f4450cc8d1"; + sha512 = "0wyN5vXMQZu6BvjbrPdUJvkCzGEO24HC7IS7nW4llc6BBFC+zwR9CKtYGv63Puzsg10L/o12inMY5/2ByzfD6w=="; }; } { @@ -3550,7 +3550,7 @@ 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"; - sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; + sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; }; } { @@ -3558,7 +3558,7 @@ path = fetchurl { name = "css_select___css_select_2.1.0.tgz"; url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; - sha1 = "6a34653356635934a81baca68d0255432105dbef"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; } { @@ -3566,7 +3566,7 @@ path = fetchurl { name = "css_system_font_keywords___css_system_font_keywords_1.0.0.tgz"; url = "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz"; - sha1 = "85c6f086aba4eb32c571a3086affc434b84823ed"; + sha1 = "hcbwhquk6zLFcaMIav/ENLhII+0="; }; } { @@ -3574,7 +3574,7 @@ 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"; - sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; + sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; } { @@ -3582,7 +3582,7 @@ path = fetchurl { name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; + sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; }; } { @@ -3590,7 +3590,7 @@ path = fetchurl { name = "css_what___css_what_3.3.0.tgz"; url = "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz"; - sha1 = "10fec696a9ece2e591ac772d759aacabac38cd39"; + sha512 = "pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg=="; }; } { @@ -3598,7 +3598,7 @@ path = fetchurl { name = "css.escape___css.escape_1.5.1.tgz"; url = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz"; - sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"; + sha1 = "QuJ9T6BK4y+TGktNQZH6nN3ul8s="; }; } { @@ -3606,7 +3606,7 @@ path = fetchurl { name = "css___css_3.0.0.tgz"; url = "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz"; - sha1 = "4447a4d58fdd03367c516ca9f64ae365cee4aa5d"; + sha512 = "DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ=="; }; } { @@ -3614,7 +3614,7 @@ path = fetchurl { name = "cssesc___cssesc_3.0.0.tgz"; url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; - sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; } { @@ -3622,7 +3622,7 @@ 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"; - sha1 = "920622b1fc1e95a34e8838203f1397a504f2d3ff"; + sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; }; } { @@ -3630,7 +3630,7 @@ 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 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + sha1 = "7ToIKZ8h11dBsg87gfGU7UnMFQ8="; }; } { @@ -3638,7 +3638,7 @@ 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 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + sha1 = "wOTKB/U4a7F+xeUiULT1lhNlFW0="; }; } { @@ -3646,7 +3646,7 @@ 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"; - sha1 = "b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"; + sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; }; } { @@ -3654,7 +3654,7 @@ 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"; - sha1 = "574082fb2859d2db433855835d9a8456ea18bbf3"; + sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; } { @@ -3662,7 +3662,7 @@ path = fetchurl { name = "cssnano___cssnano_4.1.11.tgz"; url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; - sha1 = "c7b5f5b81da269cb1fd982cb960c1200910c9a99"; + sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; }; } { @@ -3670,7 +3670,7 @@ path = fetchurl { name = "csso___csso_4.0.3.tgz"; url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; - sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; + sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; }; } { @@ -3678,7 +3678,7 @@ path = fetchurl { name = "cssom___cssom_0.4.4.tgz"; url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; - sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; + sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; }; } { @@ -3686,7 +3686,7 @@ path = fetchurl { name = "cssom___cssom_0.3.8.tgz"; url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; - sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; }; } { @@ -3694,7 +3694,7 @@ path = fetchurl { name = "cssstyle___cssstyle_2.3.0.tgz"; url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; - sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; + sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; } { @@ -3702,7 +3702,7 @@ path = fetchurl { name = "csstype___csstype_2.6.13.tgz"; url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz"; - sha1 = "a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"; + sha512 = "ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A=="; }; } { @@ -3710,7 +3710,7 @@ path = fetchurl { name = "csstype___csstype_3.0.6.tgz"; url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz"; - sha1 = "865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"; + sha512 = "+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw=="; }; } { @@ -3718,7 +3718,7 @@ path = fetchurl { name = "cyclist___cyclist_1.0.1.tgz"; url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; - sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + sha1 = "WW6WmP0MgOEgOMK4LW6xs1tiJNk="; }; } { @@ -3726,7 +3726,7 @@ path = fetchurl { name = "d___d_1.0.1.tgz"; url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; - sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; } { @@ -3734,7 +3734,7 @@ path = fetchurl { name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; - sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; + sha512 = "JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug=="; }; } { @@ -3742,7 +3742,7 @@ path = fetchurl { name = "dashdash___dashdash_1.14.1.tgz"; url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + sha1 = "hTz6D3y+L+1d4gMmuN1YEDX24vA="; }; } { @@ -3750,7 +3750,7 @@ path = fetchurl { name = "data_urls___data_urls_2.0.0.tgz"; url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; - sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; }; } { @@ -3758,7 +3758,7 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { @@ -3766,7 +3766,7 @@ path = fetchurl { name = "debug___debug_3.2.7.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; - sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; } { @@ -3774,7 +3774,7 @@ path = fetchurl { name = "debug___debug_4.1.1.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; } { @@ -3782,7 +3782,7 @@ path = fetchurl { name = "decamelize___decamelize_1.2.0.tgz"; url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA="; }; } { @@ -3790,7 +3790,7 @@ path = fetchurl { name = "decimal.js___decimal.js_10.2.1.tgz"; url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; - sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + sha512 = "KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw=="; }; } { @@ -3798,7 +3798,7 @@ 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 = "eb3913333458775cb84cd1a1fae062106bb87545"; + sha1 = "6zkTMzRYd1y4TNGh+uBiEGu4dUU="; }; } { @@ -3806,7 +3806,7 @@ path = fetchurl { name = "deep_equal___deep_equal_1.1.1.tgz"; url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; - sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; } { @@ -3814,7 +3814,7 @@ path = fetchurl { name = "deep_extend___deep_extend_0.5.1.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz"; - sha1 = "b894a9dd90d3023fbf1c55a394fb858eb2066f1f"; + sha512 = "N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w=="; }; } { @@ -3822,7 +3822,7 @@ path = fetchurl { name = "deep_is___deep_is_0.1.3.tgz"; url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ="; }; } { @@ -3830,7 +3830,7 @@ path = fetchurl { name = "deepmerge___deepmerge_4.2.2.tgz"; url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; - sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; } { @@ -3838,7 +3838,7 @@ path = fetchurl { name = "default_gateway___default_gateway_4.2.0.tgz"; url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz"; - sha1 = "167104c7500c2115f6dd69b0a536bb8ed720552b"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; } { @@ -3846,7 +3846,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -3854,7 +3854,7 @@ 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 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + sha1 = "w1se+RjsPJkPmlvFe+BKrOxcgRY="; }; } { @@ -3862,7 +3862,7 @@ 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 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + sha1 = "dp66rz9KY6rTr56NMEybvnm/sOY="; }; } { @@ -3870,7 +3870,7 @@ path = fetchurl { name = "define_property___define_property_2.0.2.tgz"; url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; - sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; } { @@ -3878,7 +3878,7 @@ path = fetchurl { name = "del___del_4.1.1.tgz"; url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; - sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; } { @@ -3886,7 +3886,7 @@ 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 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; }; } { @@ -3894,7 +3894,7 @@ path = fetchurl { name = "delegates___delegates_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; }; } { @@ -3902,7 +3902,7 @@ path = fetchurl { name = "denque___denque_1.5.0.tgz"; url = "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz"; - sha1 = "773de0686ff2d8ec2ff92914316a47b73b1c73de"; + sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="; }; } { @@ -3910,7 +3910,7 @@ path = fetchurl { name = "depd___depd_1.1.2.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; }; } { @@ -3918,7 +3918,7 @@ path = fetchurl { name = "des.js___des.js_1.0.1.tgz"; url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; - sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; }; } { @@ -3926,7 +3926,7 @@ path = fetchurl { name = "destroy___destroy_1.0.4.tgz"; url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + sha1 = "l4hXRCxEdJ5CBmE+N5RiBYJqvYA="; }; } { @@ -3934,7 +3934,7 @@ path = fetchurl { name = "detect_file___detect_file_1.0.0.tgz"; url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + sha1 = "8NZtA2cqglyxtzvbP+YjEMjlUrc="; }; } { @@ -3942,7 +3942,7 @@ path = fetchurl { name = "detect_it___detect_it_4.0.1.tgz"; url = "https://registry.yarnpkg.com/detect-it/-/detect-it-4.0.1.tgz"; - sha1 = "3f8de6b8330f5086270571251bedf10aec049e18"; + sha512 = "dg5YBTJYvogK1+dA2mBUDKzOWfYZtHVba89SyZUhc4+e3i2tzgjANFg5lDRCd3UOtRcw00vUTMK8LELcMdicug=="; }; } { @@ -3950,7 +3950,7 @@ path = fetchurl { name = "detect_newline___detect_newline_3.1.0.tgz"; url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; - sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; + sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; } { @@ -3958,7 +3958,7 @@ path = fetchurl { name = "detect_node___detect_node_2.0.4.tgz"; url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; - sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; }; } { @@ -3966,7 +3966,7 @@ path = fetchurl { name = "detect_passive_events___detect_passive_events_2.0.3.tgz"; url = "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-2.0.3.tgz"; - sha1 = "1f75ebf80660a66c615d8be23c3241cdda6977e0"; + sha512 = "QN/1X65Axis6a9D8qg8Py9cwY/fkWAmAH/edTbmLMcv4m5dboLJ7LcAi8CfaCON2tjk904KwKX/HTdsHC6yeRg=="; }; } { @@ -3974,7 +3974,7 @@ path = fetchurl { name = "diff_sequences___diff_sequences_25.2.6.tgz"; url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; - sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; } { @@ -3982,7 +3982,7 @@ path = fetchurl { name = "diff_sequences___diff_sequences_26.6.2.tgz"; url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz"; - sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1"; + sha512 = "Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="; }; } { @@ -3990,7 +3990,7 @@ path = fetchurl { name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; } { @@ -3998,7 +3998,7 @@ 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 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + sha1 = "s55/HabrCnW6nBcySzR1PEfgZU0="; }; } { @@ -4006,7 +4006,7 @@ path = fetchurl { name = "dns_packet___dns_packet_1.3.4.tgz"; url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz"; - sha1 = "e3455065824a2507ba886c55a89963bb107dec6f"; + sha512 = "BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA=="; }; } { @@ -4014,7 +4014,7 @@ 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 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + sha1 = "uR2Ab10nGI5Ks+fRB9iBocxGQrY="; }; } { @@ -4022,7 +4022,7 @@ path = fetchurl { name = "doctrine___doctrine_1.5.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + sha1 = "N53Ocw9hZvds76TmcHoVmwLFpvo="; }; } { @@ -4030,7 +4030,7 @@ path = fetchurl { name = "doctrine___doctrine_2.1.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; }; } { @@ -4038,7 +4038,7 @@ path = fetchurl { name = "doctrine___doctrine_3.0.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha1 = "addebead72a6574db783639dc87a121773973961"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; } { @@ -4046,7 +4046,7 @@ path = fetchurl { name = "dom_accessibility_api___dom_accessibility_api_0.5.4.tgz"; url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz"; - sha1 = "b06d059cdd4a4ad9a79275f9d414a5c126241166"; + sha512 = "TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ=="; }; } { @@ -4054,7 +4054,7 @@ path = fetchurl { name = "dom_helpers___dom_helpers_3.4.0.tgz"; url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz"; - sha1 = "e9b369700f959f62ecde5a6babde4bccd9169af8"; + sha512 = "LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA=="; }; } { @@ -4062,7 +4062,7 @@ path = fetchurl { name = "dom_helpers___dom_helpers_5.1.3.tgz"; url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz"; - sha1 = "7233248eb3a2d1f74aafca31e52c5299cc8ce821"; + sha512 = "nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw=="; }; } { @@ -4070,7 +4070,7 @@ path = fetchurl { name = "dom_serializer___dom_serializer_0.2.2.tgz"; url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; } { @@ -4078,7 +4078,7 @@ path = fetchurl { name = "domain_browser___domain_browser_1.2.0.tgz"; url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; - sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; } { @@ -4086,7 +4086,7 @@ path = fetchurl { name = "domelementtype___domelementtype_1.3.1.tgz"; url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; - sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; } { @@ -4094,7 +4094,7 @@ path = fetchurl { name = "domelementtype___domelementtype_2.0.1.tgz"; url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; - sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; + sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; }; } { @@ -4102,7 +4102,7 @@ path = fetchurl { name = "domexception___domexception_2.0.1.tgz"; url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; - sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; }; } { @@ -4110,7 +4110,7 @@ path = fetchurl { name = "domutils___domutils_1.7.0.tgz"; url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; - sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; } { @@ -4118,7 +4118,7 @@ path = fetchurl { name = "dot_prop___dot_prop_5.3.0.tgz"; url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; } { @@ -4126,7 +4126,7 @@ path = fetchurl { name = "dotenv___dotenv_9.0.2.tgz"; url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } { @@ -4134,7 +4134,7 @@ path = fetchurl { name = "duplexer___duplexer_0.1.2.tgz"; url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; - sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; } { @@ -4142,7 +4142,7 @@ path = fetchurl { name = "duplexify___duplexify_3.7.1.tgz"; url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; - sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; } { @@ -4150,7 +4150,7 @@ 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 = "3a83a904e54353287874c564b7549386849a98c9"; + sha1 = "OoOpBOVDUyh4dMVkt1SThoSamMk="; }; } { @@ -4158,7 +4158,7 @@ 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 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; }; } { @@ -4166,7 +4166,7 @@ path = fetchurl { name = "ejs___ejs_2.7.4.tgz"; url = "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz"; - sha1 = "48661287573dcc53e366c7a1ae52c3a120eec9ba"; + sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; } { @@ -4174,7 +4174,7 @@ path = fetchurl { name = "electron_to_chromium___electron_to_chromium_1.3.736.tgz"; url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz"; - sha1 = "f632d900a1f788dab22fec9c62ec5c9c8f0c4052"; + sha512 = "DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig=="; }; } { @@ -4182,7 +4182,7 @@ path = fetchurl { name = "elliptic___elliptic_6.5.4.tgz"; url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; - sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; } { @@ -4190,7 +4190,7 @@ path = fetchurl { name = "emittery___emittery_0.7.1.tgz"; url = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz"; - sha1 = "c02375a927a40948c0345cc903072597f5270451"; + sha512 = "d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ=="; }; } { @@ -4198,7 +4198,7 @@ path = fetchurl { name = "emoji_mart___emoji_mart_3.0.1.tgz"; url = "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-3.0.1.tgz"; - sha1 = "9ce86706e02aea0506345f98464814a662ca54c6"; + sha512 = "sxpmMKxqLvcscu6mFn9ITHeZNkGzIvD0BSNFE/LJESPbCA8s1jM6bCDPjWbV31xHq7JXaxgpHxLB54RCbBZSlg=="; }; } { @@ -4206,7 +4206,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_7.0.3.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; } { @@ -4214,7 +4214,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -4222,7 +4222,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_9.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz"; - sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4"; + sha512 = "6p1NII1Vm62wni/VR/cUMauVQoxmLVb9csqQlvLz+hO2gk8U2UYDfXHQSUYIBKmZwAKz867IDqG7B+u0mj+M6w=="; }; } { @@ -4230,7 +4230,7 @@ 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 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + sha1 = "TapNnbAPmBmIDHn6RXrlsJof04k="; }; } { @@ -4238,7 +4238,7 @@ path = fetchurl { name = "emojis_list___emojis_list_3.0.0.tgz"; url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; - sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; }; } { @@ -4246,7 +4246,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -4254,7 +4254,7 @@ 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"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -4262,7 +4262,7 @@ path = fetchurl { name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; - sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"; + sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; } { @@ -4270,7 +4270,7 @@ path = fetchurl { name = "enquirer___enquirer_2.3.6.tgz"; url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; - sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; } { @@ -4278,7 +4278,7 @@ path = fetchurl { name = "entities___entities_2.0.3.tgz"; url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; - sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; }; } { @@ -4286,7 +4286,7 @@ path = fetchurl { name = "errno___errno_0.1.7.tgz"; url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; - sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; } { @@ -4294,7 +4294,7 @@ path = fetchurl { name = "error_ex___error_ex_1.3.2.tgz"; url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; } { @@ -4302,7 +4302,7 @@ 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"; - sha1 = "5a99a707bd7a4c58a797902d48d82803ede6aad8"; + sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; }; } { @@ -4310,7 +4310,7 @@ path = fetchurl { name = "es_abstract___es_abstract_1.17.7.tgz"; url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; - sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; + sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g=="; }; } { @@ -4318,7 +4318,7 @@ path = fetchurl { name = "es_abstract___es_abstract_1.18.0_next.2.tgz"; url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; - sha1 = "088101a55f0541f595e7e057199e27ddc8f3a5c2"; + sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw=="; }; } { @@ -4326,7 +4326,7 @@ path = fetchurl { name = "es_abstract___es_abstract_1.18.3.tgz"; url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz"; - sha1 = "25c4c3380a27aa203c44b2b685bba94da31b63e0"; + sha512 = "nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw=="; }; } { @@ -4334,7 +4334,7 @@ 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"; - sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; } { @@ -4342,7 +4342,7 @@ path = fetchurl { name = "es5_ext___es5_ext_0.10.53.tgz"; url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; - sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; + sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; }; } { @@ -4350,7 +4350,7 @@ path = fetchurl { name = "es6_iterator___es6_iterator_2.0.3.tgz"; url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + sha1 = "p96IkUGgWpSwhUQDstCg+/qY87c="; }; } { @@ -4358,7 +4358,7 @@ path = fetchurl { name = "es6_map___es6_map_0.1.5.tgz"; url = "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + sha1 = "kTbgUD3MBqMBaQ8LsU/042TpSfA="; }; } { @@ -4366,7 +4366,7 @@ path = fetchurl { name = "es6_set___es6_set_0.1.5.tgz"; url = "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + sha1 = "0rPsXU2ADO2BjbU40ol02wpzzLE="; }; } { @@ -4374,7 +4374,7 @@ path = fetchurl { name = "es6_symbol___es6_symbol_3.1.1.tgz"; url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + sha1 = "vwDvT9q2uhtG7Le2KbTH7VcVzHc="; }; } { @@ -4382,7 +4382,7 @@ path = fetchurl { name = "es6_symbol___es6_symbol_3.1.3.tgz"; url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; + sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; }; } { @@ -4390,7 +4390,7 @@ path = fetchurl { name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; url = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; - sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"; + sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; } { @@ -4398,7 +4398,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -4406,7 +4406,7 @@ 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 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; }; } { @@ -4414,7 +4414,7 @@ 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 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -4422,7 +4422,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; } { @@ -4430,7 +4430,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -4438,7 +4438,7 @@ path = fetchurl { name = "escodegen___escodegen_1.14.3.tgz"; url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; - sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; } { @@ -4446,7 +4446,7 @@ path = fetchurl { name = "escope___escope_3.6.0.tgz"; url = "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + sha1 = "4Bl16BJ4GhY6ba392AOY3GTIicM="; }; } { @@ -4454,7 +4454,7 @@ path = fetchurl { name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; + sha512 = "ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="; }; } { @@ -4462,7 +4462,7 @@ path = fetchurl { name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz"; url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz"; - sha1 = "b51be1e473dd0de1c5ea638e22429c2490ea8233"; + sha512 = "ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A=="; }; } { @@ -4470,7 +4470,7 @@ path = fetchurl { name = "eslint_plugin_import___eslint_plugin_import_2.23.4.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz"; - sha1 = "8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97"; + sha512 = "6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ=="; }; } { @@ -4478,7 +4478,7 @@ path = fetchurl { name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; - sha1 = "a2d84caa49756942f42f1ffab9002436391718fd"; + sha512 = "0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg=="; }; } { @@ -4486,7 +4486,7 @@ path = fetchurl { name = "eslint_plugin_promise___eslint_plugin_promise_5.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz"; - sha1 = "fb2188fb734e4557993733b41aa1a688f46c6f24"; + sha512 = "NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng=="; }; } { @@ -4494,7 +4494,7 @@ path = fetchurl { name = "eslint_plugin_react___eslint_plugin_react_7.24.0.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz"; - sha1 = "eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"; + sha512 = "KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q=="; }; } { @@ -4502,7 +4502,7 @@ path = fetchurl { name = "eslint_scope___eslint_scope_4.0.3.tgz"; url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; - sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; } { @@ -4510,7 +4510,7 @@ path = fetchurl { name = "eslint_scope___eslint_scope_5.1.1.tgz"; url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; } { @@ -4518,7 +4518,7 @@ path = fetchurl { name = "eslint_utils___eslint_utils_2.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; } { @@ -4526,7 +4526,7 @@ 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"; - sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; } { @@ -4534,7 +4534,7 @@ path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; }; } { @@ -4542,7 +4542,7 @@ path = fetchurl { name = "eslint___eslint_2.13.1.tgz"; url = "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz"; - sha1 = "e4cc8fa0f009fb829aaae23855a29360be1f6c11"; + sha1 = "5MyPoPAJ+4KaquI4VaKTYL4fbBE="; }; } { @@ -4550,7 +4550,7 @@ path = fetchurl { name = "eslint___eslint_7.27.0.tgz"; url = "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz"; - sha1 = "665a1506d8f95655c9274d84bd78f7166b07e9c7"; + sha512 = "JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA=="; }; } { @@ -4558,7 +4558,7 @@ path = fetchurl { name = "espree___espree_3.5.4.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz"; - sha1 = "b0f447187c8a8bed944b815a660bddf5deb5d1a7"; + sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; } { @@ -4566,7 +4566,7 @@ path = fetchurl { name = "espree___espree_7.3.1.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; - sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; } { @@ -4574,7 +4574,7 @@ path = fetchurl { name = "esprima___esprima_4.0.1.tgz"; url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; } { @@ -4582,7 +4582,7 @@ path = fetchurl { name = "esquery___esquery_1.4.0.tgz"; url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; } { @@ -4590,7 +4590,7 @@ path = fetchurl { name = "esrecurse___esrecurse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; } { @@ -4598,7 +4598,7 @@ path = fetchurl { name = "estraverse___estraverse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; } { @@ -4606,7 +4606,7 @@ path = fetchurl { name = "estraverse___estraverse_5.2.0.tgz"; url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; } { @@ -4614,7 +4614,7 @@ path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; } { @@ -4622,7 +4622,7 @@ path = fetchurl { name = "etag___etag_1.8.1.tgz"; url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + sha1 = "Qa4u62XvpiJorr/qg6x9eSmbCIc="; }; } { @@ -4630,7 +4630,7 @@ path = fetchurl { name = "event_emitter___event_emitter_0.3.5.tgz"; url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + sha1 = "34xp7vFkeSPHFXuc6DhAYQsCzDk="; }; } { @@ -4638,7 +4638,7 @@ path = fetchurl { name = "eventemitter3___eventemitter3_4.0.7.tgz"; url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; } { @@ -4646,7 +4646,7 @@ path = fetchurl { name = "events___events_3.2.0.tgz"; url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; - sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; + sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="; }; } { @@ -4654,7 +4654,7 @@ path = fetchurl { name = "eventsource___eventsource_1.0.7.tgz"; url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; - sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; }; } { @@ -4662,7 +4662,7 @@ path = fetchurl { name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha1 = "7fcbdb198dc71959432efe13842684e0525acb02"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; } { @@ -4670,7 +4670,7 @@ path = fetchurl { name = "exec_sh___exec_sh_0.3.4.tgz"; url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; - sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A=="; }; } { @@ -4678,7 +4678,7 @@ path = fetchurl { name = "execa___execa_1.0.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; } { @@ -4686,7 +4686,7 @@ path = fetchurl { name = "execa___execa_4.1.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz"; - sha1 = "4e5491ad1572f2f17a77d388c6c857135b22847a"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; } { @@ -4694,7 +4694,7 @@ path = fetchurl { name = "exif_js___exif_js_2.3.0.tgz"; url = "https://registry.yarnpkg.com/exif-js/-/exif-js-2.3.0.tgz"; - sha1 = "9d10819bf571f873813e7640241255ab9ce1a814"; + sha1 = "nRCBm/Vx+HOBPnZAJBJVq5zhqBQ="; }; } { @@ -4702,7 +4702,7 @@ path = fetchurl { name = "exit_hook___exit_hook_1.1.1.tgz"; url = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz"; - sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + sha1 = "8FyiM7SMBdVP/wd2XfhQfpXAL/g="; }; } { @@ -4710,7 +4710,7 @@ path = fetchurl { name = "exit___exit_0.1.2.tgz"; url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; - sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + sha1 = "BjJjj42HfMghB9MKD/8aF8uhzQw="; }; } { @@ -4718,7 +4718,7 @@ 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 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + sha1 = "t3c14xXOMPa27/D4OwQVGiJEliI="; }; } { @@ -4726,7 +4726,7 @@ path = fetchurl { name = "expand_tilde___expand_tilde_2.0.2.tgz"; url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + sha1 = "l+gBqgUt8CRU3kawK/YhZCzchQI="; }; } { @@ -4734,7 +4734,7 @@ path = fetchurl { name = "expect___expect_26.6.2.tgz"; url = "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz"; - sha1 = "c6b996bf26bf3fe18b67b2d0f51fc981ba934417"; + sha512 = "9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA=="; }; } { @@ -4742,7 +4742,7 @@ path = fetchurl { name = "express___express_4.17.1.tgz"; url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; - sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; } { @@ -4750,7 +4750,7 @@ path = fetchurl { name = "ext___ext_1.4.0.tgz"; url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; - sha1 = "89ae7a07158f79d35517882904324077e4379244"; + sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; }; } { @@ -4758,7 +4758,7 @@ 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 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + sha1 = "Ua99YUrZqfYQ6huvu5idaxxWiQ8="; }; } { @@ -4766,7 +4766,7 @@ 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 = "26a71aaf073b39fb2127172746131c2704028db8"; + sha1 = "Jqcarwc7OfshJxcnRhMcJwQCjbg="; }; } { @@ -4774,7 +4774,7 @@ path = fetchurl { name = "extend___extend_3.0.2.tgz"; url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; } { @@ -4782,7 +4782,7 @@ path = fetchurl { name = "extglob___extglob_2.0.4.tgz"; url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; - sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; } { @@ -4790,7 +4790,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.3.0.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + sha1 = "lpGEQOMEGnpBT4xS48V06zw+HgU="; }; } { @@ -4798,7 +4798,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.4.0.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + sha1 = "4mifjzVvrWLMplo6kcXfX5VRaS8="; }; } { @@ -4806,7 +4806,7 @@ 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"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -4814,7 +4814,7 @@ 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"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -4822,7 +4822,7 @@ 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 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; }; } { @@ -4830,7 +4830,7 @@ path = fetchurl { name = "faye_websocket___faye_websocket_0.11.3.tgz"; url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha1 = "5c0e9a8968e8912c286639fde977a8b209f2508e"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; }; } { @@ -4838,7 +4838,7 @@ path = fetchurl { name = "fb_watchman___fb_watchman_2.0.1.tgz"; url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; - sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; + sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; }; } { @@ -4846,7 +4846,7 @@ path = fetchurl { name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; + sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; }; } { @@ -4854,7 +4854,7 @@ path = fetchurl { name = "figures___figures_1.7.0.tgz"; url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + sha1 = "y+Hjr/zxzUS4DK3+0o3Hk6lwHS4="; }; } { @@ -4862,7 +4862,7 @@ path = fetchurl { name = "file_entry_cache___file_entry_cache_1.3.1.tgz"; url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz"; - sha1 = "44c61ea607ae4be9c1402f41f44270cbfe334ff8"; + sha1 = "RMYepgeuS+nBQC9B9EJwy/4zT/g="; }; } { @@ -4870,7 +4870,7 @@ path = fetchurl { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } { @@ -4878,7 +4878,7 @@ path = fetchurl { name = "file_loader___file_loader_6.2.0.tgz"; url = "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz"; - sha1 = "baef7cf8e1840df325e4390b4484879480eebe4d"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; }; } { @@ -4886,7 +4886,7 @@ path = fetchurl { name = "file_type___file_type_12.4.2.tgz"; url = "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz"; - sha1 = "a344ea5664a1d01447ee7fb1b635f72feb6169d9"; + sha512 = "UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg=="; }; } { @@ -4894,7 +4894,7 @@ 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"; - sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; } { @@ -4902,7 +4902,7 @@ 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 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + sha1 = "1USBHUKPmOsGpj3EAtJAPDKMOPc="; }; } { @@ -4910,7 +4910,7 @@ path = fetchurl { name = "fill_range___fill_range_7.0.1.tgz"; url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; } { @@ -4918,7 +4918,7 @@ path = fetchurl { name = "finalhandler___finalhandler_1.1.2.tgz"; url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; } { @@ -4926,7 +4926,7 @@ 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"; - sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; } { @@ -4934,7 +4934,7 @@ path = fetchurl { name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; }; } { @@ -4942,7 +4942,7 @@ 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 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + sha1 = "RdG35QbHF93UgndaK3eSCjwMV6c="; }; } { @@ -4950,7 +4950,7 @@ path = fetchurl { name = "find_up___find_up_3.0.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; - sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; } { @@ -4958,7 +4958,7 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { @@ -4966,7 +4966,7 @@ path = fetchurl { name = "findup_sync___findup_sync_3.0.0.tgz"; url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; - sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; + sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; }; } { @@ -4974,7 +4974,7 @@ path = fetchurl { name = "flat_cache___flat_cache_1.3.4.tgz"; url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz"; - sha1 = "2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"; + sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg=="; }; } { @@ -4982,7 +4982,7 @@ path = fetchurl { name = "flat_cache___flat_cache_3.0.4.tgz"; url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; } { @@ -4990,7 +4990,7 @@ path = fetchurl { name = "flatted___flatted_3.1.0.tgz"; url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz"; - sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"; + sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; }; } { @@ -4998,7 +4998,7 @@ 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"; - sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; } { @@ -5006,7 +5006,7 @@ path = fetchurl { name = "follow_redirects___follow_redirects_1.13.0.tgz"; url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; - sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; + sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="; }; } { @@ -5014,7 +5014,7 @@ path = fetchurl { name = "font_awesome___font_awesome_4.7.0.tgz"; url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + sha1 = "j6jPBBGhoxr9B7BtKQK7n8gVoTM="; }; } { @@ -5022,7 +5022,7 @@ 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 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + sha1 = "gQaNKVqBQuwKxybG4iAMMPttXoA="; }; } { @@ -5030,7 +5030,7 @@ 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 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + sha1 = "+8cfDEGt6zf5bFd60e1C2P2sypE="; }; } { @@ -5038,7 +5038,7 @@ path = fetchurl { name = "form_data___form_data_2.3.3.tgz"; url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; } { @@ -5046,7 +5046,7 @@ path = fetchurl { name = "forwarded___forwarded_0.1.2.tgz"; url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + sha1 = "mMI9qxF1ZXuMBXPozszZGw/xjIQ="; }; } { @@ -5054,7 +5054,7 @@ 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 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + sha1 = "QpD60n8T6Jvn8zeZxrxaCr//DRk="; }; } { @@ -5062,7 +5062,7 @@ path = fetchurl { name = "fresh___fresh_0.5.2.tgz"; url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha1 = "PYyt2Q2XZWn6g1qx+OSyOhBWBac="; }; } { @@ -5070,7 +5070,7 @@ path = fetchurl { name = "from2___from2_2.3.0.tgz"; url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + sha1 = "i/tVAr3kpNNs/e6gB/zKIdfjgq8="; }; } { @@ -5078,7 +5078,7 @@ path = fetchurl { name = "front_matter___front_matter_2.1.2.tgz"; url = "https://registry.yarnpkg.com/front-matter/-/front-matter-2.1.2.tgz"; - sha1 = "f75983b9f2f413be658c93dfd7bd8ce4078f5cdb"; + sha1 = "91mDufL0E75ljJPf172M5AePXNs="; }; } { @@ -5086,7 +5086,7 @@ path = fetchurl { name = "fs_extra___fs_extra_3.0.1.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz"; - sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + sha1 = "N5TzeMWLNC6n27sjCVEJxLO2IpE="; }; } { @@ -5094,7 +5094,7 @@ path = fetchurl { name = "fs_extra___fs_extra_8.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; } { @@ -5102,7 +5102,7 @@ path = fetchurl { name = "fs_minipass___fs_minipass_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; } { @@ -5110,7 +5110,7 @@ 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 = "b47df53493ef911df75731e70a9ded0189db40c9"; + sha1 = "tH31NJPvkR33VzHnCp3tAYnbQMk="; }; } { @@ -5118,7 +5118,7 @@ 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 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; }; } { @@ -5126,7 +5126,7 @@ path = fetchurl { name = "fsevents___fsevents_1.2.13.tgz"; url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; - sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; } { @@ -5134,7 +5134,7 @@ path = fetchurl { name = "fsevents___fsevents_2.1.3.tgz"; url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; - sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; } { @@ -5142,7 +5142,7 @@ path = fetchurl { name = "fsevents___fsevents_2.3.2.tgz"; url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; - sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; } { @@ -5150,7 +5150,7 @@ path = fetchurl { name = "function_bind___function_bind_1.1.1.tgz"; url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; } { @@ -5158,7 +5158,7 @@ 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 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; }; } { @@ -5166,7 +5166,7 @@ path = fetchurl { name = "gauge___gauge_2.7.4.tgz"; url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -5174,7 +5174,7 @@ path = fetchurl { name = "generate_function___generate_function_2.3.1.tgz"; url = "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz"; - sha1 = "f069617690c10c868e73b8465746764f97c3479f"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; }; } { @@ -5182,7 +5182,7 @@ path = fetchurl { name = "generate_object_property___generate_object_property_1.2.0.tgz"; url = "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + sha1 = "nA4cQDCM6AT0eDYYuTf6iPmdUNA="; }; } { @@ -5190,7 +5190,7 @@ path = fetchurl { name = "gensync___gensync_1.0.0_beta.2.tgz"; url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; } { @@ -5198,7 +5198,7 @@ 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"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -5206,7 +5206,7 @@ path = fetchurl { name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; } { @@ -5214,7 +5214,7 @@ path = fetchurl { name = "get_package_type___get_package_type_0.1.0.tgz"; url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; - sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; + sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; } { @@ -5222,7 +5222,7 @@ path = fetchurl { name = "get_stream___get_stream_4.1.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; } { @@ -5230,7 +5230,7 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; } { @@ -5238,7 +5238,7 @@ 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 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + sha1 = "3BXKHGcjh8p2vTesCjlbogQqLCg="; }; } { @@ -5246,7 +5246,7 @@ path = fetchurl { name = "getpass___getpass_0.1.7.tgz"; url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha1 = "Xv+OPmhNVprkyysSgmBOi6YhSfo="; }; } { @@ -5254,7 +5254,7 @@ 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 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + sha1 = "nmr2KZ2NO9K9QEMIMr0RPfkGxa4="; }; } { @@ -5262,7 +5262,7 @@ path = fetchurl { name = "glob_parent___glob_parent_5.1.1.tgz"; url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; } { @@ -5270,7 +5270,7 @@ path = fetchurl { name = "glob___glob_7.1.7.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; - sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; } { @@ -5278,7 +5278,7 @@ path = fetchurl { name = "global_modules___global_modules_1.0.0.tgz"; url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; - sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; }; } { @@ -5286,7 +5286,7 @@ path = fetchurl { name = "global_modules___global_modules_2.0.0.tgz"; url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha1 = "997605ad2345f27f51539bea26574421215c7780"; + sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; }; } { @@ -5294,7 +5294,7 @@ path = fetchurl { name = "global_prefix___global_prefix_1.0.2.tgz"; url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + sha1 = "2/dDxsFJklk8ZVVoy2btMsASLr4="; }; } { @@ -5302,7 +5302,7 @@ path = fetchurl { name = "global_prefix___global_prefix_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; - sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97"; + sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; }; } { @@ -5310,7 +5310,7 @@ path = fetchurl { name = "globals___globals_11.12.0.tgz"; url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; - sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; } { @@ -5318,7 +5318,7 @@ path = fetchurl { name = "globals___globals_12.3.0.tgz"; url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; - sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; + sha512 = "wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw=="; }; } { @@ -5326,7 +5326,7 @@ path = fetchurl { name = "globals___globals_13.6.0.tgz"; url = "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz"; - sha1 = "d77138e53738567bb96a3916ff6f6b487af20ef7"; + sha512 = "YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ=="; }; } { @@ -5334,7 +5334,7 @@ path = fetchurl { name = "globals___globals_9.18.0.tgz"; url = "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz"; - sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; } { @@ -5342,7 +5342,7 @@ path = fetchurl { name = "globby___globby_6.1.0.tgz"; url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + sha1 = "9abXDoOV4hyFj7BInWTfAkJNUGw="; }; } { @@ -5350,7 +5350,7 @@ path = fetchurl { name = "globule___globule_1.3.2.tgz"; url = "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz"; - sha1 = "d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"; + sha512 = "7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA=="; }; } { @@ -5358,7 +5358,7 @@ path = fetchurl { name = "gonzales_pe_sl___gonzales_pe_sl_4.2.3.tgz"; url = "https://registry.yarnpkg.com/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz"; - sha1 = "6a868bc380645f141feeb042c6f97fcc71b59fe6"; + sha1 = "aoaLw4BkXxQf7rBCxvl/zHG1n+Y="; }; } { @@ -5366,7 +5366,7 @@ path = fetchurl { name = "graceful_fs___graceful_fs_4.2.4.tgz"; url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; } { @@ -5374,7 +5374,7 @@ path = fetchurl { name = "growly___growly_1.3.0.tgz"; url = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz"; - sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + sha1 = "8QdIy+dq+WS3yWyTxrzCivEgwIE="; }; } { @@ -5382,7 +5382,7 @@ path = fetchurl { name = "gzip_size___gzip_size_6.0.0.tgz"; url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz"; - sha1 = "065367fd50c239c0671cbcbad5be3e2eeb10e462"; + sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; }; } { @@ -5390,7 +5390,7 @@ path = fetchurl { name = "handle_thing___handle_thing_2.0.1.tgz"; url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; - sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; + sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; } { @@ -5398,7 +5398,7 @@ 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 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + sha1 = "qUwiJOvKwEeCoNkDVSHyRzW37JI="; }; } { @@ -5406,7 +5406,7 @@ path = fetchurl { name = "har_validator___har_validator_5.1.5.tgz"; url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; - sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; } { @@ -5414,7 +5414,7 @@ path = fetchurl { name = "has_ansi___has_ansi_2.0.0.tgz"; url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + sha1 = "NPUEnOHs3ysGSa8+8k5F7TVBbZE="; }; } { @@ -5422,7 +5422,7 @@ path = fetchurl { name = "has_bigints___has_bigints_1.0.1.tgz"; url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; - sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; }; } { @@ -5430,7 +5430,7 @@ path = fetchurl { name = "has_flag___has_flag_1.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + sha1 = "nZ55MWXOAXoA8AQYxD+UKnsdEfo="; }; } { @@ -5438,7 +5438,7 @@ 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 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -5446,7 +5446,7 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; } { @@ -5454,7 +5454,7 @@ path = fetchurl { name = "has_symbols___has_symbols_1.0.1.tgz"; url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; - sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; } { @@ -5462,7 +5462,7 @@ path = fetchurl { name = "has_symbols___has_symbols_1.0.2.tgz"; url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; - sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; } { @@ -5470,7 +5470,7 @@ path = fetchurl { name = "has_unicode___has_unicode_2.0.1.tgz"; url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -5478,7 +5478,7 @@ 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 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + sha1 = "ex9YutpiyoJ+wKIHgCVlSEWZXh8="; }; } { @@ -5486,7 +5486,7 @@ 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 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + sha1 = "GLKB2lhbHFxR3vJMkw7SmgvmsXc="; }; } { @@ -5494,7 +5494,7 @@ 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 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + sha1 = "bWHeldkd/Km5oCCJrThL/49it3E="; }; } { @@ -5502,7 +5502,7 @@ 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 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + sha1 = "lbC2P+whRmGab+V/51Yo1aOe/k8="; }; } { @@ -5510,7 +5510,7 @@ path = fetchurl { name = "has___has_1.0.3.tgz"; url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; } { @@ -5518,7 +5518,7 @@ path = fetchurl { name = "hash_base___hash_base_3.1.0.tgz"; url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; - sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; } { @@ -5526,7 +5526,7 @@ path = fetchurl { name = "hash.js___hash.js_1.1.7.tgz"; url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; - sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; } { @@ -5534,7 +5534,7 @@ 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"; - sha1 = "4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"; + sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; } { @@ -5542,7 +5542,7 @@ path = fetchurl { name = "history___history_4.10.1.tgz"; url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; - sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; + sha512 = "36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew=="; }; } { @@ -5550,7 +5550,7 @@ path = fetchurl { name = "history___history_4.7.2.tgz"; url = "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz"; - sha1 = "22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"; + sha512 = "1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA=="; }; } { @@ -5558,7 +5558,7 @@ 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 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; }; } { @@ -5566,7 +5566,7 @@ path = fetchurl { name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"; - sha1 = "c5903cf409c0dfd908f388e619d86b9c1174cb47"; + sha512 = "rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="; }; } { @@ -5574,7 +5574,7 @@ path = fetchurl { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; - sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; + sha512 = "/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="; }; } { @@ -5582,7 +5582,7 @@ path = fetchurl { name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; } { @@ -5590,7 +5590,7 @@ 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"; - sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; }; } { @@ -5598,7 +5598,7 @@ 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 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + sha1 = "h3dMCUnlE/QuhFdbPEVoH63ioLI="; }; } { @@ -5606,7 +5606,7 @@ 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 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + sha1 = "1JMwx4ntgZ4nakwNJy3/owsY/m4="; }; } { @@ -5614,7 +5614,7 @@ 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 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; + sha1 = "wc56MWjIxmFAM6S194d/OyJfnDg="; }; } { @@ -5622,7 +5622,7 @@ path = fetchurl { name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; - sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; }; } { @@ -5630,7 +5630,7 @@ path = fetchurl { name = "html_entities___html_entities_1.3.1.tgz"; url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; - sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; + sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; }; } { @@ -5638,7 +5638,7 @@ path = fetchurl { name = "html_escaper___html_escaper_2.0.2.tgz"; url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; - sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; } { @@ -5646,7 +5646,7 @@ 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 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + sha1 = "+nFolEq5pRnTN8sL7HKE3D5yPYc="; }; } { @@ -5654,7 +5654,7 @@ path = fetchurl { name = "http_errors___http_errors_1.7.2.tgz"; url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; - sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; } { @@ -5662,7 +5662,7 @@ 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 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + sha1 = "i1VoC7S+KDoLW/TqLjhYC+HZMg0="; }; } { @@ -5670,7 +5670,7 @@ path = fetchurl { name = "http_errors___http_errors_1.7.3.tgz"; url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; - sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; } { @@ -5678,7 +5678,7 @@ path = fetchurl { name = "http_link_header___http_link_header_1.0.3.tgz"; url = "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.3.tgz"; - sha1 = "abbc2cdc5e06dd7e196a4983adac08a2d085ec90"; + sha512 = "nARK1wSKoBBrtcoESlHBx36c1Ln/gnbNQi1eB6MeTUefJIT3NvUOsV15bClga0k38f0q/kN5xxrGSDS3EFnm9w=="; }; } { @@ -5686,7 +5686,7 @@ path = fetchurl { name = "http_parser_js___http_parser_js_0.4.10.tgz"; url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + sha1 = "ksnBN0w1CF912zWexWzCV8u5P6Q="; }; } { @@ -5694,7 +5694,7 @@ path = fetchurl { name = "http_parser_js___http_parser_js_0.5.3.tgz"; url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz"; - sha1 = "01d2709c79d41698bb01d4decc5e9da4e4a033d9"; + sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="; }; } { @@ -5702,7 +5702,7 @@ 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"; - sha1 = "183c7dc4aa1479150306498c210cdaf96080a43a"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; } { @@ -5710,7 +5710,7 @@ path = fetchurl { name = "http_proxy___http_proxy_1.18.1.tgz"; url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; - sha1 = "401541f0534884bbf95260334e72f88ee3976549"; + sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; } { @@ -5718,7 +5718,7 @@ 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 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + sha1 = "muzZJRFHcvPZW2WmCruPfBj7rOE="; }; } { @@ -5726,7 +5726,7 @@ 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 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + sha1 = "7AbBDgo0wPL68Zn3/X/Hj//QPHM="; }; } { @@ -5734,7 +5734,7 @@ path = fetchurl { name = "human_signals___human_signals_1.1.1.tgz"; url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; - sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; }; } { @@ -5742,7 +5742,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.4.24.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; } { @@ -5750,7 +5750,7 @@ path = fetchurl { name = "icss_utils___icss_utils_5.1.0.tgz"; url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; - sha1 = "c6be6858abd013d768e98366ae47e25d5887b1ae"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; }; } { @@ -5758,7 +5758,7 @@ path = fetchurl { name = "idb_keyval___idb_keyval_3.2.0.tgz"; url = "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-3.2.0.tgz"; - sha1 = "cbbf354deb5684b6cdc84376294fc05932845bd6"; + sha512 = "slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ=="; }; } { @@ -5766,7 +5766,7 @@ path = fetchurl { name = "ieee754___ieee754_1.1.13.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; - sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; } { @@ -5774,7 +5774,7 @@ path = fetchurl { name = "iferr___iferr_0.1.5.tgz"; url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; - sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + sha1 = "xg7taebY/bazEEofy8ocGS3FtQE="; }; } { @@ -5782,7 +5782,7 @@ path = fetchurl { name = "ignore___ignore_3.3.10.tgz"; url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; - sha1 = "0a97fb876986e8081c631160f8f9f389157f0043"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; } { @@ -5790,7 +5790,7 @@ path = fetchurl { name = "ignore___ignore_4.0.6.tgz"; url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; - sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; } { @@ -5798,7 +5798,7 @@ path = fetchurl { name = "immutable___immutable_3.8.2.tgz"; url = "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz"; - sha1 = "c2439951455bb39913daf281376f1530e104adf3"; + sha1 = "wkOZUUVbs5kT2vKBN28VMOEErfM="; }; } { @@ -5806,7 +5806,7 @@ 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 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; + sha1 = "qmzzbnInYShcs3HsZRn1PiQ1sKk="; }; } { @@ -5814,7 +5814,7 @@ 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 = "d81355c15612d386c61f9ddd3922d4304822a546"; + sha1 = "2BNVwVYS04bGH53dOSLUMEgipUY="; }; } { @@ -5822,7 +5822,7 @@ path = fetchurl { name = "import_fresh___import_fresh_3.2.1.tgz"; url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; } { @@ -5830,7 +5830,7 @@ 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 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + sha1 = "M1238qev/VOqpHHUuAId7ja387E="; }; } { @@ -5838,7 +5838,7 @@ path = fetchurl { name = "import_local___import_local_2.0.0.tgz"; url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; - sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; } { @@ -5846,7 +5846,7 @@ path = fetchurl { name = "import_local___import_local_3.0.2.tgz"; url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; - sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA=="; }; } { @@ -5854,7 +5854,7 @@ path = fetchurl { name = "imports_loader___imports_loader_1.2.0.tgz"; url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz"; - sha1 = "b06823d0bb42e6f5ff89bc893829000eda46693f"; + sha512 = "zPvangKEgrrPeqeUqH0Uhc59YqK07JqZBi9a9cQ3v/EKUIqrbJHY4CvUrDus2lgQa5AmPyXuGrWP8JJTqzE5RQ=="; }; } { @@ -5862,7 +5862,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -5870,7 +5870,7 @@ path = fetchurl { name = "indent_string___indent_string_4.0.0.tgz"; url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; - sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; } { @@ -5878,7 +5878,7 @@ 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 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + sha1 = "8w9xbI4r00bHtn0985FVZqfAVgc="; }; } { @@ -5886,7 +5886,7 @@ path = fetchurl { name = "infer_owner___infer_owner_1.0.4.tgz"; url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; - sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; } { @@ -5894,7 +5894,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -5902,7 +5902,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -5910,7 +5910,7 @@ path = fetchurl { name = "inherits___inherits_2.0.1.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + sha1 = "sX0I0ya0Qj5Wjv9xn5GwscvfafE="; }; } { @@ -5918,7 +5918,7 @@ path = fetchurl { name = "inherits___inherits_2.0.3.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; }; } { @@ -5926,7 +5926,7 @@ path = fetchurl { name = "ini___ini_1.3.7.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz"; - sha1 = "a09363e1911972ea16d7a8851005d84cf09a9a84"; + sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; }; } { @@ -5934,7 +5934,7 @@ path = fetchurl { name = "inquirer___inquirer_0.12.0.tgz"; url = "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + sha1 = "HvK/1jUE3wvHV4X/+MLEHfEvB34="; }; } { @@ -5942,7 +5942,7 @@ path = fetchurl { name = "internal_ip___internal_ip_4.3.0.tgz"; url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz"; - sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; } { @@ -5950,7 +5950,7 @@ path = fetchurl { name = "internal_slot___internal_slot_1.0.3.tgz"; url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; } { @@ -5958,7 +5958,7 @@ path = fetchurl { name = "interpret___interpret_1.4.0.tgz"; url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; - sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; + sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; } { @@ -5966,7 +5966,7 @@ path = fetchurl { name = "intersection_observer___intersection_observer_0.12.0.tgz"; url = "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.0.tgz"; - sha1 = "6c84628f67ce8698e5f9ccf857d97718745837aa"; + sha512 = "2Vkz8z46Dv401zTWudDGwO7KiGHNDkMv417T5ItcNYfmvHR/1qCTVBO9vwH8zZmQ0WkA/1ARwpysR9bsnop4NQ=="; }; } { @@ -5974,7 +5974,7 @@ path = fetchurl { name = "intl_format_cache___intl_format_cache_2.2.9.tgz"; url = "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.2.9.tgz"; - sha1 = "fb560de20c549cda20b569cf1ffb6dc62b5b93b4"; + sha512 = "Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ=="; }; } { @@ -5982,7 +5982,7 @@ path = fetchurl { name = "intl_messageformat_parser___intl_messageformat_parser_1.4.0.tgz"; url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz"; - sha1 = "b43d45a97468cadbe44331d74bb1e8dea44fc075"; + sha1 = "tD1FqXRoytvkQzHXS7Ho3qRPwHU="; }; } { @@ -5990,7 +5990,7 @@ path = fetchurl { name = "intl_messageformat_parser___intl_messageformat_parser_4.1.4.tgz"; url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-4.1.4.tgz"; - sha1 = "98f3415e6990d44bebf2e0ad8e4cfbacf3ef5ed3"; + sha512 = "zV4kBUD1yhxSyaXm6bGhmP4HFH9Gh4pRQwNn+xq5P+B1dT8mpaAfU75nfUn4HgddIB6pyFnzM5MQjO55UpJwkQ=="; }; } { @@ -5998,7 +5998,7 @@ path = fetchurl { name = "intl_messageformat___intl_messageformat_2.2.0.tgz"; url = "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz"; - sha1 = "345bcd46de630b7683330c2e52177ff5eab484fc"; + sha1 = "NFvNRt5jC3aDMwwuUhd/9eq0hPw="; }; } { @@ -6006,7 +6006,7 @@ path = fetchurl { name = "intl_relativeformat___intl_relativeformat_2.2.0.tgz"; url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz"; - sha1 = "6aca95d019ec8d30b6c5653b6629f9983ea5b6c5"; + sha512 = "4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw=="; }; } { @@ -6014,7 +6014,7 @@ path = fetchurl { name = "intl_relativeformat___intl_relativeformat_6.4.3.tgz"; url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-6.4.3.tgz"; - sha1 = "cb5559e1e257cc2e763583502012a354bb777efe"; + sha512 = "VxZXZfhuX/zBVfxzE/J6kPUpsyWKYjqtZ3jVGZwr6wzK5BOLVpe1vSlwCQX56w5UjlpL63fS8Nxq0kgTyf1gJA=="; }; } { @@ -6022,7 +6022,7 @@ path = fetchurl { name = "intl___intl_1.2.5.tgz"; url = "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz"; - sha1 = "82244a2190c4e419f8371f5aa34daa3420e2abde"; + sha1 = "giRKIZDE5Bn4Nx9ao02qNCDiq94="; }; } { @@ -6030,7 +6030,7 @@ path = fetchurl { name = "invariant___invariant_2.2.4.tgz"; url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; - sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; }; } { @@ -6038,7 +6038,7 @@ 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 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + sha1 = "+ni/XS5pE8kRzp+BnuUUa7bYROk="; }; } { @@ -6046,7 +6046,7 @@ path = fetchurl { name = "ip___ip_1.1.5.tgz"; url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; - sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + sha1 = "vd7XARQpCCjAoDnnLvJfWq7ENUo="; }; } { @@ -6054,7 +6054,7 @@ path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; } { @@ -6062,7 +6062,7 @@ 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 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + sha1 = "UFMN+4T8yap9vnhS6Do3uTufKqY="; }; } { @@ -6070,7 +6070,7 @@ 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"; - sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; } { @@ -6078,7 +6078,7 @@ 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 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + sha1 = "qeEss66Nh2cn7u84Q/igiXtcmNY="; }; } { @@ -6086,7 +6086,7 @@ 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"; - sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; } { @@ -6094,7 +6094,7 @@ path = fetchurl { name = "is_arguments___is_arguments_1.0.4.tgz"; url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; }; } { @@ -6102,7 +6102,7 @@ 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 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; }; } { @@ -6110,7 +6110,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.3.2.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; } { @@ -6118,7 +6118,7 @@ path = fetchurl { name = "is_bigint___is_bigint_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; - sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; + sha512 = "0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="; }; } { @@ -6126,7 +6126,7 @@ 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 = "75f16642b480f187a711c814161fd3a4a7655898"; + sha1 = "dfFmQrSA8YenEcgUFh/TpKdlWJg="; }; } { @@ -6134,7 +6134,7 @@ 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"; - sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; } { @@ -6142,7 +6142,7 @@ path = fetchurl { name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; - sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; + sha512 = "bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng=="; }; } { @@ -6150,7 +6150,7 @@ path = fetchurl { name = "is_buffer___is_buffer_1.1.6.tgz"; url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; } { @@ -6158,7 +6158,7 @@ path = fetchurl { name = "is_callable___is_callable_1.2.2.tgz"; url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; - sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; + sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; }; } { @@ -6166,7 +6166,7 @@ path = fetchurl { name = "is_callable___is_callable_1.2.3.tgz"; url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; - sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; + sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; }; } { @@ -6174,7 +6174,7 @@ path = fetchurl { name = "is_ci___is_ci_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; } { @@ -6182,7 +6182,7 @@ path = fetchurl { name = "is_ci___is_ci_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz"; - sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"; + sha512 = "kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ=="; }; } { @@ -6190,7 +6190,7 @@ 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 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + sha1 = "z/9HGu5N1cnhWFmPvhKWe1za00U="; }; } { @@ -6198,7 +6198,7 @@ path = fetchurl { name = "is_core_module___is_core_module_2.4.0.tgz"; url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; - sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; + sha512 = "6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A=="; }; } { @@ -6206,7 +6206,7 @@ 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 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + sha1 = "C17mSDiOLIYCgueT8YVv7D8wG1Y="; }; } { @@ -6214,7 +6214,7 @@ 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"; - sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; } { @@ -6222,7 +6222,7 @@ path = fetchurl { name = "is_date_object___is_date_object_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; } { @@ -6230,7 +6230,7 @@ path = fetchurl { name = "is_descriptor___is_descriptor_0.1.6.tgz"; url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; }; } { @@ -6238,7 +6238,7 @@ path = fetchurl { name = "is_descriptor___is_descriptor_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; } { @@ -6246,7 +6246,7 @@ 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 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + sha1 = "YTObbyR1/Hcv2cnYP1yFddwVSuE="; }; } { @@ -6254,7 +6254,7 @@ path = fetchurl { name = "is_docker___is_docker_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; - sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; }; } { @@ -6262,7 +6262,7 @@ path = fetchurl { name = "is_electron___is_electron_2.2.0.tgz"; url = "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz"; - sha1 = "8943084f09e8b731b3a7a0298a7b5d56f6b7eef0"; + sha512 = "SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q=="; }; } { @@ -6270,7 +6270,7 @@ 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 = "62b110e289a471418e3ec36a617d472e301dfc89"; + sha1 = "YrEQ4omkcUGOPsNqYX1HLjAd/Ik="; }; } { @@ -6278,7 +6278,7 @@ path = fetchurl { name = "is_extendable___is_extendable_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; - sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; }; } { @@ -6286,7 +6286,7 @@ 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 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; }; } { @@ -6294,7 +6294,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -6302,7 +6302,7 @@ 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 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + sha1 = "o7MKXE8ZkYMWeqq5O+764937ZU8="; }; } { @@ -6310,7 +6310,7 @@ 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"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -6318,7 +6318,7 @@ path = fetchurl { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; - sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118"; + sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="; }; } { @@ -6326,7 +6326,7 @@ 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 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + sha1 = "e6WuJCF4BKxwcHuWkiVnSGzD6Eo="; }; } { @@ -6334,7 +6334,7 @@ path = fetchurl { name = "is_glob___is_glob_4.0.1.tgz"; url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; } { @@ -6342,7 +6342,7 @@ path = fetchurl { name = "is_my_ip_valid___is_my_ip_valid_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha1 = "7b351b8e8edd4d3995d4d066680e664d94696824"; + sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; } { @@ -6350,7 +6350,7 @@ path = fetchurl { name = "is_my_json_valid___is_my_json_valid_2.20.5.tgz"; url = "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; - sha1 = "5eca6a8232a687f68869b7361be1612e7512e5df"; + sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A=="; }; } { @@ -6358,7 +6358,7 @@ path = fetchurl { name = "is_nan___is_nan_1.3.2.tgz"; url = "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz"; - sha1 = "043a54adea31748b55b6cd4e09aadafa69bd9e1d"; + sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; }; } { @@ -6366,7 +6366,7 @@ path = fetchurl { name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; }; } { @@ -6374,7 +6374,7 @@ path = fetchurl { name = "is_number_object___is_number_object_1.0.5.tgz"; url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; - sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; + sha512 = "RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="; }; } { @@ -6382,7 +6382,7 @@ 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 = "24fd6201a4782cf50561c810276afc7d12d71195"; + sha1 = "JP1iAaR4LPUFYcgQJ2r8fRLXEZU="; }; } { @@ -6390,7 +6390,7 @@ path = fetchurl { name = "is_number___is_number_7.0.0.tgz"; url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; } { @@ -6398,7 +6398,7 @@ path = fetchurl { name = "is_obj___is_obj_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; } { @@ -6406,7 +6406,7 @@ 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"; - sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; }; } { @@ -6414,7 +6414,7 @@ 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"; - sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; }; } { @@ -6422,7 +6422,7 @@ 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"; - sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; } { @@ -6430,7 +6430,7 @@ 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"; - sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; } { @@ -6438,7 +6438,7 @@ path = fetchurl { name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; - sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + sha1 = "DFLlS8yjkbssSUsh6GJtczbG45c="; }; } { @@ -6446,7 +6446,7 @@ path = fetchurl { name = "is_property___is_property_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + sha1 = "V/4cTkhHTt1lsJkR8msc1Ald2oQ="; }; } { @@ -6454,7 +6454,7 @@ path = fetchurl { name = "is_regex___is_regex_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; - sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; + sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; }; } { @@ -6462,7 +6462,7 @@ path = fetchurl { name = "is_regex___is_regex_1.1.1.tgz"; url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; - sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; + sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; }; } { @@ -6470,7 +6470,7 @@ path = fetchurl { name = "is_regex___is_regex_1.1.3.tgz"; url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; - sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; + sha512 = "qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ=="; }; } { @@ -6478,7 +6478,7 @@ path = fetchurl { name = "is_resolvable___is_resolvable_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; }; } { @@ -6486,7 +6486,7 @@ 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 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; }; } { @@ -6494,7 +6494,7 @@ path = fetchurl { name = "is_stream___is_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; - sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; } { @@ -6502,7 +6502,7 @@ path = fetchurl { name = "is_string___is_string_1.0.5.tgz"; url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; }; } { @@ -6510,7 +6510,7 @@ path = fetchurl { name = "is_string___is_string_1.0.6.tgz"; url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; - sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; + sha512 = "2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="; }; } { @@ -6518,7 +6518,7 @@ path = fetchurl { name = "is_symbol___is_symbol_1.0.3.tgz"; url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; - sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; } { @@ -6526,7 +6526,7 @@ path = fetchurl { name = "is_symbol___is_symbol_1.0.4.tgz"; url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; - sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; } { @@ -6534,7 +6534,7 @@ 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 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; }; } { @@ -6542,7 +6542,7 @@ path = fetchurl { name = "is_url___is_url_1.2.4.tgz"; url = "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz"; - sha1 = "04a4df46d28c4cff3d73d01ff06abeb318a1aa52"; + sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; }; } { @@ -6550,7 +6550,7 @@ path = fetchurl { name = "is_windows___is_windows_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; - sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; } { @@ -6558,7 +6558,7 @@ 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 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + sha1 = "HxbkqiKwTRM2tmGIpmrzxgDDpm0="; }; } { @@ -6566,7 +6566,7 @@ path = fetchurl { name = "is_wsl___is_wsl_2.2.0.tgz"; url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; - sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } { @@ -6574,7 +6574,7 @@ path = fetchurl { name = "isarray___isarray_0.0.1.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + sha1 = "ihis/Kmo9Bd+Cav8YDiTmwXR7t8="; }; } { @@ -6582,7 +6582,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -6590,7 +6590,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { @@ -6598,7 +6598,7 @@ path = fetchurl { name = "isobject___isobject_2.1.0.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + sha1 = "8GVWEJaj8dou9GJy+BXIQNh+DIk="; }; } { @@ -6606,7 +6606,7 @@ path = fetchurl { name = "isobject___isobject_3.0.1.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8="; }; } { @@ -6614,7 +6614,7 @@ path = fetchurl { name = "isstream___isstream_0.1.2.tgz"; url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + sha1 = "R+Y/evVa+m+S4VAOaQ64uFKcCZo="; }; } { @@ -6622,7 +6622,7 @@ path = fetchurl { name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha1 = "f5944a37c70b550b02a78a5c3b2055b280cec8ec"; + sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; }; } { @@ -6630,7 +6630,7 @@ path = fetchurl { name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; - sha1 = "873c6fff897450118222774696a3f28902d77c1d"; + sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; }; } { @@ -6638,7 +6638,7 @@ path = fetchurl { name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha1 = "7518fe52ea44de372f460a76b5ecda9ffb73d8a6"; + sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; }; } { @@ -6646,7 +6646,7 @@ path = fetchurl { name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; - sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"; + sha512 = "c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg=="; }; } { @@ -6654,7 +6654,7 @@ path = fetchurl { name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; - sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; + sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; } { @@ -6662,7 +6662,7 @@ path = fetchurl { name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz"; - sha1 = "f6198479e1cc66f22f9ae1e22acaa0b429c042d0"; + sha512 = "fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ=="; }; } { @@ -6670,7 +6670,7 @@ path = fetchurl { name = "jest_cli___jest_cli_26.6.3.tgz"; url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz"; - sha1 = "43117cfef24bc4cd691a174a8796a532e135e92a"; + sha512 = "GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg=="; }; } { @@ -6678,7 +6678,7 @@ path = fetchurl { name = "jest_config___jest_config_26.6.3.tgz"; url = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz"; - sha1 = "64f41444eef9eb03dc51d5c53b75c8c71f645349"; + sha512 = "t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg=="; }; } { @@ -6686,7 +6686,7 @@ path = fetchurl { name = "jest_diff___jest_diff_25.5.0.tgz"; url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; - sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; + sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; }; } { @@ -6694,7 +6694,7 @@ path = fetchurl { name = "jest_diff___jest_diff_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz"; - sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"; + sha512 = "6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA=="; }; } { @@ -6702,7 +6702,7 @@ path = fetchurl { name = "jest_docblock___jest_docblock_26.0.0.tgz"; url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz"; - sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5"; + sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w=="; }; } { @@ -6710,7 +6710,7 @@ path = fetchurl { name = "jest_each___jest_each_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz"; - sha1 = "02526438a77a67401c8a6382dfe5999952c167cb"; + sha512 = "Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A=="; }; } { @@ -6718,7 +6718,7 @@ path = fetchurl { name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz"; - sha1 = "78d09fe9cf019a357009b9b7e1f101d23bd1da3e"; + sha512 = "jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q=="; }; } { @@ -6726,7 +6726,7 @@ path = fetchurl { name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz"; - sha1 = "824e4c7fb4944646356f11ac75b229b0035f2b0c"; + sha512 = "zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag=="; }; } { @@ -6734,7 +6734,7 @@ path = fetchurl { name = "jest_get_type___jest_get_type_25.2.6.tgz"; url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; - sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; + sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; }; } { @@ -6742,7 +6742,7 @@ path = fetchurl { name = "jest_get_type___jest_get_type_26.3.0.tgz"; url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz"; - sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0"; + sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; }; } { @@ -6750,7 +6750,7 @@ path = fetchurl { name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz"; - sha1 = "dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"; + sha512 = "easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w=="; }; } { @@ -6758,7 +6758,7 @@ path = fetchurl { name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; - sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; + sha512 = "37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA=="; }; } { @@ -6766,7 +6766,7 @@ path = fetchurl { name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz"; - sha1 = "adc3cf915deacb5212c93b9f3547cd12958f2edd"; + sha512 = "kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg=="; }; } { @@ -6774,7 +6774,7 @@ path = fetchurl { name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz"; - sha1 = "7717cf118b92238f2eba65054c8a0c9c653a91af"; + sha512 = "i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg=="; }; } { @@ -6782,7 +6782,7 @@ path = fetchurl { name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz"; - sha1 = "8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"; + sha512 = "llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw=="; }; } { @@ -6790,7 +6790,7 @@ path = fetchurl { name = "jest_message_util___jest_message_util_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz"; - sha1 = "58173744ad6fc0506b5d21150b9be56ef001ca07"; + sha512 = "rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA=="; }; } { @@ -6798,7 +6798,7 @@ path = fetchurl { name = "jest_mock___jest_mock_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz"; - sha1 = "d6cb712b041ed47fe0d9b6fc3474bc6543feb302"; + sha512 = "YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew=="; }; } { @@ -6806,7 +6806,7 @@ path = fetchurl { name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; - sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; + sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; }; } { @@ -6814,7 +6814,7 @@ path = fetchurl { name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz"; - sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28"; + sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="; }; } { @@ -6822,7 +6822,7 @@ path = fetchurl { name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz"; - sha1 = "69d4b1bf5b690faa3490113c47486ed85dd45b68"; + sha512 = "6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ=="; }; } { @@ -6830,7 +6830,7 @@ path = fetchurl { name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz"; - sha1 = "6680859ee5d22ee5dcd961fe4871f59f4c784fb6"; + sha512 = "pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg=="; }; } { @@ -6838,7 +6838,7 @@ path = fetchurl { name = "jest_resolve___jest_resolve_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz"; - sha1 = "a3ab1517217f469b504f1b56603c5bb541fbb507"; + sha512 = "sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ=="; }; } { @@ -6846,7 +6846,7 @@ path = fetchurl { name = "jest_runner___jest_runner_26.6.3.tgz"; url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz"; - sha1 = "2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"; + sha512 = "atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ=="; }; } { @@ -6854,7 +6854,7 @@ path = fetchurl { name = "jest_runtime___jest_runtime_26.6.3.tgz"; url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz"; - sha1 = "4f64efbcfac398331b74b4b3c82d27d401b8fa2b"; + sha512 = "lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw=="; }; } { @@ -6862,7 +6862,7 @@ path = fetchurl { name = "jest_serializer___jest_serializer_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz"; - sha1 = "d139aafd46957d3a448f3a6cdabe2919ba0742d1"; + sha512 = "S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g=="; }; } { @@ -6870,7 +6870,7 @@ path = fetchurl { name = "jest_serializer___jest_serializer_27.0.1.tgz"; url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz"; - sha1 = "2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020"; + sha512 = "svy//5IH6bfQvAbkAEg1s7xhhgHTtXu0li0I2fdKHDsLP2P2MOiscPQIENQep8oU2g2B3jqLyxKKzotZOz4CwQ=="; }; } { @@ -6878,7 +6878,7 @@ path = fetchurl { name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz"; - sha1 = "f3b0af1acb223316850bd14e1beea9837fb39c84"; + sha512 = "OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og=="; }; } { @@ -6886,7 +6886,7 @@ path = fetchurl { name = "jest_util___jest_util_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz"; - sha1 = "907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"; + sha512 = "MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q=="; }; } { @@ -6894,7 +6894,7 @@ path = fetchurl { name = "jest_util___jest_util_27.0.2.tgz"; url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; - sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; + sha512 = "1d9uH3a00OFGGWSibpNYr+jojZ6AckOMCXV2Z4K3YXDnzpkAaXQyIpY14FOJPiUmil7CD+A6Qs+lnnh6ctRbIA=="; }; } { @@ -6902,7 +6902,7 @@ path = fetchurl { name = "jest_validate___jest_validate_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz"; - sha1 = "23d380971587150467342911c3d7b4ac57ab20ec"; + sha512 = "NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ=="; }; } { @@ -6910,7 +6910,7 @@ path = fetchurl { name = "jest_watcher___jest_watcher_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz"; - sha1 = "a5b683b8f9d68dbcb1d7dae32172d2cca0592975"; + sha512 = "WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ=="; }; } { @@ -6918,7 +6918,7 @@ path = fetchurl { name = "jest_worker___jest_worker_26.5.0.tgz"; url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz"; - sha1 = "87deee86dbbc5f98d9919e0dadf2c40e3152fa30"; + sha512 = "kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug=="; }; } { @@ -6926,7 +6926,7 @@ path = fetchurl { name = "jest_worker___jest_worker_26.6.2.tgz"; url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; - sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"; + sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; } { @@ -6934,7 +6934,7 @@ path = fetchurl { name = "jest_worker___jest_worker_27.0.2.tgz"; url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; - sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; + sha512 = "EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg=="; }; } { @@ -6942,7 +6942,7 @@ path = fetchurl { name = "jest___jest_26.6.3.tgz"; url = "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz"; - sha1 = "40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"; + sha512 = "lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q=="; }; } { @@ -6950,7 +6950,7 @@ path = fetchurl { name = "js_base64___js_base64_2.6.4.tgz"; url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz"; - sha1 = "f4e686c5de1ea1f867dbcad3d46d969428df98c4"; + sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; } { @@ -6958,7 +6958,7 @@ path = fetchurl { name = "js_tokens___js_tokens_4.0.0.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; } { @@ -6966,7 +6966,7 @@ path = fetchurl { name = "js_yaml___js_yaml_3.14.1.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; - sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; } { @@ -6974,7 +6974,7 @@ path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } { @@ -6982,7 +6982,7 @@ path = fetchurl { name = "jsbn___jsbn_0.1.1.tgz"; url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + sha1 = "peZUwuWi3rXyAdls77yoDA7y9RM="; }; } { @@ -6990,7 +6990,7 @@ path = fetchurl { name = "jsdom___jsdom_16.4.0.tgz"; url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; - sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + sha512 = "lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w=="; }; } { @@ -6998,7 +6998,7 @@ path = fetchurl { name = "jsesc___jsesc_2.5.2.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; - sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; } { @@ -7006,7 +7006,7 @@ path = fetchurl { name = "jsesc___jsesc_0.5.0.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + sha1 = "597mbjXW/Bb3EP6R1c9p9w8IkR0="; }; } { @@ -7014,7 +7014,7 @@ 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"; - sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; } { @@ -7022,7 +7022,7 @@ 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"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -7030,7 +7030,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; } { @@ -7038,7 +7038,7 @@ path = fetchurl { name = "json_schema___json_schema_0.2.3.tgz"; url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + sha1 = "tIDIkuWaLwWVTOcnvT8qTogvnhM="; }; } { @@ -7046,7 +7046,7 @@ 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 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; }; } { @@ -7054,7 +7054,7 @@ path = fetchurl { name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + sha1 = "mnWdOcXy/1A/1TAGRu1EX4jE+a8="; }; } { @@ -7062,7 +7062,7 @@ 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 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; }; } { @@ -7070,7 +7070,7 @@ path = fetchurl { name = "json3___json3_3.3.3.tgz"; url = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz"; - sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; }; } { @@ -7078,7 +7078,7 @@ path = fetchurl { name = "json5___json5_0.5.1.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + sha1 = "Hq3nrMASA0rYTiOWdn6tn6VJWCE="; }; } { @@ -7086,7 +7086,7 @@ path = fetchurl { name = "json5___json5_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; } { @@ -7094,7 +7094,7 @@ path = fetchurl { name = "json5___json5_2.1.3.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; - sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; } { @@ -7102,7 +7102,7 @@ path = fetchurl { name = "jsonfile___jsonfile_3.0.1.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz"; - sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + sha1 = "pezG9l9T9mLEQVx2daAzHQmS7GY="; }; } { @@ -7110,7 +7110,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; }; } { @@ -7118,7 +7118,7 @@ path = fetchurl { name = "jsonify___jsonify_0.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + sha1 = "LHS27kHZPKUbe1qu6PUDYx0lKnM="; }; } { @@ -7126,7 +7126,7 @@ path = fetchurl { name = "jsonpointer___jsonpointer_4.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz"; - sha1 = "501fb89986a2389765ba09e6053299ceb4f2c2cc"; + sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; }; } { @@ -7134,7 +7134,7 @@ path = fetchurl { name = "jsprim___jsprim_1.4.1.tgz"; url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + sha1 = "MT5mvB5cwG5Di8G3SZwuXFastqI="; }; } { @@ -7142,7 +7142,7 @@ path = fetchurl { name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"; - sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891"; + sha512 = "d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA=="; }; } { @@ -7150,7 +7150,7 @@ path = fetchurl { name = "keycode___keycode_2.2.0.tgz"; url = "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz"; - sha1 = "3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"; + sha1 = "PQr1bce4uOXLqNCpfxByBO7CKwQ="; }; } { @@ -7158,7 +7158,7 @@ path = fetchurl { name = "killable___killable_1.0.1.tgz"; url = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz"; - sha1 = "4c8ce441187a061c7474fb87ca08e2a638194892"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; }; } { @@ -7166,7 +7166,7 @@ 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 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + sha1 = "MeohpzS6ubuw8yRm2JOupR5KPGQ="; }; } { @@ -7174,7 +7174,7 @@ 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 = "20813df3d712928b207378691a45066fae72dd57"; + sha1 = "IIE989cSkosgc3hpGkUGb65y3Vc="; }; } { @@ -7182,7 +7182,7 @@ path = fetchurl { name = "kind_of___kind_of_5.1.0.tgz"; url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; - sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; }; } { @@ -7190,7 +7190,7 @@ path = fetchurl { name = "kind_of___kind_of_6.0.3.tgz"; url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; - sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; } { @@ -7198,7 +7198,7 @@ path = fetchurl { name = "kleur___kleur_3.0.3.tgz"; url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; - sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; + sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; } { @@ -7206,7 +7206,7 @@ path = fetchurl { name = "klona___klona_2.0.4.tgz"; url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; - sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; }; } { @@ -7214,7 +7214,7 @@ path = fetchurl { name = "knot.js___knot.js_1.1.5.tgz"; url = "https://registry.yarnpkg.com/knot.js/-/knot.js-1.1.5.tgz"; - sha1 = "28e72522f703f50fe98812fde224dd72728fef5d"; + sha1 = "KOclIvcD9Q/piBL94iTdcnKP710="; }; } { @@ -7222,7 +7222,7 @@ path = fetchurl { name = "known_css_properties___known_css_properties_0.3.0.tgz"; url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz"; - sha1 = "a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"; + sha512 = "QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ=="; }; } { @@ -7230,7 +7230,7 @@ path = fetchurl { name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz"; - sha1 = "a00a37121894f224f763268e431c55556b0c0755"; + sha512 = "KPMwROklF4tEx283Xw0pNKtfTj1gZ4UByp4EsIFWLgBavJltF4TiYPc39k06zSTsLzxTVXXDSpbwaQXaFB4Qeg=="; }; } { @@ -7238,7 +7238,7 @@ path = fetchurl { name = "language_tags___language_tags_1.0.5.tgz"; url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz"; - sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a"; + sha1 = "0yHbxNowuovzAk4ED6XBRmH5GTo="; }; } { @@ -7246,7 +7246,7 @@ path = fetchurl { name = "leven___leven_3.1.0.tgz"; url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; - sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; }; } { @@ -7254,7 +7254,7 @@ path = fetchurl { name = "levn___levn_0.3.0.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; }; } { @@ -7262,7 +7262,7 @@ path = fetchurl { name = "levn___levn_0.4.1.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; } { @@ -7270,7 +7270,7 @@ path = fetchurl { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + sha1 = "HADHQ7QzzQpOgHWPe2SldEDZ/wA="; }; } { @@ -7278,7 +7278,7 @@ path = fetchurl { name = "load_json_file___load_json_file_4.0.0.tgz"; url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; - sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + sha1 = "L19Fq5HjMhYjT9U62rZo607AmTs="; }; } { @@ -7286,7 +7286,7 @@ path = fetchurl { name = "loader_runner___loader_runner_2.4.0.tgz"; url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; - sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; + sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; } { @@ -7294,7 +7294,7 @@ 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 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; + sha1 = "+G5jdNQyBabmxg6RlvF8Apm/s0g="; }; } { @@ -7302,7 +7302,7 @@ path = fetchurl { name = "loader_utils___loader_utils_1.4.0.tgz"; url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; - sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; }; } { @@ -7310,7 +7310,7 @@ path = fetchurl { name = "loader_utils___loader_utils_2.0.0.tgz"; url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; - sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; } { @@ -7318,7 +7318,7 @@ 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 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + sha1 = "K1aLJl7slExtnA3pw9u7ygNUzY4="; }; } { @@ -7326,7 +7326,7 @@ path = fetchurl { name = "locate_path___locate_path_3.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; - sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; } { @@ -7334,7 +7334,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -7342,7 +7342,7 @@ path = fetchurl { name = "lockfile___lockfile_1.0.4.tgz"; url = "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz"; - sha1 = "07f819d25ae48f87e538e6578b6964a4981a5609"; + sha512 = "cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA=="; }; } { @@ -7350,7 +7350,7 @@ path = fetchurl { name = "lodash.capitalize___lodash.capitalize_4.2.1.tgz"; url = "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz"; - sha1 = "f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"; + sha1 = "+CbJtOKoUR2E46yinbBeGk87cqk="; }; } { @@ -7358,7 +7358,7 @@ path = fetchurl { name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + sha1 = "4j8/nE+Pvd6HJSnBBxhXoIblzO8="; }; } { @@ -7366,7 +7366,7 @@ 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 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + sha1 = "gteb/zCmfEAF/9XiUVMArZyk168="; }; } { @@ -7374,7 +7374,7 @@ path = fetchurl { name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + sha1 = "0JF4cW/+pN3p5ft7N/bwgCJ0WAw="; }; } { @@ -7382,7 +7382,7 @@ path = fetchurl { name = "lodash.get___lodash.get_4.4.2.tgz"; url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + sha1 = "LRd/ZS+jHpObRDjVNBSZ36OCXpk="; }; } { @@ -7390,7 +7390,7 @@ path = fetchurl { name = "lodash.has___lodash.has_4.5.2.tgz"; url = "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz"; - sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + sha1 = "0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="; }; } { @@ -7398,7 +7398,7 @@ path = fetchurl { name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; url = "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + sha1 = "bC4XHbKiV82WgC/UOwGyDV9YcPY="; }; } { @@ -7406,7 +7406,7 @@ path = fetchurl { name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + sha1 = "QVxEePK8wwEgwizhDtMib30+GOA="; }; } { @@ -7414,7 +7414,7 @@ path = fetchurl { name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; url = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; - sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"; + sha1 = "PI+41bW/S/kK4G4U8qUwpO2TXh0="; }; } { @@ -7422,7 +7422,7 @@ 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 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36"; + sha1 = "hImxyw0p/4gZXM7KRI/21swpXDY="; }; } { @@ -7430,7 +7430,7 @@ 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 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + sha1 = "vMbEmkKihA7Zl/Mj6tpezRguC/4="; }; } { @@ -7438,7 +7438,7 @@ path = fetchurl { name = "lodash.merge___lodash.merge_4.6.2.tgz"; url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } { @@ -7446,7 +7446,7 @@ path = fetchurl { name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + sha1 = "7dFMgk4sycHgsKG0K7UhBRakJDg="; }; } { @@ -7454,7 +7454,7 @@ path = fetchurl { name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + sha1 = "WjUNoLERO4N+z//VgSy+WNbq4ZM="; }; } { @@ -7462,7 +7462,7 @@ 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 = "d0225373aeb652adc1bc82e4945339a842754773"; + sha1 = "0CJTc662Uq3BvILklFM5qEJ1R3M="; }; } { @@ -7470,7 +7470,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -7478,7 +7478,7 @@ path = fetchurl { name = "loglevel___loglevel_1.7.0.tgz"; url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; - sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; + sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="; }; } { @@ -7486,7 +7486,7 @@ path = fetchurl { name = "loose_envify___loose_envify_1.4.0.tgz"; url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; } { @@ -7494,7 +7494,7 @@ path = fetchurl { name = "lru_cache___lru_cache_5.1.1.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; - sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; } { @@ -7502,7 +7502,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -7510,7 +7510,7 @@ path = fetchurl { name = "lz_string___lz_string_1.4.4.tgz"; url = "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz"; - sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; + sha1 = "wNjq82BZ9wV5bh40SBHPTEmNOiY="; }; } { @@ -7518,7 +7518,7 @@ path = fetchurl { name = "make_dir___make_dir_2.1.0.tgz"; url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; - sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; } { @@ -7526,7 +7526,7 @@ path = fetchurl { name = "make_dir___make_dir_3.1.0.tgz"; url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } { @@ -7534,7 +7534,7 @@ path = fetchurl { name = "makeerror___makeerror_1.0.11.tgz"; url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; - sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + sha1 = "4BpckQnyr3lmDk6LlYd5AYT1qWw="; }; } { @@ -7542,7 +7542,7 @@ 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 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + sha1 = "wyq9C9ZSXZsFFkW7TyasXcmKDb8="; }; } { @@ -7550,7 +7550,7 @@ 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 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + sha1 = "7Nyo8TFE5mDxtb1B8S80edmN+48="; }; } { @@ -7558,7 +7558,7 @@ path = fetchurl { name = "mark_loader___mark_loader_0.1.6.tgz"; url = "https://registry.yarnpkg.com/mark-loader/-/mark-loader-0.1.6.tgz"; - sha1 = "0abb477dca7421d70e20128ff6489f5cae8676d5"; + sha1 = "CrtHfcp0IdcOIBKP9kifXK6GdtU="; }; } { @@ -7566,7 +7566,7 @@ path = fetchurl { name = "marky___marky_1.2.2.tgz"; url = "https://registry.yarnpkg.com/marky/-/marky-1.2.2.tgz"; - sha1 = "4456765b4de307a13d263a69b0c79bf226e68323"; + sha512 = "k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ=="; }; } { @@ -7574,7 +7574,7 @@ path = fetchurl { name = "md5.js___md5.js_1.3.5.tgz"; url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; - sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; } { @@ -7582,7 +7582,7 @@ path = fetchurl { name = "mdn_data___mdn_data_2.0.4.tgz"; url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; - sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; } { @@ -7590,7 +7590,7 @@ path = fetchurl { name = "mdn_data___mdn_data_2.0.6.tgz"; url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; - sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; + sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; }; } { @@ -7598,7 +7598,7 @@ 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 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; }; } { @@ -7606,7 +7606,7 @@ path = fetchurl { name = "memoize_one___memoize_one_5.1.1.tgz"; url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; - sha1 = "047b6e3199b508eaec03504de71229b8eb1d75c0"; + sha512 = "HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="; }; } { @@ -7614,7 +7614,7 @@ 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 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + sha1 = "OpoguEYlI+RHz7x+i7gO1me/xVI="; }; } { @@ -7622,7 +7622,7 @@ path = fetchurl { name = "memory_fs___memory_fs_0.5.0.tgz"; url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; - sha1 = "324c01288b88652966d161db77838720845a8e3c"; + sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA=="; }; } { @@ -7630,7 +7630,7 @@ 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 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha1 = "sAqqVW3YtEVoFQ7J0blT8/kMu2E="; }; } { @@ -7638,7 +7638,7 @@ path = fetchurl { name = "merge_stream___merge_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; } { @@ -7646,7 +7646,7 @@ path = fetchurl { name = "merge___merge_1.2.1.tgz"; url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; - sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145"; + sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; }; } { @@ -7654,7 +7654,7 @@ path = fetchurl { name = "methods___methods_1.1.2.tgz"; url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha1 = "VSmk1nZUE07cxSZmVoNbD4Ua/O4="; }; } { @@ -7662,7 +7662,7 @@ path = fetchurl { name = "micromatch___micromatch_3.1.10.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; - sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; } { @@ -7670,7 +7670,7 @@ path = fetchurl { name = "micromatch___micromatch_4.0.2.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; } { @@ -7678,7 +7678,7 @@ path = fetchurl { name = "micromatch___micromatch_4.0.4.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; } { @@ -7686,7 +7686,7 @@ path = fetchurl { name = "miller_rabin___miller_rabin_4.0.1.tgz"; url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha1 = "f080351c865b0dc562a8462966daa53543c78a4d"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; }; } { @@ -7694,7 +7694,7 @@ path = fetchurl { name = "mime_db___mime_db_1.44.0.tgz"; url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; } { @@ -7702,7 +7702,7 @@ path = fetchurl { name = "mime_types___mime_types_2.1.27.tgz"; url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; } { @@ -7710,7 +7710,7 @@ path = fetchurl { name = "mime___mime_1.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; - sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; } { @@ -7718,7 +7718,7 @@ path = fetchurl { name = "mime___mime_2.4.7.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz"; - sha1 = "962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"; + sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; }; } { @@ -7726,7 +7726,7 @@ path = fetchurl { name = "mime___mime_2.4.4.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; }; } { @@ -7734,7 +7734,7 @@ path = fetchurl { name = "mimic_fn___mimic_fn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; } { @@ -7742,7 +7742,7 @@ path = fetchurl { name = "min_indent___min_indent_1.0.1.tgz"; url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; - sha1 = "a63f681673b30571fbe8bc25686ae746eefa9869"; + sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; } { @@ -7750,7 +7750,7 @@ path = fetchurl { name = "mini_css_extract_plugin___mini_css_extract_plugin_1.6.0.tgz"; url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz"; - sha1 = "b4db2525af2624899ed64a23b0016e0036411893"; + sha512 = "nPFKI7NSy6uONUo9yn2hIfb9vyYvkFu95qki0e21DQ9uaqNKDP15DGpK0KnV6wDroWxPHtExrdEwx/yDQ8nVRw=="; }; } { @@ -7758,7 +7758,7 @@ path = fetchurl { name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; } { @@ -7766,7 +7766,7 @@ 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 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; }; } { @@ -7774,7 +7774,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -7782,7 +7782,7 @@ path = fetchurl { name = "minimist___minimist_1.1.3.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz"; - sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; + sha1 = "O+39kaktOQFvz6ocaB6Pqhoe/ag="; }; } { @@ -7790,7 +7790,7 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; } { @@ -7798,7 +7798,7 @@ path = fetchurl { name = "minipass_collect___minipass_collect_1.0.2.tgz"; url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; } { @@ -7806,7 +7806,7 @@ path = fetchurl { name = "minipass_flush___minipass_flush_1.0.5.tgz"; url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; - sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; }; } { @@ -7814,7 +7814,7 @@ path = fetchurl { name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; - sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; }; } { @@ -7822,7 +7822,7 @@ path = fetchurl { name = "minipass___minipass_3.1.3.tgz"; url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; - sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; }; } { @@ -7830,7 +7830,7 @@ path = fetchurl { name = "minizlib___minizlib_2.1.2.tgz"; url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; - sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; } { @@ -7838,7 +7838,7 @@ path = fetchurl { name = "mississippi___mississippi_3.0.0.tgz"; url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; - sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; + sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; }; } { @@ -7846,7 +7846,7 @@ path = fetchurl { name = "mixin_deep___mixin_deep_1.3.2.tgz"; url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; } { @@ -7854,7 +7854,7 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.5.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; } { @@ -7862,7 +7862,7 @@ path = fetchurl { name = "mkdirp___mkdirp_1.0.4.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; - sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; } { @@ -7870,7 +7870,7 @@ path = fetchurl { name = "mousetrap___mousetrap_1.6.5.tgz"; url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz"; - sha1 = "8a766d8c272b08393d5f56074e0b5ec183485bf9"; + sha512 = "QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA=="; }; } { @@ -7878,7 +7878,7 @@ 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 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + sha1 = "viwAX9oy4LKa8fBdfEszIUxwH5I="; }; } { @@ -7886,7 +7886,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -7894,7 +7894,7 @@ path = fetchurl { name = "ms___ms_2.1.1.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; } { @@ -7902,7 +7902,7 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; } { @@ -7910,7 +7910,7 @@ 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 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + sha1 = "iZ8R2WhuXgXLkbNdXw5jt3PPyQE="; }; } { @@ -7918,7 +7918,7 @@ path = fetchurl { name = "multicast_dns___multicast_dns_6.2.3.tgz"; url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; } { @@ -7926,7 +7926,7 @@ path = fetchurl { name = "mute_stream___mute_stream_0.0.5.tgz"; url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz"; - sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + sha1 = "j7+rsKmKJT0xhDMfno3rc3L6xsA="; }; } { @@ -7934,7 +7934,7 @@ path = fetchurl { name = "nan___nan_2.14.1.tgz"; url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; - sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; + sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; } { @@ -7942,7 +7942,7 @@ path = fetchurl { name = "nanoid___nanoid_3.1.23.tgz"; url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; - sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; + sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; } { @@ -7950,7 +7950,7 @@ path = fetchurl { name = "nanomatch___nanomatch_1.2.13.tgz"; url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; - sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; } { @@ -7958,7 +7958,7 @@ 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 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; }; } { @@ -7966,7 +7966,7 @@ path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; - sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; } { @@ -7974,7 +7974,7 @@ path = fetchurl { name = "neo_async___neo_async_2.6.2.tgz"; url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; - sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; } { @@ -7982,7 +7982,7 @@ path = fetchurl { name = "next_tick___next_tick_1.0.0.tgz"; url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + sha1 = "yobR/ogoFpsBICCOPchCS524NCw="; }; } { @@ -7990,7 +7990,7 @@ path = fetchurl { name = "nice_try___nice_try_1.0.5.tgz"; url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; } { @@ -7998,7 +7998,7 @@ path = fetchurl { name = "node_fetch___node_fetch_2.6.1.tgz"; url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; } { @@ -8006,7 +8006,7 @@ path = fetchurl { name = "node_forge___node_forge_0.10.0.tgz"; url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; - sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; + sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; } { @@ -8014,7 +8014,7 @@ path = fetchurl { name = "node_gyp_build___node_gyp_build_4.2.3.tgz"; url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; - sha1 = "ce6277f853835f718829efb47db20f3e4d9c4739"; + sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; } { @@ -8022,7 +8022,7 @@ path = fetchurl { name = "node_int64___node_int64_0.4.0.tgz"; url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + sha1 = "h6kGXNs1XTGC2PlM4RGIuCXGijs="; }; } { @@ -8030,7 +8030,7 @@ 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"; - sha1 = "b64f513d18338625f90346d27b0d235e631f6425"; + sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; } { @@ -8038,7 +8038,7 @@ path = fetchurl { name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; - sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; + sha1 = "jZ2+KJZKSsVxLpExZCEHxx6Q7EA="; }; } { @@ -8046,7 +8046,7 @@ path = fetchurl { name = "node_notifier___node_notifier_8.0.1.tgz"; url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz"; - sha1 = "f86e89bbc925f2b068784b31f382afdc6ca56be1"; + sha512 = "BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA=="; }; } { @@ -8054,7 +8054,7 @@ path = fetchurl { name = "node_releases___node_releases_1.1.72.tgz"; url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz"; - sha1 = "14802ab6b1039a79a0c7d662b610a5bbd76eacbe"; + sha512 = "LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="; }; } { @@ -8062,7 +8062,7 @@ 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"; - sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; } { @@ -8070,7 +8070,7 @@ 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 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + sha1 = "GrKLVW4Zg2Oowab35vogE3/mrtk="; }; } { @@ -8078,7 +8078,7 @@ path = fetchurl { name = "normalize_path___normalize_path_3.0.0.tgz"; url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; } { @@ -8086,7 +8086,7 @@ 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 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + sha1 = "LRDAa9/TEuqXd2laTShDlFa3WUI="; }; } { @@ -8094,7 +8094,7 @@ path = fetchurl { name = "normalize_url___normalize_url_3.3.0.tgz"; url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz"; - sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559"; + sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; } { @@ -8102,7 +8102,7 @@ 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 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; }; } { @@ -8110,7 +8110,7 @@ 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"; - sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; } { @@ -8118,7 +8118,7 @@ path = fetchurl { name = "npmlog___npmlog_4.1.2.tgz"; url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; } { @@ -8126,7 +8126,7 @@ path = fetchurl { name = "nth_check___nth_check_1.0.2.tgz"; url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; - sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; } { @@ -8134,7 +8134,7 @@ path = fetchurl { name = "num2fraction___num2fraction_1.2.2.tgz"; url = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz"; - sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + sha1 = "b2gragJ6Tp3fpFZM0lidHU5mnt4="; }; } { @@ -8142,7 +8142,7 @@ path = fetchurl { name = "number_is_nan___number_is_nan_1.0.1.tgz"; url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; }; } { @@ -8150,7 +8150,7 @@ path = fetchurl { name = "nwsapi___nwsapi_2.2.0.tgz"; url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; - sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; + sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; }; } { @@ -8158,7 +8158,7 @@ path = fetchurl { name = "oauth_sign___oauth_sign_0.9.0.tgz"; url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; } { @@ -8166,7 +8166,7 @@ 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 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; }; } { @@ -8174,7 +8174,7 @@ 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 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + sha1 = "fn2Fi3gb18mRpBupde04EnVOmYw="; }; } { @@ -8182,7 +8182,7 @@ path = fetchurl { name = "object_fit_images___object_fit_images_3.2.4.tgz"; url = "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz"; - sha1 = "6c299d38fdf207746e5d2d46c2877f6f25d15b52"; + sha512 = "G+7LzpYfTfqUyrZlfrou/PLLLAPNC52FTy5y1CBywX+1/FkxIloOyQXBmZ3Zxa2AWO+lMF0JTuvqbr7G5e5CWg=="; }; } { @@ -8190,7 +8190,7 @@ path = fetchurl { name = "object_inspect___object_inspect_1.10.3.tgz"; url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; - sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369"; + sha512 = "e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="; }; } { @@ -8198,7 +8198,7 @@ path = fetchurl { name = "object_inspect___object_inspect_1.8.0.tgz"; url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; - sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; } { @@ -8206,7 +8206,7 @@ path = fetchurl { name = "object_inspect___object_inspect_1.9.0.tgz"; url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz"; - sha1 = "c90521d74e1127b67266ded3394ad6116986533a"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; } { @@ -8214,7 +8214,7 @@ path = fetchurl { name = "object_is___object_is_1.1.3.tgz"; url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; - sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; + sha512 = "teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg=="; }; } { @@ -8222,7 +8222,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -8230,7 +8230,7 @@ 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 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + sha1 = "95xEk68MU3e1n+OdOV5BBC3QRbs="; }; } { @@ -8238,7 +8238,7 @@ 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 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; + sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; }; } { @@ -8246,7 +8246,7 @@ path = fetchurl { name = "object.assign___object.assign_4.1.2.tgz"; url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; - sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; } { @@ -8254,7 +8254,7 @@ path = fetchurl { name = "object.entries___object.entries_1.1.4.tgz"; url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz"; - sha1 = "43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"; + sha512 = "h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA=="; }; } { @@ -8262,7 +8262,7 @@ path = fetchurl { name = "object.fromentries___object.fromentries_2.0.4.tgz"; url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz"; - sha1 = "26e1ba5c4571c5c6f0890cef4473066456a120b8"; + sha512 = "EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ=="; }; } { @@ -8270,7 +8270,7 @@ path = fetchurl { name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; }; } { @@ -8278,7 +8278,7 @@ 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 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + sha1 = "h6EKxMFpS9Lhy/U1kaZhQftd10c="; }; } { @@ -8286,7 +8286,7 @@ path = fetchurl { name = "object.values___object.values_1.1.4.tgz"; url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz"; - sha1 = "0d273762833e816b693a637d30073e7051535b30"; + sha512 = "TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg=="; }; } { @@ -8294,7 +8294,7 @@ path = fetchurl { name = "obuf___obuf_1.1.2.tgz"; url = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"; - sha1 = "09bea3343d41859ebd446292d11c9d4db619084e"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; }; } { @@ -8302,7 +8302,7 @@ path = fetchurl { name = "offline_plugin___offline_plugin_5.0.7.tgz"; url = "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.7.tgz"; - sha1 = "26936ad1a7699f4d67e0a095a258972a4ccf1788"; + sha512 = "ArMFt4QFjK0wg8B5+R/6tt65u6Dk+Pkx4PAcW5O7mgIF3ywMepaQqFOQgfZD4ybanuGwuJihxUwMRgkzd+YGYw=="; }; } { @@ -8310,7 +8310,7 @@ 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 = "20f1336481b083cd75337992a16971aa2d906947"; + sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; }; } { @@ -8318,7 +8318,7 @@ path = fetchurl { name = "on_headers___on_headers_1.0.2.tgz"; url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; - sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; } { @@ -8326,7 +8326,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -8334,7 +8334,7 @@ path = fetchurl { name = "onetime___onetime_1.1.0.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz"; - sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + sha1 = "ofeDj4MUxRbwXs78vEzP4EtO14k="; }; } { @@ -8342,7 +8342,7 @@ path = fetchurl { name = "onetime___onetime_5.1.2.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; } { @@ -8350,7 +8350,7 @@ path = fetchurl { name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; - sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + sha512 = "8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="; }; } { @@ -8358,7 +8358,7 @@ path = fetchurl { name = "opener___opener_1.5.2.tgz"; url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; - sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; + sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; } { @@ -8366,7 +8366,7 @@ path = fetchurl { name = "opn___opn_5.5.0.tgz"; url = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz"; - sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; }; } { @@ -8374,7 +8374,7 @@ path = fetchurl { name = "optionator___optionator_0.8.3.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; } { @@ -8382,7 +8382,7 @@ path = fetchurl { name = "optionator___optionator_0.9.1.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; } { @@ -8390,7 +8390,7 @@ path = fetchurl { name = "original___original_1.0.2.tgz"; url = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz"; - sha1 = "e442a61cffe1c5fd20a65f3261c26663b303f25f"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; }; } { @@ -8398,7 +8398,7 @@ 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 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + sha1 = "hUNzx/XCMVkU/Jv8a9gjj92h7Cc="; }; } { @@ -8406,7 +8406,7 @@ path = fetchurl { name = "os_homedir___os_homedir_1.0.2.tgz"; url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + sha1 = "/7xJiDNuDoM94MFox+8VISGqf7M="; }; } { @@ -8414,7 +8414,7 @@ path = fetchurl { name = "p_each_series___p_each_series_2.1.0.tgz"; url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz"; - sha1 = "961c8dd3f195ea96c747e636b262b800a6b1af48"; + sha512 = "ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ=="; }; } { @@ -8422,7 +8422,7 @@ 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 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; }; } { @@ -8430,7 +8430,7 @@ path = fetchurl { name = "p_limit___p_limit_1.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; - sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; } { @@ -8438,7 +8438,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -8446,7 +8446,7 @@ path = fetchurl { name = "p_limit___p_limit_3.0.2.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz"; - sha1 = "1664e010af3cadc681baafd3e2a437be7b0fb5fe"; + sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg=="; }; } { @@ -8454,7 +8454,7 @@ 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 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + sha1 = "IKAQOyIqcMj9OcwuWAaA893l7EM="; }; } { @@ -8462,7 +8462,7 @@ path = fetchurl { name = "p_locate___p_locate_3.0.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; - sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; } { @@ -8470,7 +8470,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -8478,7 +8478,7 @@ path = fetchurl { name = "p_map___p_map_2.1.0.tgz"; url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; - sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; } { @@ -8486,7 +8486,7 @@ path = fetchurl { name = "p_map___p_map_4.0.0.tgz"; url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; - sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; } { @@ -8494,7 +8494,7 @@ path = fetchurl { name = "p_retry___p_retry_3.0.1.tgz"; url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; - sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; }; } { @@ -8502,7 +8502,7 @@ 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 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + sha1 = "y8ec26+P1CKOE/Yh8rGiN8GyB7M="; }; } { @@ -8510,7 +8510,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -8518,7 +8518,7 @@ path = fetchurl { name = "packet_reader___packet_reader_1.0.0.tgz"; url = "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz"; - sha1 = "9238e5480dedabacfe1fe3f2771063f164157d74"; + sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; }; } { @@ -8526,7 +8526,7 @@ path = fetchurl { name = "pako___pako_1.0.11.tgz"; url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; - sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; } { @@ -8534,7 +8534,7 @@ path = fetchurl { name = "parallel_transform___parallel_transform_1.2.0.tgz"; url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; - sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; }; } { @@ -8542,7 +8542,7 @@ path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; } { @@ -8550,7 +8550,7 @@ path = fetchurl { name = "parse_asn1___parse_asn1_5.1.6.tgz"; url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; - sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; + sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; }; } { @@ -8558,7 +8558,7 @@ path = fetchurl { name = "parse_css_font___parse_css_font_2.0.2.tgz"; url = "https://registry.yarnpkg.com/parse-css-font/-/parse-css-font-2.0.2.tgz"; - sha1 = "7b60b060705a25a9b90b7f0ed493e5823248a652"; + sha1 = "e2CwYHBaJam5C38O1JPlgjJIplI="; }; } { @@ -8566,7 +8566,7 @@ 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 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + sha1 = "vjX1Qlvh9/bHRxhPmKeIy5lHfuA="; }; } { @@ -8574,7 +8574,7 @@ path = fetchurl { name = "parse_json___parse_json_5.0.1.tgz"; url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz"; - sha1 = "7cfe35c1ccd641bce3981467e6c2ece61b3b3878"; + sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; } { @@ -8582,7 +8582,7 @@ path = fetchurl { name = "parse_passwd___parse_passwd_1.0.0.tgz"; url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + sha1 = "bVuTSkVpk7I9N/QKOC1vFmao5cY="; }; } { @@ -8590,7 +8590,7 @@ path = fetchurl { name = "parse5___parse5_5.1.1.tgz"; url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; - sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; + sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; }; } { @@ -8598,7 +8598,7 @@ path = fetchurl { name = "parseurl___parseurl_1.3.3.tgz"; url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; - sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; } { @@ -8606,7 +8606,7 @@ path = fetchurl { name = "pascalcase___pascalcase_0.1.1.tgz"; url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + sha1 = "s2PlXoAGym/iF4TS2yK9FdeRfxQ="; }; } { @@ -8614,7 +8614,7 @@ path = fetchurl { name = "path_browserify___path_browserify_0.0.1.tgz"; url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; - sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; } { @@ -8622,7 +8622,7 @@ path = fetchurl { name = "path_complete_extname___path_complete_extname_1.0.0.tgz"; url = "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz"; - sha1 = "f889985dc91000c815515c0bfed06c5acda0752b"; + sha512 = "CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg=="; }; } { @@ -8630,7 +8630,7 @@ 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 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + sha1 = "zDPSTVJeCZpTiMAzbG4yuRYGCeA="; }; } { @@ -8638,7 +8638,7 @@ 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 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + sha1 = "zg6+ql94yxiSXqfYENe1mwEP1RU="; }; } { @@ -8646,7 +8646,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -8654,7 +8654,7 @@ 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 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -8662,7 +8662,7 @@ 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 = "365417dede44430d1c11af61027facf074bdfc53"; + sha1 = "NlQX3t5EQw0cEa9hAn+s8HS9/FM="; }; } { @@ -8670,7 +8670,7 @@ 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 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; }; } { @@ -8678,7 +8678,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -8686,7 +8686,7 @@ path = fetchurl { name = "path_parse___path_parse_1.0.6.tgz"; url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; } { @@ -8694,7 +8694,7 @@ 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 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha1 = "32BBeABfUi8V60SQ5yR6G/qmf4w="; }; } { @@ -8702,7 +8702,7 @@ path = fetchurl { name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + sha1 = "Wf3g9DW62suhA6hOnTvGTpa5k30="; }; } { @@ -8710,7 +8710,7 @@ path = fetchurl { name = "path_type___path_type_3.0.0.tgz"; url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; - sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; }; } { @@ -8718,7 +8718,7 @@ path = fetchurl { name = "path_type___path_type_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; } { @@ -8726,7 +8726,7 @@ path = fetchurl { name = "pbkdf2___pbkdf2_3.1.1.tgz"; url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; - sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; + sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; }; } { @@ -8734,7 +8734,7 @@ path = fetchurl { name = "performance_now___performance_now_0.2.0.tgz"; url = "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + sha1 = "M+8wxcd9TqIcWlOGnZG1bY8lVeU="; }; } { @@ -8742,7 +8742,7 @@ 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 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha1 = "Ywn04OX6kT7BxpMHrjZLSzd8nns="; }; } { @@ -8750,7 +8750,7 @@ path = fetchurl { name = "pg_connection_string___pg_connection_string_2.4.0.tgz"; url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; - sha1 = "c979922eb47832999a204da5dbe1ebf2341b6a10"; + sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; }; } { @@ -8758,7 +8758,7 @@ path = fetchurl { name = "pg_int8___pg_int8_1.0.1.tgz"; url = "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz"; - sha1 = "943bd463bf5b71b4170115f80f8efc9a0c0eb78c"; + sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; } { @@ -8766,7 +8766,7 @@ path = fetchurl { name = "pg_pool___pg_pool_3.2.2.tgz"; url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz"; - sha1 = "a560e433443ed4ad946b84d774b3f22452694dff"; + sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; }; } { @@ -8774,7 +8774,7 @@ path = fetchurl { name = "pg_protocol___pg_protocol_1.4.0.tgz"; url = "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz"; - sha1 = "43a71a92f6fe3ac559952555aa3335c8cb4908be"; + sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; }; } { @@ -8782,7 +8782,7 @@ path = fetchurl { name = "pg_types___pg_types_2.2.0.tgz"; url = "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz"; - sha1 = "2d0250d636454f7cfa3b6ae0382fdfa8063254a3"; + sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; }; } { @@ -8790,7 +8790,7 @@ path = fetchurl { name = "pg___pg_8.5.1.tgz"; url = "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz"; - sha1 = "34dcb15f6db4a29c702bf5031ef2e1e25a06a120"; + sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; }; } { @@ -8798,7 +8798,7 @@ path = fetchurl { name = "pgpass___pgpass_1.0.4.tgz"; url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz"; - sha1 = "85eb93a83800b20f8057a2b029bf05abaf94ea9c"; + sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; } { @@ -8806,7 +8806,7 @@ path = fetchurl { name = "picomatch___picomatch_2.2.2.tgz"; url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; } { @@ -8814,7 +8814,7 @@ path = fetchurl { name = "picomatch___picomatch_2.3.0.tgz"; url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; }; } { @@ -8822,7 +8822,7 @@ path = fetchurl { name = "pify___pify_2.3.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + sha1 = "7RQaasBDqEnqWISY59yosVMw6Qw="; }; } { @@ -8830,7 +8830,7 @@ path = fetchurl { name = "pify___pify_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; }; } { @@ -8838,7 +8838,7 @@ path = fetchurl { name = "pify___pify_4.0.1.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; - sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; }; } { @@ -8846,7 +8846,7 @@ 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 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + sha1 = "ITXW36ejWMBprJsXh3YogihFD/o="; }; } { @@ -8854,7 +8854,7 @@ path = fetchurl { name = "pinkie___pinkie_2.0.4.tgz"; url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + sha1 = "clVrgM+g1IqXToDnckjoDtT3+HA="; }; } { @@ -8862,7 +8862,7 @@ path = fetchurl { name = "pirates___pirates_4.0.1.tgz"; url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz"; - sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; + sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; }; } { @@ -8870,7 +8870,7 @@ 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 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + sha1 = "9tXREJ4Z1j7fQo4L1X4Sd3YVM0s="; }; } { @@ -8878,7 +8878,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; - sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; } { @@ -8886,7 +8886,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { @@ -8894,7 +8894,7 @@ path = fetchurl { name = "pkg_up___pkg_up_2.0.0.tgz"; url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + sha1 = "yBmscoBZpGHKscOImivjxJoATX8="; }; } { @@ -8902,7 +8902,7 @@ path = fetchurl { name = "pluralize___pluralize_1.2.1.tgz"; url = "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + sha1 = "0aIUg/0iu0HlihL6NCGCMUCJfEU="; }; } { @@ -8910,7 +8910,7 @@ path = fetchurl { name = "portfinder___portfinder_1.0.28.tgz"; url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; - sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; + sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; }; } { @@ -8918,7 +8918,7 @@ 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 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + sha1 = "AerA/jta9xoqbAL+q7jB/vfgDqs="; }; } { @@ -8926,7 +8926,7 @@ path = fetchurl { name = "postcss_calc___postcss_calc_7.0.4.tgz"; url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz"; - sha1 = "5e177ddb417341e6d4a193c5d9fd8ada79094f8b"; + sha512 = "0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw=="; }; } { @@ -8934,7 +8934,7 @@ path = fetchurl { name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; - sha1 = "ae060bce93ed794ac71264f08132d550956bd381"; + sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; } { @@ -8942,7 +8942,7 @@ 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"; - sha1 = "ca3813ed4da0f812f9d43703584e449ebe189a7f"; + sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; }; } { @@ -8950,7 +8950,7 @@ 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"; - sha1 = "1fbabd2c246bff6aaad7997b2b0918f4d7af4033"; + sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; } { @@ -8958,7 +8958,7 @@ 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"; - sha1 = "3fe133cd3c82282e550fc9b239176a9207b784eb"; + sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; }; } { @@ -8966,7 +8966,7 @@ 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"; - sha1 = "c8c951e9f73ed9428019458444a02ad90bb9f765"; + sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; } { @@ -8974,7 +8974,7 @@ 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"; - sha1 = "652aef8a96726f029f5e3e00146ee7a4e755ff57"; + sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; }; } { @@ -8982,7 +8982,7 @@ 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"; - sha1 = "c5ea504f2c4aef33c7359a34de3573772ad7502a"; + sha512 = "/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw=="; }; } { @@ -8990,7 +8990,7 @@ path = fetchurl { name = "postcss_loader___postcss_loader_3.0.0.tgz"; url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz"; - sha1 = "6b97943e47c72d845fa9e03f273773d4e8dd6c2d"; + sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; }; } { @@ -8998,7 +8998,7 @@ 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"; - sha1 = "62f49a13e4a0ee04e7b98f42bb16062ca2549e24"; + sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; } { @@ -9006,7 +9006,7 @@ 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"; - sha1 = "362bea4ff5a1f98e4075a713c6cb25aefef9a650"; + sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; } { @@ -9014,7 +9014,7 @@ 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"; - sha1 = "cd4c344cce474343fac5d82206ab2cbcb8afd5a6"; + sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; }; } { @@ -9022,7 +9022,7 @@ 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"; - sha1 = "93b29c2ff5099c535eecda56c4aa6e665a663471"; + sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; } { @@ -9030,7 +9030,7 @@ 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"; - sha1 = "6b9cef030c11e35261f95f618c90036d680db874"; + sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; } { @@ -9038,7 +9038,7 @@ 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"; - sha1 = "e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"; + sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; } { @@ -9046,7 +9046,7 @@ 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"; - sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; }; } { @@ -9054,7 +9054,7 @@ 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"; - sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; }; } { @@ -9062,7 +9062,7 @@ 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"; - sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; }; } { @@ -9070,7 +9070,7 @@ 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"; - sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; }; } { @@ -9078,7 +9078,7 @@ 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"; - sha1 = "8b35add3aee83a136b0471e0d59be58a50285dd4"; + sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; }; } { @@ -9086,7 +9086,7 @@ 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"; - sha1 = "0dbe04a4ce9063d4667ed2be476bb830c825935a"; + sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; }; } { @@ -9094,7 +9094,7 @@ 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"; - sha1 = "05f757f84f260437378368a91f8932d4b102917f"; + sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; }; } { @@ -9102,7 +9102,7 @@ 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"; - sha1 = "c4ebbc289f3991a028d44751cbdd11918b17910c"; + sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; }; } { @@ -9110,7 +9110,7 @@ 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"; - sha1 = "cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"; + sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; }; } { @@ -9118,7 +9118,7 @@ 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"; - sha1 = "8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"; + sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; }; } { @@ -9126,7 +9126,7 @@ 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"; - sha1 = "841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"; + sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; }; } { @@ -9134,7 +9134,7 @@ 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"; - sha1 = "10e437f86bc7c7e58f7b9652ed878daaa95faae1"; + sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; }; } { @@ -9142,7 +9142,7 @@ 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"; - sha1 = "bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"; + sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; } { @@ -9150,7 +9150,7 @@ path = fetchurl { name = "postcss_object_fit_images___postcss_object_fit_images_1.1.2.tgz"; url = "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz"; - sha1 = "8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"; + sha1 = "i3cwQ9sUZy72zW8ssfDYsmqfVzs="; }; } { @@ -9158,7 +9158,7 @@ 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"; - sha1 = "0cf75c820ec7d5c4d280189559e0b571ebac0eee"; + sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; } { @@ -9166,7 +9166,7 @@ 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"; - sha1 = "7fd42ebea5e9c814609639e2c2e84ae270ba48df"; + sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; } { @@ -9174,7 +9174,7 @@ 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"; - sha1 = "17efa405eacc6e07be3414a5ca2d1074681d4e29"; + sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; } { @@ -9182,7 +9182,7 @@ 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"; - sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; } { @@ -9190,7 +9190,7 @@ path = fetchurl { name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; + sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; } { @@ -9198,7 +9198,7 @@ path = fetchurl { name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; - sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; + sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw=="; }; } { @@ -9206,7 +9206,7 @@ path = fetchurl { name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; - sha1 = "343a2cdbac9505d416243d496f724f38894c941e"; + sha512 = "NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="; }; } { @@ -9214,7 +9214,7 @@ 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"; - sha1 = "9446911f3289bfd64c6d680f073c03b1f9ee4bac"; + sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; }; } { @@ -9222,7 +9222,7 @@ 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"; - sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; } { @@ -9230,7 +9230,7 @@ path = fetchurl { name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; } { @@ -9238,7 +9238,7 @@ path = fetchurl { name = "postcss___postcss_5.2.18.tgz"; url = "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz"; - sha1 = "badfa1497d46244f6390f58b319830d9107853c5"; + sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="; }; } { @@ -9246,7 +9246,7 @@ path = fetchurl { name = "postcss___postcss_7.0.32.tgz"; url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz"; - sha1 = "4310d6ee347053da3433db2be492883d62cec59d"; + sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; } { @@ -9254,7 +9254,7 @@ path = fetchurl { name = "postcss___postcss_8.3.0.tgz"; url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz"; - sha1 = "b1a713f6172ca427e3f05ef1303de8b65683325f"; + sha512 = "+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ=="; }; } { @@ -9262,7 +9262,7 @@ path = fetchurl { name = "postgres_array___postgres_array_2.0.0.tgz"; url = "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz"; - sha1 = "48f8fce054fbc69671999329b8834b772652d82e"; + sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; }; } { @@ -9270,7 +9270,7 @@ path = fetchurl { name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; url = "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + sha1 = "AntTPAqokOJtFy1Hz5zOzFIazTU="; }; } { @@ -9278,7 +9278,7 @@ path = fetchurl { name = "postgres_date___postgres_date_1.0.7.tgz"; url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz"; - sha1 = "51bc086006005e5061c591cee727f2531bf641a8"; + sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; }; } { @@ -9286,7 +9286,7 @@ path = fetchurl { name = "postgres_interval___postgres_interval_1.2.0.tgz"; url = "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha1 = "b460c82cb1587507788819a06aa0fffdb3544695"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; } { @@ -9294,7 +9294,7 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.2.1.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; } { @@ -9302,7 +9302,7 @@ 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 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; }; } { @@ -9310,7 +9310,7 @@ path = fetchurl { name = "pretty_format___pretty_format_25.5.0.tgz"; url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; - sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; + sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; }; } { @@ -9318,7 +9318,7 @@ path = fetchurl { name = "pretty_format___pretty_format_26.6.2.tgz"; url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz"; - sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93"; + sha512 = "7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="; }; } { @@ -9326,7 +9326,7 @@ 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"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -9334,7 +9334,7 @@ path = fetchurl { name = "process___process_0.11.10.tgz"; url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + sha1 = "czIwDoQBYb2j5podHZGn1LwW8YI="; }; } { @@ -9342,7 +9342,7 @@ path = fetchurl { name = "progress___progress_1.1.8.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + sha1 = "4mDHj2Fhzdmw5WzD4Khd4Xx6V74="; }; } { @@ -9350,7 +9350,7 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { @@ -9358,7 +9358,7 @@ 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 = "98472870bf228132fcbdd868129bad12c3c029e3"; + sha1 = "mEcocL8igTL8vdhoEputEsPAKeM="; }; } { @@ -9366,7 +9366,7 @@ path = fetchurl { name = "promise.prototype.finally___promise.prototype.finally_3.1.2.tgz"; url = "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; - sha1 = "b8af89160c9c673cefe3b4c4435b53cfd0287067"; + sha512 = "A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA=="; }; } { @@ -9374,7 +9374,7 @@ path = fetchurl { name = "prompts___prompts_2.3.2.tgz"; url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; - sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; + sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA=="; }; } { @@ -9382,7 +9382,7 @@ path = fetchurl { name = "prop_types_extra___prop_types_extra_1.1.1.tgz"; url = "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz"; - sha1 = "58c3b74cbfbb95d304625975aa2f0848329a010b"; + sha512 = "59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew=="; }; } { @@ -9390,7 +9390,7 @@ path = fetchurl { name = "prop_types___prop_types_15.7.2.tgz"; url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; }; } { @@ -9398,7 +9398,7 @@ path = fetchurl { name = "proxy_addr___proxy_addr_2.0.6.tgz"; url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; } { @@ -9406,7 +9406,7 @@ path = fetchurl { name = "prr___prr_1.0.1.tgz"; url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; - sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + sha1 = "0/wRS6BplaRexok/SEzrHXj19HY="; }; } { @@ -9414,7 +9414,7 @@ path = fetchurl { name = "psl___psl_1.8.0.tgz"; url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; - sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; } { @@ -9422,7 +9422,7 @@ path = fetchurl { name = "public_encrypt___public_encrypt_4.0.3.tgz"; url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha1 = "4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; } { @@ -9430,7 +9430,7 @@ path = fetchurl { name = "pump___pump_2.0.1.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; - sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; } { @@ -9438,7 +9438,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -9446,7 +9446,7 @@ path = fetchurl { name = "pumpify___pumpify_1.5.1.tgz"; url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; - sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; } { @@ -9454,7 +9454,7 @@ path = fetchurl { name = "punycode___punycode_1.3.2.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + sha1 = "llOgNvt8HuQjQvIyXM7v6jkmxI0="; }; } { @@ -9462,7 +9462,7 @@ path = fetchurl { name = "punycode___punycode_1.4.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + sha1 = "wNWmOycYgArY4esPpSachN1BhF4="; }; } { @@ -9470,7 +9470,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -9478,7 +9478,7 @@ path = fetchurl { name = "q___q_1.5.1.tgz"; url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + sha1 = "fjL3W0E4EpHQRhHxvxQQmsAGUdc="; }; } { @@ -9486,7 +9486,7 @@ path = fetchurl { name = "qs___qs_6.7.0.tgz"; url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; - sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; } { @@ -9494,7 +9494,7 @@ path = fetchurl { name = "qs___qs_6.5.2.tgz"; url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; } { @@ -9502,7 +9502,7 @@ 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 = "9ec61f79049875707d69414596fd907a4d711e73"; + sha1 = "nsYfeQSYdXB9aUFFlv2Qek1xHnM="; }; } { @@ -9510,7 +9510,7 @@ path = fetchurl { name = "querystring___querystring_0.2.0.tgz"; url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; + sha1 = "sgmEkgO7Jd+CDadW50cAWHhSFiA="; }; } { @@ -9518,7 +9518,7 @@ path = fetchurl { name = "querystringify___querystringify_2.2.0.tgz"; url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; - sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; }; } { @@ -9526,7 +9526,7 @@ path = fetchurl { name = "quote___quote_0.4.0.tgz"; url = "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz"; - sha1 = "10839217f6c1362b89194044d29b233fd7f32f01"; + sha1 = "EIOSF/bBNiuJGUBE0psjP9fzLwE="; }; } { @@ -9534,7 +9534,7 @@ path = fetchurl { name = "raf___raf_3.4.1.tgz"; url = "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz"; - sha1 = "0742e99a4a6552f445d73e3ee0328af0ff1ede39"; + sha512 = "Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA=="; }; } { @@ -9542,7 +9542,7 @@ path = fetchurl { name = "randombytes___randombytes_2.1.0.tgz"; url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; - sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; } { @@ -9550,7 +9550,7 @@ path = fetchurl { name = "randomfill___randomfill_1.0.4.tgz"; url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; - sha1 = "c92196fc86ab42be983f1bf31778224931d61458"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; }; } { @@ -9558,7 +9558,7 @@ path = fetchurl { name = "range_parser___range_parser_1.2.1.tgz"; url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; - sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; } { @@ -9566,7 +9566,7 @@ path = fetchurl { name = "raw_body___raw_body_2.4.0.tgz"; url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; - sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; } { @@ -9574,7 +9574,7 @@ path = fetchurl { name = "react_dom___react_dom_16.14.0.tgz"; url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; - sha1 = "7ad838ec29a777fb3c75c3a190f661cf92ab8b89"; + sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; } { @@ -9582,7 +9582,7 @@ path = fetchurl { name = "react_event_listener___react_event_listener_0.6.6.tgz"; url = "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.6.tgz"; - sha1 = "758f7b991cad9086dd39fd29fad72127e1d8962a"; + sha512 = "+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw=="; }; } { @@ -9590,7 +9590,7 @@ path = fetchurl { name = "react_hotkeys___react_hotkeys_1.1.4.tgz"; url = "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-1.1.4.tgz"; - sha1 = "a0712aa2e0c03a759fd7885808598497a4dace72"; + sha1 = "oHEqouDAOnWf14hYCFmEl6TaznI="; }; } { @@ -9598,7 +9598,7 @@ path = fetchurl { name = "react_immutable_proptypes___react_immutable_proptypes_2.2.0.tgz"; url = "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz"; - sha1 = "cce96d68cc3c18e89617cbf3092d08e35126af4a"; + sha512 = "Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ=="; }; } { @@ -9606,7 +9606,7 @@ path = fetchurl { name = "react_immutable_pure_component___react_immutable_pure_component_2.2.2.tgz"; url = "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz"; - sha1 = "3014d3e20cd5a7a4db73b81f1f1464f4d351684b"; + sha512 = "vkgoMJUDqHZfXXnjVlG3keCxSO/U6WeDQ5/Sl0GK2cH8TOxEzQ5jXqDXHEL/jqk6fsNxV05oH5kD7VNMUE2k+A=="; }; } { @@ -9614,7 +9614,7 @@ path = fetchurl { name = "react_infinite_scroller___react_infinite_scroller_1.2.4.tgz"; url = "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz"; - sha1 = "f67eaec4940a4ce6417bebdd6e3433bfc38826e9"; + sha512 = "/oOa0QhZjXPqaD6sictN2edFMsd3kkMiE19Vcz5JDgHpzEJVqYcmq+V3mkwO88087kvKGe1URNksHEOt839Ubw=="; }; } { @@ -9622,7 +9622,7 @@ path = fetchurl { name = "react_input_autosize___react_input_autosize_3.0.0.tgz"; url = "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz"; - sha1 = "6b5898c790d4478d69420b55441fcc31d5c50a85"; + sha512 = "nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg=="; }; } { @@ -9630,7 +9630,7 @@ path = fetchurl { name = "react_intl_translations_manager___react_intl_translations_manager_5.0.3.tgz"; url = "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz"; - sha1 = "aee010ecf35975673e033ca5d7d3f4147894324d"; + sha512 = "EfBeugnOGFcdUbQyY9TqBMbuauQ8wm73ZqFr0UqCljhbXl7YDHQcVzclWFRkVmlUffzxitLQFhAZEVVeRNQSwA=="; }; } { @@ -9638,7 +9638,7 @@ path = fetchurl { name = "react_intl___react_intl_2.9.0.tgz"; url = "https://registry.yarnpkg.com/react-intl/-/react-intl-2.9.0.tgz"; - sha1 = "c97c5d17d4718f1575fdbd5a769f96018a3b1843"; + sha512 = "27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA=="; }; } { @@ -9646,7 +9646,7 @@ path = fetchurl { name = "react_is___react_is_16.13.1.tgz"; url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; } { @@ -9654,7 +9654,7 @@ path = fetchurl { name = "react_is___react_is_17.0.1.tgz"; url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; - sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + sha512 = "NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA=="; }; } { @@ -9662,7 +9662,7 @@ path = fetchurl { name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; url = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; - sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362"; + sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; }; } { @@ -9670,7 +9670,7 @@ path = fetchurl { name = "react_masonry_infinite___react_masonry_infinite_1.2.2.tgz"; url = "https://registry.yarnpkg.com/react-masonry-infinite/-/react-masonry-infinite-1.2.2.tgz"; - sha1 = "20c1386f9ccdda9747527c8f42bc2c02dd2e7951"; + sha1 = "IME4b5zN2pdHUnyPQrwsAt0ueVE="; }; } { @@ -9678,7 +9678,7 @@ path = fetchurl { name = "react_motion___react_motion_0.5.2.tgz"; url = "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz"; - sha1 = "0dd3a69e411316567927917c6626551ba0607316"; + sha512 = "9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ=="; }; } { @@ -9686,7 +9686,7 @@ path = fetchurl { name = "react_notification___react_notification_6.8.5.tgz"; url = "https://registry.yarnpkg.com/react-notification/-/react-notification-6.8.5.tgz"; - sha1 = "7ea90a633bb2a280d899e30c93cf372265cce4f0"; + sha512 = "3pJPhSsWNYizpyeMeWuC+jVthqE9WKqQ6rHq2naiiP4fLGN4irwL2Xp2Q8Qn7agW/e4BIDxarab6fJOUp1cKUw=="; }; } { @@ -9694,7 +9694,7 @@ path = fetchurl { name = "react_overlays___react_overlays_0.9.3.tgz"; url = "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.3.tgz"; - sha1 = "5bac8c1e9e7e057a125181dee2d784864dd62902"; + sha512 = "u2T7nOLnK+Hrntho4p0Nxh+BsJl0bl4Xuwj/Y0a56xywLMetgAfyjnDVrudLXsNcKGaspoC+t3C1V80W9QQTdQ=="; }; } { @@ -9702,7 +9702,7 @@ path = fetchurl { name = "react_redux_loading_bar___react_redux_loading_bar_4.0.8.tgz"; url = "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.0.8.tgz"; - sha1 = "e84d59d1517b79f53b0f39c8ddb40682af648c1b"; + sha512 = "BpR1tlYrYKFtGhxa7nAKc0dpcV33ZgXJ/jKNLpDDaxu2/cCxbkWQt9YlWT+VLw1x/7qyNYY4DH48bZdtmciSpg=="; }; } { @@ -9710,7 +9710,7 @@ path = fetchurl { name = "react_redux___react_redux_7.2.4.tgz"; url = "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz"; - sha1 = "1ebb474032b72d806de2e0519cd07761e222e225"; + sha512 = "hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA=="; }; } { @@ -9718,7 +9718,7 @@ path = fetchurl { name = "react_router_dom___react_router_dom_4.3.1.tgz"; url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz"; - sha1 = "4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"; + sha512 = "c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA=="; }; } { @@ -9726,7 +9726,7 @@ path = fetchurl { name = "react_router_scroll_4___react_router_scroll_4_1.0.0_beta.2.tgz"; url = "https://registry.yarnpkg.com/react-router-scroll-4/-/react-router-scroll-4-1.0.0-beta.2.tgz"; - sha1 = "d887063ec0f66124aaf450158dd158ff7d3dc279"; + sha512 = "K67Dnm75naSBs/WYc2CDNxqU+eE8iA3I0wSCArgGSHb0xR/7AUcgUEXtCxrQYVTogXvjVK60gmwYvOyRQ6fuBA=="; }; } { @@ -9734,7 +9734,7 @@ path = fetchurl { name = "react_router___react_router_4.3.1.tgz"; url = "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz"; - sha1 = "aada4aef14c809cb2e686b05cee4742234506c4e"; + sha512 = "yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg=="; }; } { @@ -9742,7 +9742,7 @@ path = fetchurl { name = "react_select___react_select_4.3.1.tgz"; url = "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz"; - sha1 = "389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"; + sha512 = "HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q=="; }; } { @@ -9750,7 +9750,7 @@ path = fetchurl { name = "react_sparklines___react_sparklines_1.7.0.tgz"; url = "https://registry.yarnpkg.com/react-sparklines/-/react-sparklines-1.7.0.tgz"; - sha1 = "9b1d97e8c8610095eeb2ad658d2e1fcf91f91a60"; + sha512 = "bJFt9K4c5Z0k44G8KtxIhbG+iyxrKjBZhdW6afP+R7EnIq+iKjbWbEFISrf3WKNFsda+C46XAfnX0StS5fbDcg=="; }; } { @@ -9758,7 +9758,7 @@ path = fetchurl { name = "react_swipeable_views_core___react_swipeable_views_core_0.14.0.tgz"; url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.14.0.tgz"; - sha1 = "6ac443a7cc7bc5ea022fbd549292bb5fff361cce"; + sha512 = "0W/e9uPweNEOSPjmYtuKSC/SvKKg1sfo+WtPdnxeLF3t2L82h7jjszuOHz9C23fzkvLfdgkaOmcbAxE9w2GEjA=="; }; } { @@ -9766,7 +9766,7 @@ path = fetchurl { name = "react_swipeable_views_utils___react_swipeable_views_utils_0.14.0.tgz"; url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.14.0.tgz"; - sha1 = "6b76e251906747482730c22002fe47ab1014ba32"; + sha512 = "W+fXBOsDqgFK1/g7MzRMVcDurp3LqO3ksC8UgInh2P/tKgb5DusuuB1geKHFc6o1wKl+4oyER4Zh3Lxmr8xbXA=="; }; } { @@ -9774,7 +9774,7 @@ path = fetchurl { name = "react_swipeable_views___react_swipeable_views_0.14.0.tgz"; url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.14.0.tgz"; - sha1 = "149c0df3d92220cc89e3f6d5c04a78dfe46f9b54"; + sha512 = "wrTT6bi2nC3JbmyNAsPXffUXLn0DVT9SbbcFr36gKpbaCgEp7rX/OFxsu5hPc/NBsUhHyoSRGvwqJNNrWTwCww=="; }; } { @@ -9782,7 +9782,7 @@ path = fetchurl { name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz"; - sha1 = "e98360087348e260c56d4fe2315e970480c228ae"; + sha512 = "L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg=="; }; } { @@ -9790,7 +9790,7 @@ path = fetchurl { name = "react_textarea_autosize___react_textarea_autosize_8.3.2.tgz"; url = "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz"; - sha1 = "4f9374d357b0a6f6469956726722549124a1b2db"; + sha512 = "JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q=="; }; } { @@ -9798,7 +9798,7 @@ path = fetchurl { name = "react_toggle___react_toggle_4.1.2.tgz"; url = "https://registry.yarnpkg.com/react-toggle/-/react-toggle-4.1.2.tgz"; - sha1 = "b00500832f925ad524356d909821821ae39f6c52"; + sha512 = "4Ohw31TuYQdhWfA6qlKafeXx3IOH7t4ZHhmRdwsm1fQREwOBGxJT+I22sgHqR/w8JRdk+AeMCJXPImEFSrNXow=="; }; } { @@ -9806,7 +9806,7 @@ path = fetchurl { name = "react_transition_group___react_transition_group_2.9.0.tgz"; url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz"; - sha1 = "df9cdb025796211151a436c69a8f3b97b5b07c8d"; + sha512 = "+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg=="; }; } { @@ -9814,7 +9814,7 @@ path = fetchurl { name = "react_transition_group___react_transition_group_4.3.0.tgz"; url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz"; - sha1 = "fea832e386cf8796c58b61874a3319704f5ce683"; + sha512 = "1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw=="; }; } { @@ -9822,7 +9822,7 @@ path = fetchurl { name = "react___react_16.14.0.tgz"; url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; - sha1 = "94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"; + sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; } { @@ -9830,7 +9830,7 @@ path = fetchurl { name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; - sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + sha1 = "PtSWaF26D4/hGNBpHcUfSh/5bwc="; }; } { @@ -9838,7 +9838,7 @@ path = fetchurl { name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; - sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; }; } { @@ -9846,7 +9846,7 @@ path = fetchurl { name = "read_pkg___read_pkg_3.0.0.tgz"; url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; - sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + sha1 = "nLxoaXj+5l0WwA4rGcI3/Pbjg4k="; }; } { @@ -9854,7 +9854,7 @@ path = fetchurl { name = "read_pkg___read_pkg_5.2.0.tgz"; url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; - sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; }; } { @@ -9862,7 +9862,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -9870,7 +9870,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -9878,7 +9878,7 @@ path = fetchurl { name = "readdirp___readdirp_2.2.1.tgz"; url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; - sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; } { @@ -9886,7 +9886,7 @@ path = fetchurl { name = "readdirp___readdirp_3.5.0.tgz"; url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; - sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; }; } { @@ -9894,7 +9894,7 @@ path = fetchurl { name = "readline2___readline2_1.0.1.tgz"; url = "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz"; - sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + sha1 = "QQWWCP/BVHV7cV2ZidGZ/783LjU="; }; } { @@ -9902,7 +9902,7 @@ path = fetchurl { name = "redent___redent_3.0.0.tgz"; url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; - sha1 = "e557b7998316bb53c9f1f56fa626352c6963059f"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; }; } { @@ -9910,7 +9910,7 @@ path = fetchurl { name = "redis_commands___redis_commands_1.7.0.tgz"; url = "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz"; - sha1 = "15a6fea2d58281e27b1cd1acfb4b293e278c3a89"; + sha512 = "nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="; }; } { @@ -9918,7 +9918,7 @@ path = fetchurl { name = "redis_errors___redis_errors_1.2.0.tgz"; url = "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz"; - sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + sha1 = "62LSrbFeTq9GEMBK/hUpOEJQq60="; }; } { @@ -9926,7 +9926,7 @@ path = fetchurl { name = "redis_parser___redis_parser_3.0.0.tgz"; url = "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz"; - sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; + sha1 = "tm2CjNyv5rS4pCin3vTGvKwxyLQ="; }; } { @@ -9934,7 +9934,7 @@ path = fetchurl { name = "redis___redis_3.1.2.tgz"; url = "https://registry.yarnpkg.com/redis/-/redis-3.1.2.tgz"; - sha1 = "766851117e80653d23e0ed536254677ab647638c"; + sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; } { @@ -9942,7 +9942,7 @@ path = fetchurl { name = "redux_immutable___redux_immutable_4.0.0.tgz"; url = "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-4.0.0.tgz"; - sha1 = "3a1a32df66366462b63691f0e1dc35e472bbc9f3"; + sha1 = "Ohoy32Y2ZGK2NpHw4dw15HK7yfM="; }; } { @@ -9950,7 +9950,7 @@ path = fetchurl { name = "redux_thunk___redux_thunk_2.3.0.tgz"; url = "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz"; - sha1 = "51c2c19a185ed5187aaa9a2d08b666d0d6467622"; + sha512 = "km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw=="; }; } { @@ -9958,7 +9958,7 @@ path = fetchurl { name = "redux___redux_4.1.0.tgz"; url = "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz"; - sha1 = "eb049679f2f523c379f1aff345c8612f294c88d4"; + sha512 = "uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g=="; }; } { @@ -9966,7 +9966,7 @@ path = fetchurl { name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; } { @@ -9974,7 +9974,7 @@ path = fetchurl { name = "regenerate___regenerate_1.4.1.tgz"; url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; - sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; + sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; }; } { @@ -9982,7 +9982,7 @@ path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; } { @@ -9990,7 +9990,7 @@ path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.12.1.tgz"; url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz"; - sha1 = "fa1a71544764c036f8c49b13a08b2594c9f8a0de"; + sha512 = "odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="; }; } { @@ -9998,7 +9998,7 @@ path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; }; } { @@ -10006,7 +10006,7 @@ path = fetchurl { name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; + sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; }; } { @@ -10014,7 +10014,7 @@ path = fetchurl { name = "regex_not___regex_not_1.0.2.tgz"; url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; - sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; } { @@ -10022,7 +10022,7 @@ path = fetchurl { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; }; } { @@ -10030,7 +10030,7 @@ path = fetchurl { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; - sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; }; } { @@ -10038,7 +10038,7 @@ path = fetchurl { name = "regexpp___regexpp_3.1.0.tgz"; url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; }; } { @@ -10046,7 +10046,7 @@ path = fetchurl { name = "regexpu_core___regexpu_core_4.7.1.tgz"; url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; - sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; } { @@ -10054,7 +10054,7 @@ path = fetchurl { name = "regjsgen___regjsgen_0.5.2.tgz"; url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; - sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; } { @@ -10062,7 +10062,7 @@ path = fetchurl { name = "regjsparser___regjsparser_0.6.4.tgz"; url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; - sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; + sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; }; } { @@ -10070,7 +10070,7 @@ path = fetchurl { name = "rellax___rellax_1.12.1.tgz"; url = "https://registry.yarnpkg.com/rellax/-/rellax-1.12.1.tgz"; - sha1 = "1b433ef7ac4aa3573449a33efab391c112f6b34d"; + sha512 = "XBIi0CDpW5FLTujYjYBn1CIbK2CJL6TsAg/w409KghP2LucjjzBjsujXDAjyBLWgsfupfUcL5WzdnIPcGfK7XA=="; }; } { @@ -10078,7 +10078,7 @@ 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 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + sha1 = "wkvOKig62tW8P1jg1IJJuSN52O8="; }; } { @@ -10086,7 +10086,7 @@ path = fetchurl { name = "repeat_element___repeat_element_1.1.3.tgz"; url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; } { @@ -10094,7 +10094,7 @@ 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 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + sha1 = "jcrkcOHIirwtYA//Sndihtp15jc="; }; } { @@ -10102,7 +10102,7 @@ path = fetchurl { name = "request_promise_core___request_promise_core_1.1.4.tgz"; url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; - sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; }; } { @@ -10110,7 +10110,7 @@ path = fetchurl { name = "request_promise_native___request_promise_native_1.0.9.tgz"; url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; - sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; + sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; } { @@ -10118,7 +10118,7 @@ path = fetchurl { name = "request___request_2.88.2.tgz"; url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; } { @@ -10126,7 +10126,7 @@ path = fetchurl { name = "requestidlecallback___requestidlecallback_0.3.0.tgz"; url = "https://registry.yarnpkg.com/requestidlecallback/-/requestidlecallback-0.3.0.tgz"; - sha1 = "6fb74e0733f90df3faa4838f9f6a2a5f9b742ac5"; + sha1 = "b7dOBzP5DfP6pIOPn2oqX5t0KsU="; }; } { @@ -10134,7 +10134,7 @@ 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 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -10142,7 +10142,7 @@ path = fetchurl { name = "require_from_string___require_from_string_2.0.2.tgz"; url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; - sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; } { @@ -10150,7 +10150,7 @@ 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"; - sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; } { @@ -10158,7 +10158,7 @@ path = fetchurl { name = "require_package_name___require_package_name_2.0.1.tgz"; url = "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz"; - sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"; + sha1 = "wR6XJ2tluOKSP3Xav1+y7ww4Qbk="; }; } { @@ -10166,7 +10166,7 @@ path = fetchurl { name = "require_uncached___require_uncached_1.0.3.tgz"; url = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz"; - sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; + sha1 = "Tg1W1slmL9MeQwEcS5WqSZVUIdM="; }; } { @@ -10174,7 +10174,7 @@ 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 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + sha1 = "kl0mAdOaxIXgkc8NpcbmlNw9yv8="; }; } { @@ -10182,7 +10182,7 @@ path = fetchurl { name = "reselect___reselect_4.0.0.tgz"; url = "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz"; - sha1 = "f2529830e5d3d0e021408b246a206ef4ea4437f7"; + sha512 = "qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="; }; } { @@ -10190,7 +10190,7 @@ 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 = "00a9f7387556e27038eae232caa372a6a59b665a"; + sha1 = "AKn3OHVW4nA46uIyyqNypqWbZlo="; }; } { @@ -10198,7 +10198,7 @@ path = fetchurl { name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; - sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; }; } { @@ -10206,7 +10206,7 @@ path = fetchurl { name = "resolve_dir___resolve_dir_1.0.1.tgz"; url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + sha1 = "eaQGRMNivoLybv/nOcm7U4IEb0M="; }; } { @@ -10214,7 +10214,7 @@ path = fetchurl { name = "resolve_from___resolve_from_1.0.1.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz"; - sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + sha1 = "Jsv+k10a7uq7Kbw/5a6wHpPUQiY="; }; } { @@ -10222,7 +10222,7 @@ 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 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + sha1 = "six699nWiBvItuZTM17rywoYh0g="; }; } { @@ -10230,7 +10230,7 @@ path = fetchurl { name = "resolve_from___resolve_from_4.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; } { @@ -10238,7 +10238,7 @@ path = fetchurl { name = "resolve_from___resolve_from_5.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; - sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; }; } { @@ -10246,7 +10246,7 @@ path = fetchurl { name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz"; - sha1 = "7e9ae21ed815fd63ab189adeee64dc831eefa879"; + sha512 = "bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="; }; } { @@ -10254,7 +10254,7 @@ path = fetchurl { name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; - sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; + sha512 = "C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="; }; } { @@ -10262,7 +10262,7 @@ 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 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + sha1 = "LGN/53yJOv0qZj/iGqkIAGjiBSo="; }; } { @@ -10270,7 +10270,7 @@ path = fetchurl { name = "resolve___resolve_1.20.0.tgz"; url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; }; } { @@ -10278,7 +10278,7 @@ path = fetchurl { name = "resolve___resolve_2.0.0_next.3.tgz"; url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; - sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; + sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; } { @@ -10286,7 +10286,7 @@ path = fetchurl { name = "restore_cursor___restore_cursor_1.0.1.tgz"; url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz"; - sha1 = "34661f46886327fed2991479152252df92daa541"; + sha1 = "NGYfRohjJ/7SmRR5FSJS35LapUE="; }; } { @@ -10294,7 +10294,7 @@ path = fetchurl { name = "ret___ret_0.1.15.tgz"; url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; - sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; } { @@ -10302,7 +10302,7 @@ path = fetchurl { name = "retry___retry_0.12.0.tgz"; url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + sha1 = "G0KmJmoh8HQh0bC1S33BZ7AcATs="; }; } { @@ -10310,7 +10310,7 @@ 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 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + sha1 = "wODWiC3w4jviVKR16O3UGRX+rrE="; }; } { @@ -10318,7 +10318,7 @@ 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 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + sha1 = "QzdOLiyglosO8VI0YLfXMP8i7rM="; }; } { @@ -10326,7 +10326,7 @@ path = fetchurl { name = "rimraf___rimraf_2.7.1.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; } { @@ -10334,7 +10334,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -10342,7 +10342,7 @@ path = fetchurl { name = "rimraf___rimraf_2.6.3.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; } { @@ -10350,7 +10350,7 @@ path = fetchurl { name = "ripemd160___ripemd160_2.0.2.tgz"; url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; - sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; } { @@ -10358,7 +10358,7 @@ path = fetchurl { name = "rsvp___rsvp_4.8.5.tgz"; url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz"; - sha1 = "c8f155311d167f68f21e168df71ec5b083113734"; + sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; } { @@ -10366,7 +10366,7 @@ path = fetchurl { name = "run_async___run_async_0.1.0.tgz"; url = "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz"; - sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + sha1 = "yK1KXhEGYeQCp9IbUw4AnyX444k="; }; } { @@ -10374,7 +10374,7 @@ 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 = "e848396f057d223f24386924618e25694161ec47"; + sha1 = "6Eg5bwV9Ij8kOGkkYY4laUFh7Ec="; }; } { @@ -10382,7 +10382,7 @@ path = fetchurl { name = "rx_lite___rx_lite_3.1.2.tgz"; url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz"; - sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + sha1 = "Gc5QLKVyZl87ZHsQk5+X/RYV8QI="; }; } { @@ -10390,7 +10390,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -10398,7 +10398,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.2.1.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { @@ -10406,7 +10406,7 @@ 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 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + sha1 = "QKNmnzsHfR6UPURinhV91IAjvy4="; }; } { @@ -10414,7 +10414,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -10422,7 +10422,7 @@ path = fetchurl { name = "sane___sane_4.1.0.tgz"; url = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz"; - sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded"; + sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; }; } { @@ -10430,7 +10430,7 @@ path = fetchurl { name = "sass_lint___sass_lint_1.13.1.tgz"; url = "https://registry.yarnpkg.com/sass-lint/-/sass-lint-1.13.1.tgz"; - sha1 = "5fd2b2792e9215272335eb0f0dc607f61e8acc8f"; + sha512 = "DSyah8/MyjzW2BWYmQWekYEKir44BpLqrCFsgs9iaWiVTcwZfwXHF586hh3D1n+/9ihUNMfd8iHAyb9KkGgs7Q=="; }; } { @@ -10438,7 +10438,7 @@ path = fetchurl { name = "sass_loader___sass_loader_10.2.0.tgz"; url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz"; - sha1 = "3d64c1590f911013b3fa48a0b22a83d5e1494716"; + sha512 = "kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="; }; } { @@ -10446,7 +10446,7 @@ path = fetchurl { name = "sass___sass_1.34.0.tgz"; url = "https://registry.yarnpkg.com/sass/-/sass-1.34.0.tgz"; - sha1 = "e46d5932d8b0ecc4feb846d861f26a578f7f7172"; + sha512 = "rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw=="; }; } { @@ -10454,7 +10454,7 @@ path = fetchurl { name = "sax___sax_1.2.4.tgz"; url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; } { @@ -10462,7 +10462,7 @@ path = fetchurl { name = "saxes___saxes_5.0.1.tgz"; url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; - sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; }; } { @@ -10470,7 +10470,7 @@ path = fetchurl { name = "scheduler___scheduler_0.19.1.tgz"; url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; - sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; + sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; }; } { @@ -10478,7 +10478,7 @@ path = fetchurl { name = "schema_utils___schema_utils_1.0.0.tgz"; url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; - sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; } { @@ -10486,7 +10486,7 @@ path = fetchurl { name = "schema_utils___schema_utils_2.7.1.tgz"; url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; - sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; } { @@ -10494,7 +10494,7 @@ path = fetchurl { name = "schema_utils___schema_utils_3.0.0.tgz"; url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; - sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; + sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; }; } { @@ -10502,7 +10502,7 @@ path = fetchurl { name = "scroll_behavior___scroll_behavior_0.9.12.tgz"; url = "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.12.tgz"; - sha1 = "1c22d273ec4ce6cd4714a443fead50227da9424c"; + sha512 = "18sirtyq1P/VsBX6O/vgw20Np+ngduFXEMO4/NDFXabdOKBL2kjPVUpz1y0+jm99EWwFJafxf5/tCyMeXt9Xyg=="; }; } { @@ -10510,7 +10510,7 @@ 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 = "625d8658f865af43ec962bfc376a37359a4994ca"; + sha1 = "Yl2GWPhlr0Psliv8N2o3NZpJlMo="; }; } { @@ -10518,7 +10518,7 @@ path = fetchurl { name = "selfsigned___selfsigned_1.10.8.tgz"; url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; - sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; + sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w=="; }; } { @@ -10526,7 +10526,7 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; } { @@ -10534,7 +10534,7 @@ path = fetchurl { name = "semver___semver_7.0.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; - sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -10542,7 +10542,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -10550,7 +10550,7 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { @@ -10558,7 +10558,7 @@ path = fetchurl { name = "send___send_0.17.1.tgz"; url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; - sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; } { @@ -10566,7 +10566,7 @@ path = fetchurl { name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; }; } { @@ -10574,7 +10574,7 @@ path = fetchurl { name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; } { @@ -10582,7 +10582,7 @@ 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 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + sha1 = "03aNabHn2C5c4FD/9bRTvqEqkjk="; }; } { @@ -10590,7 +10590,7 @@ path = fetchurl { name = "serve_static___serve_static_1.14.1.tgz"; url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; - sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; } { @@ -10598,7 +10598,7 @@ 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 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { @@ -10606,7 +10606,7 @@ path = fetchurl { name = "set_value___set_value_2.0.1.tgz"; url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; - sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; } { @@ -10614,7 +10614,7 @@ path = fetchurl { name = "setimmediate___setimmediate_1.0.5.tgz"; url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + sha1 = "KQy7Iy4waULX1+qbg3Mqt4VvgoU="; }; } { @@ -10622,7 +10622,7 @@ path = fetchurl { name = "setprototypeof___setprototypeof_1.1.0.tgz"; url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; } { @@ -10630,7 +10630,7 @@ path = fetchurl { name = "setprototypeof___setprototypeof_1.1.1.tgz"; url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; } { @@ -10638,7 +10638,7 @@ path = fetchurl { name = "sha.js___sha.js_2.4.11.tgz"; url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; - sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; } { @@ -10646,7 +10646,7 @@ path = fetchurl { name = "shallow_clone___shallow_clone_3.0.1.tgz"; url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; - sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; }; } { @@ -10654,7 +10654,7 @@ path = fetchurl { name = "shallow_equal___shallow_equal_1.2.1.tgz"; url = "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz"; - sha1 = "4c16abfa56043aa20d050324efa68940b0da79da"; + sha512 = "S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="; }; } { @@ -10662,7 +10662,7 @@ 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 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; }; } { @@ -10670,7 +10670,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -10678,7 +10678,7 @@ 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 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; }; } { @@ -10686,7 +10686,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { @@ -10694,7 +10694,7 @@ path = fetchurl { name = "shelljs___shelljs_0.6.1.tgz"; url = "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz"; - sha1 = "ec6211bed1920442088fe0f70b2837232ed2c8a8"; + sha1 = "7GIRvtGSBEIIj+D3Cyg3Iy7SyKg="; }; } { @@ -10702,7 +10702,7 @@ path = fetchurl { name = "shellwords___shellwords_0.1.1.tgz"; url = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz"; - sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b"; + sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="; }; } { @@ -10710,7 +10710,7 @@ path = fetchurl { name = "side_channel___side_channel_1.0.4.tgz"; url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; - sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; } { @@ -10718,7 +10718,7 @@ path = fetchurl { name = "signal_exit___signal_exit_3.0.3.tgz"; url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; - sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; } { @@ -10726,7 +10726,7 @@ 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 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + sha1 = "pNprY1/8zMoz9w0Xy5JZLeleVXo="; }; } { @@ -10734,7 +10734,7 @@ path = fetchurl { name = "sirv___sirv_1.0.10.tgz"; url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.10.tgz"; - sha1 = "3e591f5a9ae2520f50d5830f5fae38d97e7be194"; + sha512 = "H5EZCoZaggEUQy8ocKsF7WAToGuZhjJlLvM3XOef46CbdIgbNeQ1p32N1PCuCjkVYwrAVOSMacN6CXXgIzuspg=="; }; } { @@ -10742,7 +10742,7 @@ path = fetchurl { name = "sisteransi___sisteransi_1.0.5.tgz"; url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; - sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; + sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; }; } { @@ -10750,7 +10750,7 @@ path = fetchurl { name = "slash___slash_1.0.0.tgz"; url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + sha1 = "xB8vbDn8FtHNF61LXYlhFK5HDVU="; }; } { @@ -10758,7 +10758,7 @@ path = fetchurl { name = "slash___slash_3.0.0.tgz"; url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; } { @@ -10766,7 +10766,7 @@ path = fetchurl { name = "slice_ansi___slice_ansi_0.0.4.tgz"; url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + sha1 = "7b+JA/ZvfOL46v1s7tZeJkyDGzU="; }; } { @@ -10774,7 +10774,7 @@ path = fetchurl { name = "slice_ansi___slice_ansi_4.0.0.tgz"; url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; }; } { @@ -10782,7 +10782,7 @@ path = fetchurl { name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; }; } { @@ -10790,7 +10790,7 @@ path = fetchurl { name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; } { @@ -10798,7 +10798,7 @@ path = fetchurl { name = "snapdragon___snapdragon_0.8.2.tgz"; url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; - sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; }; } { @@ -10806,7 +10806,7 @@ path = fetchurl { name = "sockjs_client___sockjs_client_1.5.0.tgz"; url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz"; - sha1 = "2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add"; + sha512 = "8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q=="; }; } { @@ -10814,7 +10814,7 @@ path = fetchurl { name = "sockjs___sockjs_0.3.21.tgz"; url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz"; - sha1 = "b34ffb98e796930b60a0cfa11904d6a339a7d417"; + sha512 = "DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw=="; }; } { @@ -10822,7 +10822,7 @@ 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"; - sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; }; } { @@ -10830,7 +10830,7 @@ path = fetchurl { name = "source_map_js___source_map_js_0.6.2.tgz"; url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; - sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; }; } { @@ -10838,7 +10838,7 @@ 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"; - sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; } { @@ -10846,7 +10846,7 @@ path = fetchurl { name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz"; - sha1 = "3d9df87e236b53f16d01e58150fc7711138e5ed2"; + sha512 = "KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w=="; }; } { @@ -10854,7 +10854,7 @@ path = fetchurl { name = "source_map_support___source_map_support_0.5.19.tgz"; url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; } { @@ -10862,7 +10862,7 @@ path = fetchurl { name = "source_map_url___source_map_url_0.4.0.tgz"; url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + sha1 = "PpNdfd1zYxuXZZlW1VEo6HtQhKM="; }; } { @@ -10870,7 +10870,7 @@ path = fetchurl { name = "source_map___source_map_0.5.6.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + sha1 = "dc449SvwczxafwwRjYEzSiu19BI="; }; } { @@ -10878,7 +10878,7 @@ 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 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; }; } { @@ -10886,7 +10886,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -10894,7 +10894,7 @@ path = fetchurl { name = "source_map___source_map_0.7.3.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha1 = "5302f8169031735226544092e64981f751750383"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; } { @@ -10902,7 +10902,7 @@ path = fetchurl { name = "spdx_correct___spdx_correct_3.1.1.tgz"; url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; }; } { @@ -10910,7 +10910,7 @@ path = fetchurl { name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; } { @@ -10918,7 +10918,7 @@ 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"; - sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; } { @@ -10926,7 +10926,7 @@ path = fetchurl { name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; }; } { @@ -10934,7 +10934,7 @@ path = fetchurl { name = "spdy_transport___spdy_transport_3.0.0.tgz"; url = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; }; } { @@ -10942,7 +10942,7 @@ path = fetchurl { name = "spdy___spdy_4.0.2.tgz"; url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; - sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; + sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; }; } { @@ -10950,7 +10950,7 @@ path = fetchurl { name = "split_string___split_string_3.1.0.tgz"; url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; - sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; } { @@ -10958,7 +10958,7 @@ path = fetchurl { name = "split2___split2_3.2.2.tgz"; url = "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz"; - sha1 = "bf2cf2a37d838312c249c89206fd7a17dd12365f"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; } { @@ -10966,7 +10966,7 @@ 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 = "04e6926f662895354f3dd015203633b857297e2c"; + sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; }; } { @@ -10974,7 +10974,7 @@ path = fetchurl { name = "sshpk___sshpk_1.16.1.tgz"; url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; } { @@ -10982,7 +10982,7 @@ path = fetchurl { name = "ssri___ssri_6.0.2.tgz"; url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; - sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; + sha512 = "cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q=="; }; } { @@ -10990,7 +10990,7 @@ path = fetchurl { name = "ssri___ssri_8.0.0.tgz"; url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz"; - sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808"; + sha512 = "aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA=="; }; } { @@ -10998,7 +10998,7 @@ path = fetchurl { name = "stable___stable_0.1.8.tgz"; url = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz"; - sha1 = "836eb3c8382fe2936feaf544631017ce7d47a3cf"; + sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; }; } { @@ -11006,7 +11006,7 @@ path = fetchurl { name = "stack_generator___stack_generator_2.0.5.tgz"; url = "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz"; - sha1 = "fb00e5b4ee97de603e0773ea78ce944d81596c36"; + sha512 = "/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q=="; }; } { @@ -11014,7 +11014,7 @@ path = fetchurl { name = "stack_utils___stack_utils_2.0.2.tgz"; url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz"; - sha1 = "5cf48b4557becb4638d0bc4f21d23f5d19586593"; + sha512 = "0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg=="; }; } { @@ -11022,7 +11022,7 @@ path = fetchurl { name = "stackframe___stackframe_1.2.0.tgz"; url = "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz"; - sha1 = "52429492d63c62eb989804c11552e3d22e779303"; + sha512 = "GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="; }; } { @@ -11030,7 +11030,7 @@ path = fetchurl { name = "stacktrace_gps___stacktrace_gps_3.0.4.tgz"; url = "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz"; - sha1 = "7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"; + sha512 = "qIr8x41yZVSldqdqe6jciXEaSCKw1U8XTXpjDuy0ki/apyTn/r3w9hDAAQOhZdxvsC93H+WwwEu5cq5VemzYeg=="; }; } { @@ -11038,7 +11038,7 @@ path = fetchurl { name = "stacktrace_js___stacktrace_js_2.0.2.tgz"; url = "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz"; - sha1 = "4ca93ea9f494752d55709a081d400fdaebee897b"; + sha512 = "Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg=="; }; } { @@ -11046,7 +11046,7 @@ 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 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + sha1 = "YICcOcv/VTNyJv1eC1IPNB8ftcY="; }; } { @@ -11054,7 +11054,7 @@ path = fetchurl { name = "statuses___statuses_1.5.0.tgz"; url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; }; } { @@ -11062,7 +11062,7 @@ path = fetchurl { name = "stealthy_require___stealthy_require_1.1.1.tgz"; url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + sha1 = "NbCYdbT/SfJqd35QmzCQoyJr8ks="; }; } { @@ -11070,7 +11070,7 @@ path = fetchurl { name = "stream_browserify___stream_browserify_2.0.2.tgz"; url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; } { @@ -11078,7 +11078,7 @@ path = fetchurl { name = "stream_each___stream_each_1.2.3.tgz"; url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; - sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; } { @@ -11086,7 +11086,7 @@ path = fetchurl { name = "stream_http___stream_http_2.8.3.tgz"; url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz"; - sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; } { @@ -11094,7 +11094,7 @@ path = fetchurl { name = "stream_shift___stream_shift_1.0.1.tgz"; url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; - sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; } { @@ -11102,7 +11102,7 @@ path = fetchurl { name = "string_length___string_length_4.0.1.tgz"; url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; - sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; + sha512 = "PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw=="; }; } { @@ -11110,7 +11110,7 @@ path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -11118,7 +11118,7 @@ path = fetchurl { name = "string_width___string_width_2.1.1.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; } { @@ -11126,7 +11126,7 @@ path = fetchurl { name = "string_width___string_width_3.1.0.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; - sha1 = "22767be21b62af1081574306f69ac51b62203961"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; } { @@ -11134,7 +11134,7 @@ path = fetchurl { name = "string_width___string_width_4.2.0.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; } { @@ -11142,7 +11142,7 @@ path = fetchurl { name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz"; - sha1 = "59370644e1db7e4c0c045277690cf7b01203c4da"; + sha512 = "Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q=="; }; } { @@ -11150,7 +11150,7 @@ path = fetchurl { name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; } { @@ -11158,7 +11158,7 @@ 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"; - sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; }; } { @@ -11166,7 +11166,7 @@ path = fetchurl { name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; } { @@ -11174,7 +11174,7 @@ 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"; - sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; } { @@ -11182,7 +11182,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -11190,7 +11190,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { @@ -11198,7 +11198,7 @@ path = fetchurl { name = "stringz___stringz_2.1.0.tgz"; url = "https://registry.yarnpkg.com/stringz/-/stringz-2.1.0.tgz"; - sha1 = "5896b4713eac31157556040fb90258fb02c1630c"; + sha512 = "KlywLT+MZ+v0IRepfMxRtnSvDCMc3nR1qqCs3m/qIbSOWkNZYT8XHQA31rS3TnKp0c5xjZu3M4GY/2aRKSi/6A=="; }; } { @@ -11206,7 +11206,7 @@ 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 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -11214,7 +11214,7 @@ 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 = "a8479022eb1ac368a871389b635262c505ee368f"; + sha1 = "qEeQIusaw2iocTibY1JixQXuNo8="; }; } { @@ -11222,7 +11222,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_5.2.0.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; } { @@ -11230,7 +11230,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_6.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; } { @@ -11238,7 +11238,7 @@ path = fetchurl { name = "strip_bom___strip_bom_3.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + sha1 = "IzTBjpx1n3vdVv3vfprj1YjmjtM="; }; } { @@ -11246,7 +11246,7 @@ path = fetchurl { name = "strip_bom___strip_bom_4.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; - sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; + sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; } { @@ -11254,7 +11254,7 @@ path = fetchurl { name = "strip_comments___strip_comments_2.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz"; - sha1 = "4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"; + sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; }; } { @@ -11262,7 +11262,7 @@ 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 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; }; } { @@ -11270,7 +11270,7 @@ 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"; - sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; } { @@ -11278,7 +11278,7 @@ path = fetchurl { name = "strip_indent___strip_indent_3.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; - sha1 = "c32e1cee940b6b3432c771bc2c54bcce73cd3001"; + sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; }; } { @@ -11286,7 +11286,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; } { @@ -11294,7 +11294,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_1.0.4.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + sha1 = "HhX7ysl9Pumb8tc7TGVrCCu6+5E="; }; } { @@ -11302,7 +11302,7 @@ path = fetchurl { name = "stylehacks___stylehacks_4.0.3.tgz"; url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz"; - sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5"; + sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; } { @@ -11310,7 +11310,7 @@ path = fetchurl { name = "stylis___stylis_4.0.6.tgz"; url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.6.tgz"; - sha1 = "0d8b97b6bc4748bea46f68602b6df27641b3c548"; + sha512 = "1igcUEmYFBEO14uQHAJhCUelTR5jPztfdVKrYxRnDa5D5Dn3w0NxXupJNPr/VV/yRfZYEAco8sTIRZzH3sRYKg=="; }; } { @@ -11318,7 +11318,7 @@ path = fetchurl { name = "substring_trie___substring_trie_1.0.2.tgz"; url = "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.2.tgz"; - sha1 = "7b42592391628b4f2cb17365c6cce4257c7b7af5"; + sha1 = "e0JZI5Fii08ssXNlxszkJXx7evU="; }; } { @@ -11326,7 +11326,7 @@ path = fetchurl { name = "supports_color___supports_color_2.0.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + sha1 = "U10EXOa2Nj+kARcIRimZXp3zJMc="; }; } { @@ -11334,7 +11334,7 @@ path = fetchurl { name = "supports_color___supports_color_3.2.3.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz"; - sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; + sha1 = "ZawFBLOVQXHYpklGsq48u4pfVPY="; }; } { @@ -11342,7 +11342,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -11350,7 +11350,7 @@ path = fetchurl { name = "supports_color___supports_color_6.1.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; } { @@ -11358,7 +11358,7 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { @@ -11366,7 +11366,7 @@ path = fetchurl { name = "supports_color___supports_color_8.1.1.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; - sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; } { @@ -11374,7 +11374,7 @@ path = fetchurl { name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; - sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; + sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA=="; }; } { @@ -11382,7 +11382,7 @@ path = fetchurl { name = "svgo___svgo_1.3.2.tgz"; url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; - sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; + sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; } { @@ -11390,7 +11390,7 @@ path = fetchurl { name = "symbol_tree___symbol_tree_3.2.4.tgz"; url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; + sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; } { @@ -11398,7 +11398,7 @@ path = fetchurl { name = "table___table_3.8.3.tgz"; url = "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz"; - sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + sha1 = "K7xULw/amGGnVdOUf+/Ys/UThV8="; }; } { @@ -11406,7 +11406,7 @@ path = fetchurl { name = "table___table_6.7.1.tgz"; url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; - sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; + sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; }; } { @@ -11414,7 +11414,7 @@ path = fetchurl { name = "tapable___tapable_1.1.3.tgz"; url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; - sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; }; } { @@ -11422,7 +11422,7 @@ path = fetchurl { name = "tar___tar_6.0.5.tgz"; url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; - sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; + sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; } { @@ -11430,7 +11430,7 @@ path = fetchurl { name = "tcomb___tcomb_2.7.0.tgz"; url = "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz"; - sha1 = "10d62958041669a5d53567b9a4ee8cde22b1c2b0"; + sha1 = "ENYpWAQWaaXVNWe5pO6M3iKxwrA="; }; } { @@ -11438,7 +11438,7 @@ path = fetchurl { name = "terminal_link___terminal_link_2.1.1.tgz"; url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; - sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994"; + sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; } { @@ -11446,7 +11446,7 @@ path = fetchurl { name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA=="; }; } { @@ -11454,7 +11454,7 @@ path = fetchurl { name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"; - sha1 = "28daef4a83bd17c1db0297070adc07fc8cfc6a9a"; + sha512 = "jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ=="; }; } { @@ -11462,7 +11462,7 @@ path = fetchurl { name = "terser___terser_4.8.0.tgz"; url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; - sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; + sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; } { @@ -11470,7 +11470,7 @@ path = fetchurl { name = "terser___terser_5.3.4.tgz"; url = "https://registry.yarnpkg.com/terser/-/terser-5.3.4.tgz"; - sha1 = "e510e05f86e0bd87f01835c3238839193f77a60c"; + sha512 = "dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw=="; }; } { @@ -11478,7 +11478,7 @@ path = fetchurl { name = "tesseract.js_core___tesseract.js_core_2.2.0.tgz"; url = "https://registry.yarnpkg.com/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz"; - sha1 = "6ef78051272a381969fac3e45a226e85022cffef"; + sha512 = "a8L+OJTbUipBsEDsJhDPlnLB0TY1MkTZqw5dqUwmiDSjUzwvU7HWLg/2+WDRulKUi4LE+7PnHlaBlW0k+V0U0w=="; }; } { @@ -11486,7 +11486,7 @@ path = fetchurl { name = "tesseract.js___tesseract.js_2.1.1.tgz"; url = "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.1.1.tgz"; - sha1 = "5c50fc95542ce8d834cb952bfb75a8fc85f1441d"; + sha512 = "utg0A8UzT1KwBvZf+UMGmM8LU6izeol6yIem0Z44+7Qqd/YWgRVQ99XOG18ApTOXX48lGE++PDwlcZYkv0ygRQ=="; }; } { @@ -11494,7 +11494,7 @@ path = fetchurl { name = "test_exclude___test_exclude_6.0.0.tgz"; url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; - sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e"; + sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; }; } { @@ -11502,7 +11502,7 @@ 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 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; }; } { @@ -11510,7 +11510,7 @@ path = fetchurl { name = "throat___throat_5.0.0.tgz"; url = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz"; - sha1 = "c5199235803aad18754a667d659b5e72ce16764b"; + sha512 = "fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="; }; } { @@ -11518,7 +11518,7 @@ path = fetchurl { name = "throng___throng_4.0.0.tgz"; url = "https://registry.yarnpkg.com/throng/-/throng-4.0.0.tgz"; - sha1 = "983c6ba1993b58eae859998aa687ffe88df84c17"; + sha1 = "mDxroZk7WOroWZmKpof/6I34TBc="; }; } { @@ -11526,7 +11526,7 @@ path = fetchurl { name = "through2___through2_2.0.5.tgz"; url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; - sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; } { @@ -11534,7 +11534,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -11542,7 +11542,7 @@ path = fetchurl { name = "thunky___thunky_1.1.0.tgz"; url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; - sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; + sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; } { @@ -11550,7 +11550,7 @@ path = fetchurl { name = "timers_browserify___timers_browserify_2.0.11.tgz"; url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; }; } { @@ -11558,7 +11558,7 @@ path = fetchurl { name = "timsort___timsort_0.3.0.tgz"; url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; - sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + sha1 = "QFQRqOfmM5/mTbmiNN4R3DHgK9Q="; }; } { @@ -11566,7 +11566,7 @@ path = fetchurl { name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; - sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; + sha512 = "ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="; }; } { @@ -11574,7 +11574,7 @@ path = fetchurl { name = "tiny_queue___tiny_queue_0.2.1.tgz"; url = "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz"; - sha1 = "25a67f2c6e253b2ca941977b5ef7442ef97a6046"; + sha1 = "JaZ/LG4lOyypQZd7XvdELvl6YEY="; }; } { @@ -11582,7 +11582,7 @@ path = fetchurl { name = "tiny_warning___tiny_warning_1.0.3.tgz"; url = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"; - sha1 = "94a30db453df4c643d0fd566060d60a875d84754"; + sha512 = "lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="; }; } { @@ -11590,7 +11590,7 @@ path = fetchurl { name = "tmpl___tmpl_1.0.4.tgz"; url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; - sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + sha1 = "I2QN17QtAEM5ERQIIOXPRA5SHdE="; }; } { @@ -11598,7 +11598,7 @@ 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 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + sha1 = "fSKbH8xjfkZsoIEYCDanqr/4P0M="; }; } { @@ -11606,7 +11606,7 @@ 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 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; }; } { @@ -11614,7 +11614,7 @@ 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 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + sha1 = "KXWIt7Dn4KwI4E5nL4XB9JmeF68="; }; } { @@ -11622,7 +11622,7 @@ 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 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + sha1 = "fIDBe53+vlmeJzZ+DU3VWQFB2zg="; }; } { @@ -11630,7 +11630,7 @@ 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"; - sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; } { @@ -11638,7 +11638,7 @@ path = fetchurl { name = "to_regex___to_regex_3.0.2.tgz"; url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; - sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; }; } { @@ -11646,7 +11646,7 @@ path = fetchurl { name = "toidentifier___toidentifier_1.0.0.tgz"; url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; - sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; } { @@ -11654,7 +11654,7 @@ path = fetchurl { name = "totalist___totalist_1.1.0.tgz"; url = "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz"; - sha1 = "a4d65a3e546517701e3e5c37a47a70ac97fe56df"; + sha512 = "gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="; }; } { @@ -11662,7 +11662,7 @@ path = fetchurl { name = "tough_cookie___tough_cookie_2.5.0.tgz"; url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; } { @@ -11670,7 +11670,7 @@ path = fetchurl { name = "tough_cookie___tough_cookie_3.0.1.tgz"; url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; } { @@ -11678,7 +11678,7 @@ path = fetchurl { name = "tr46___tr46_2.0.2.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; - sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; + sha512 = "3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg=="; }; } { @@ -11686,7 +11686,7 @@ path = fetchurl { name = "ts_essentials___ts_essentials_2.0.12.tgz"; url = "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz"; - sha1 = "c9303f3d74f75fa7528c3d49b80e089ab09d8745"; + sha512 = "3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w=="; }; } { @@ -11694,7 +11694,7 @@ path = fetchurl { name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; }; } { @@ -11702,7 +11702,7 @@ path = fetchurl { name = "tslib___tslib_1.13.0.tgz"; url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; - sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; + sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; } { @@ -11710,7 +11710,7 @@ 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 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + sha1 = "oVe6QC2iTpv5V/mqadUk7tQpAaY="; }; } { @@ -11718,7 +11718,7 @@ 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 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; }; } { @@ -11726,7 +11726,7 @@ path = fetchurl { name = "tweetnacl___tweetnacl_0.14.5.tgz"; url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha1 = "WuaBd/GS1EViadEIr6k/+HQ/T2Q="; }; } { @@ -11734,7 +11734,7 @@ path = fetchurl { name = "twemoji_parser___twemoji_parser_11.0.2.tgz"; url = "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-11.0.2.tgz"; - sha1 = "24e87c2008abe8544c962f193b88b331de32b446"; + sha512 = "5kO2XCcpAql6zjdLwRwJjYvAZyDy3+Uj7v1ipBzLthQmDL7Ce19bEqHr3ImSNeoSW2OA8u02XmARbXHaNO8GhA=="; }; } { @@ -11742,7 +11742,7 @@ path = fetchurl { name = "twitter_text___twitter_text_3.1.0.tgz"; url = "https://registry.yarnpkg.com/twitter-text/-/twitter-text-3.1.0.tgz"; - sha1 = "798e932b289f506efe2a1f03fe917ba30627f125"; + sha512 = "nulfUi3FN6z0LUjYipJid+eiwXvOLb8Ass7Jy/6zsXmZK3URte043m8fL3FyDzrK+WLpyqhHuR/TcARTN/iuGQ=="; }; } { @@ -11750,7 +11750,7 @@ path = fetchurl { name = "type_check___type_check_0.4.0.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; }; } { @@ -11758,7 +11758,7 @@ 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 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; }; } { @@ -11766,7 +11766,7 @@ path = fetchurl { name = "type_detect___type_detect_4.0.8.tgz"; url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; - sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; + sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; } { @@ -11774,7 +11774,7 @@ path = fetchurl { name = "type_fest___type_fest_0.11.0.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; }; } { @@ -11782,7 +11782,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -11790,7 +11790,7 @@ path = fetchurl { name = "type_fest___type_fest_0.6.0.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; - sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; }; } { @@ -11798,7 +11798,7 @@ path = fetchurl { name = "type_fest___type_fest_0.8.1.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; }; } { @@ -11806,7 +11806,7 @@ path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; - sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; } { @@ -11814,7 +11814,7 @@ path = fetchurl { name = "type___type_1.2.0.tgz"; url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; - sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; } { @@ -11822,7 +11822,7 @@ path = fetchurl { name = "type___type_2.0.0.tgz"; url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; - sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + sha512 = "KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="; }; } { @@ -11830,7 +11830,7 @@ path = fetchurl { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; } { @@ -11838,7 +11838,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; }; } { @@ -11846,7 +11846,7 @@ path = fetchurl { name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha1 = "085e215625ec3162574dc8859abee78a59b14471"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; }; } { @@ -11854,7 +11854,7 @@ path = fetchurl { name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; }; } { @@ -11862,7 +11862,7 @@ path = fetchurl { name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; }; } { @@ -11870,7 +11870,7 @@ path = fetchurl { name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; }; } { @@ -11878,7 +11878,7 @@ path = fetchurl { name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; }; } { @@ -11886,7 +11886,7 @@ path = fetchurl { name = "union_value___union_value_1.0.1.tgz"; url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; - sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; } { @@ -11894,7 +11894,7 @@ path = fetchurl { name = "uniq___uniq_1.0.1.tgz"; url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + sha1 = "sxxa6CVIRKOoKBVBzisEuGWnNP8="; }; } { @@ -11902,7 +11902,7 @@ path = fetchurl { name = "uniqs___uniqs_2.0.0.tgz"; url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; - sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + sha1 = "/+3ks2slKQaW5uFl1KWe25mOawI="; }; } { @@ -11910,7 +11910,7 @@ path = fetchurl { name = "unique_filename___unique_filename_1.1.1.tgz"; url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; - sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; } { @@ -11918,7 +11918,7 @@ path = fetchurl { name = "unique_slug___unique_slug_2.0.2.tgz"; url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; - sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; } { @@ -11926,7 +11926,7 @@ path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } { @@ -11934,7 +11934,7 @@ path = fetchurl { name = "unpipe___unpipe_1.0.0.tgz"; url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; }; } { @@ -11942,7 +11942,7 @@ path = fetchurl { name = "unquote___unquote_1.1.1.tgz"; url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; - sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + sha1 = "j97XMk7G6IoP+LkF58CYzcCG1UQ="; }; } { @@ -11950,7 +11950,7 @@ 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 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + sha1 = "g3aHP30jNRef+x5vw6jtDfyKtVk="; }; } { @@ -11958,7 +11958,7 @@ path = fetchurl { name = "upath___upath_1.2.0.tgz"; url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; - sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; } { @@ -11966,7 +11966,7 @@ path = fetchurl { name = "uri_js___uri_js_4.4.0.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; - sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; }; } { @@ -11974,7 +11974,7 @@ path = fetchurl { name = "urix___urix_0.1.0.tgz"; url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + sha1 = "2pN/emLiH+wf0Y1Js1wpNQZ6bHI="; }; } { @@ -11982,7 +11982,7 @@ path = fetchurl { name = "url_parse___url_parse_1.5.1.tgz"; url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz"; - sha1 = "d5fa9890af8a5e1f274a2c98376510f6425f6e3b"; + sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q=="; }; } { @@ -11990,7 +11990,7 @@ path = fetchurl { name = "url___url_0.11.0.tgz"; url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + sha1 = "ODjpfPxgUh63PFJajlW/3Z4uKPE="; }; } { @@ -11998,7 +11998,7 @@ path = fetchurl { name = "use_composed_ref___use_composed_ref_1.0.0.tgz"; url = "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.0.0.tgz"; - sha1 = "bb13e8f4a0b873632cde4940abeb88b92d03023a"; + sha512 = "RVqY3NFNjZa0xrmK3bIMWNmQ01QjKPDc7DeWR3xa/N8aliVppuutOE5bZzPkQfvL+5NRWMMp0DJ99Trd974FIw=="; }; } { @@ -12006,7 +12006,7 @@ path = fetchurl { name = "use_isomorphic_layout_effect___use_isomorphic_layout_effect_1.0.0.tgz"; url = "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.0.0.tgz"; - sha1 = "f56b4ed633e1c21cd9fc76fe249002a1c28989fb"; + sha512 = "JMwJ7Vd86NwAt1jH7q+OIozZSIxA4ND0fx6AsOe2q1H8ooBUp5aN6DvVCqZiIaYU6JaMRJGyR0FO7EBCIsb/Rg=="; }; } { @@ -12014,7 +12014,7 @@ path = fetchurl { name = "use_latest___use_latest_1.1.0.tgz"; url = "https://registry.yarnpkg.com/use-latest/-/use-latest-1.1.0.tgz"; - sha1 = "7bf9684555869c3f5f37e10d0884c8accf4d3aa6"; + sha512 = "gF04d0ZMV3AMB8Q7HtfkAWe+oq1tFXP6dZKwBHQF5nVXtGsh2oAYeeqma5ZzxtlpOcW8Ro/tLcfmEodjDeqtuw=="; }; } { @@ -12022,7 +12022,7 @@ path = fetchurl { name = "use___use_3.1.1.tgz"; url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; - sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; } { @@ -12030,7 +12030,7 @@ path = fetchurl { name = "user_home___user_home_2.0.0.tgz"; url = "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + sha1 = "nHC/2Babwdy/SGBODwS4tJzenp8="; }; } { @@ -12038,7 +12038,7 @@ path = fetchurl { name = "utf_8_validate___utf_8_validate_5.0.5.tgz"; url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.5.tgz"; - sha1 = "dd32c2e82c72002dc9f02eb67ba6761f43456ca1"; + sha512 = "+pnxRYsS/axEpkrrEpzYfNZGXp0IjC/9RIxwM5gntY4Koi8SHmUGSfxfWqxZdRxrtaoVstuOzUp/rbs3JSPELQ=="; }; } { @@ -12046,7 +12046,7 @@ 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 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -12054,7 +12054,7 @@ path = fetchurl { name = "util.promisify___util.promisify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; - sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; }; } { @@ -12062,7 +12062,7 @@ path = fetchurl { name = "util___util_0.10.3.tgz"; url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + sha1 = "evsa/lCAUkZInj23/g7TeTNqwPk="; }; } { @@ -12070,7 +12070,7 @@ path = fetchurl { name = "util___util_0.10.4.tgz"; url = "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz"; - sha1 = "3aa0125bfe668a4672de58857d3ace27ecb76901"; + sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; }; } { @@ -12078,7 +12078,7 @@ path = fetchurl { name = "util___util_0.11.1.tgz"; url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; - sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; }; } { @@ -12086,7 +12086,7 @@ 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 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; }; } { @@ -12094,7 +12094,7 @@ path = fetchurl { name = "uuid___uuid_3.4.0.tgz"; url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; - sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; } { @@ -12102,7 +12102,7 @@ path = fetchurl { name = "uuid___uuid_8.3.2.tgz"; url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; - sha1 = "80d5b5ced271bb9af6c445f21a1a04c606cefbe2"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; } { @@ -12110,7 +12110,7 @@ path = fetchurl { name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; }; } { @@ -12118,7 +12118,7 @@ path = fetchurl { name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz"; - sha1 = "b4fe00e35649ef7785a9b7fcebcea05f37c332fc"; + sha512 = "fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA=="; }; } { @@ -12126,7 +12126,7 @@ 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"; - sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; } { @@ -12134,7 +12134,7 @@ path = fetchurl { name = "value_equal___value_equal_0.4.0.tgz"; url = "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz"; - sha1 = "c5bdd2f54ee093c04839d71ce2e4758a6890abc7"; + sha512 = "x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw=="; }; } { @@ -12142,7 +12142,7 @@ path = fetchurl { name = "value_equal___value_equal_1.0.1.tgz"; url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; - sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; + sha512 = "NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="; }; } { @@ -12150,7 +12150,7 @@ path = fetchurl { name = "vary___vary_1.1.2.tgz"; url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; }; } { @@ -12158,7 +12158,7 @@ path = fetchurl { name = "vendors___vendors_1.0.4.tgz"; url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; - sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; + sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; } { @@ -12166,7 +12166,7 @@ path = fetchurl { name = "verror___verror_1.10.0.tgz"; url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha1 = "OhBcoXBTr1XW4nDB+CiGguGNpAA="; }; } { @@ -12174,7 +12174,7 @@ path = fetchurl { name = "vm_browserify___vm_browserify_1.1.2.tgz"; url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; } { @@ -12182,7 +12182,7 @@ path = fetchurl { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; - sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; + sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; }; } { @@ -12190,7 +12190,7 @@ path = fetchurl { name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; - sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; }; } { @@ -12198,7 +12198,7 @@ path = fetchurl { name = "walker___walker_1.0.7.tgz"; url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; - sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + sha1 = "L3+bj9ENZ3JisYqITijRlhjgKPs="; }; } { @@ -12206,7 +12206,7 @@ path = fetchurl { name = "warning___warning_3.0.0.tgz"; url = "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz"; - sha1 = "32e5377cb572de4ab04753bdf8821c01ed605b7c"; + sha1 = "MuU3fLVy3kqwR1O9+IIcAe1gW3w="; }; } { @@ -12214,7 +12214,7 @@ path = fetchurl { name = "warning___warning_4.0.3.tgz"; url = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz"; - sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"; + sha512 = "rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w=="; }; } { @@ -12222,7 +12222,7 @@ path = fetchurl { name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; - sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + sha512 = "9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA=="; }; } { @@ -12230,7 +12230,7 @@ path = fetchurl { name = "watchpack___watchpack_1.7.4.tgz"; url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; - sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; + sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; }; } { @@ -12238,7 +12238,7 @@ path = fetchurl { name = "wbuf___wbuf_1.7.3.tgz"; url = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz"; - sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; } { @@ -12246,7 +12246,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; } { @@ -12254,7 +12254,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; - sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; } { @@ -12262,7 +12262,7 @@ path = fetchurl { name = "webpack_assets_manifest___webpack_assets_manifest_4.0.6.tgz"; url = "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-4.0.6.tgz"; - sha1 = "cb8cfd2d2d8d129228cea645c832448380c21ae0"; + sha512 = "9MsBOINUoGcj3D7XHQOOuQri7VEDArkhn5gqnpCqPungLj8Vy3utlVZ6vddAVU5feYroj+DEncktbaZhnBxdeQ=="; }; } { @@ -12270,7 +12270,7 @@ path = fetchurl { name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz"; url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz"; - sha1 = "39898cf6200178240910d629705f0f3493f7d666"; + sha512 = "PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ=="; }; } { @@ -12278,7 +12278,7 @@ path = fetchurl { name = "webpack_cli___webpack_cli_3.3.12.tgz"; url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; - sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a"; + sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; } { @@ -12286,7 +12286,7 @@ path = fetchurl { name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; }; } { @@ -12294,7 +12294,7 @@ path = fetchurl { name = "webpack_dev_server___webpack_dev_server_3.11.2.tgz"; url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz"; - sha1 = "695ebced76a4929f0d5de7fd73fafe185fe33708"; + sha512 = "A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ=="; }; } { @@ -12302,7 +12302,7 @@ path = fetchurl { name = "webpack_log___webpack_log_2.0.0.tgz"; url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz"; - sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; } { @@ -12310,7 +12310,7 @@ path = fetchurl { name = "webpack_merge___webpack_merge_5.7.3.tgz"; url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz"; - sha1 = "2a0754e1877a25a8bbab3d2475ca70a052708213"; + sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; }; } { @@ -12318,7 +12318,7 @@ path = fetchurl { name = "webpack_sources___webpack_sources_1.4.3.tgz"; url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; - sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; } { @@ -12326,7 +12326,7 @@ path = fetchurl { name = "webpack___webpack_4.46.0.tgz"; url = "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz"; - sha1 = "bf9b4404ea20a073605e0a011d188d77cb6ad542"; + sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; } { @@ -12334,7 +12334,7 @@ path = fetchurl { name = "websocket_driver___websocket_driver_0.7.3.tgz"; url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; + sha512 = "bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg=="; }; } { @@ -12342,7 +12342,7 @@ path = fetchurl { name = "websocket_driver___websocket_driver_0.7.4.tgz"; url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; - sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760"; + sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; }; } { @@ -12350,7 +12350,7 @@ path = fetchurl { name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; - sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; + sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; } { @@ -12358,7 +12358,7 @@ path = fetchurl { name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; } { @@ -12366,7 +12366,7 @@ path = fetchurl { name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; } { @@ -12374,7 +12374,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_8.2.2.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz"; - sha1 = "85e7f9795108b53d554cec640b2e8aee2a0d4bfd"; + sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; }; } { @@ -12382,7 +12382,7 @@ 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"; - sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; } { @@ -12390,7 +12390,7 @@ 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 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + sha1 = "2e8H3Od7mQK4o6j6SzHD4/fm6Ho="; }; } { @@ -12398,7 +12398,7 @@ path = fetchurl { name = "which___which_1.3.1.tgz"; url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; } { @@ -12406,7 +12406,7 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } { @@ -12414,7 +12414,7 @@ path = fetchurl { name = "wicg_inert___wicg_inert_3.1.1.tgz"; url = "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.1.tgz"; - sha1 = "b033fd4fbfb9e3fd709e5d84becbdf2e06e5c229"; + sha512 = "PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A=="; }; } { @@ -12422,7 +12422,7 @@ path = fetchurl { name = "wide_align___wide_align_1.1.3.tgz"; url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; } { @@ -12430,7 +12430,7 @@ path = fetchurl { name = "wildcard___wildcard_2.0.0.tgz"; url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; - sha1 = "a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; }; } { @@ -12438,7 +12438,7 @@ path = fetchurl { name = "word_wrap___word_wrap_1.2.3.tgz"; url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; } { @@ -12446,7 +12446,7 @@ path = fetchurl { name = "worker_farm___worker_farm_1.7.0.tgz"; url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; - sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; } { @@ -12454,7 +12454,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; } { @@ -12462,7 +12462,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; } { @@ -12470,7 +12470,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -12478,7 +12478,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { @@ -12486,7 +12486,7 @@ path = fetchurl { name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; } { @@ -12494,7 +12494,7 @@ path = fetchurl { name = "write___write_0.2.1.tgz"; url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz"; - sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + sha1 = "X8A4KOJkzqP+kUVUdvejxWbLB1c="; }; } { @@ -12502,7 +12502,7 @@ path = fetchurl { name = "ws___ws_6.2.1.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; - sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; } { @@ -12510,7 +12510,7 @@ path = fetchurl { name = "ws___ws_7.4.6.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; - sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; + sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; }; } { @@ -12518,7 +12518,7 @@ path = fetchurl { name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; }; } { @@ -12526,7 +12526,7 @@ path = fetchurl { name = "xmlchars___xmlchars_2.2.0.tgz"; url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; - sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; + sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; }; } { @@ -12534,7 +12534,7 @@ path = fetchurl { name = "xtend___xtend_4.0.2.tgz"; url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; - sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; } { @@ -12542,7 +12542,7 @@ path = fetchurl { name = "y18n___y18n_4.0.0.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; - sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; } { @@ -12550,7 +12550,7 @@ path = fetchurl { name = "y18n___y18n_5.0.5.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; - sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="; }; } { @@ -12558,7 +12558,7 @@ path = fetchurl { name = "yallist___yallist_3.1.1.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; - sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; } { @@ -12566,7 +12566,7 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { @@ -12574,7 +12574,7 @@ path = fetchurl { name = "yaml___yaml_1.10.0.tgz"; url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; - sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; + sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg=="; }; } { @@ -12582,7 +12582,7 @@ path = fetchurl { name = "yargs_parser___yargs_parser_13.1.2.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; } { @@ -12590,7 +12590,7 @@ path = fetchurl { name = "yargs_parser___yargs_parser_18.1.3.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; } { @@ -12598,7 +12598,7 @@ path = fetchurl { name = "yargs_parser___yargs_parser_20.2.3.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz"; - sha1 = "92419ba867b858c868acf8bae9bf74af0dd0ce26"; + sha512 = "emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww=="; }; } { @@ -12606,7 +12606,7 @@ path = fetchurl { name = "yargs___yargs_13.3.2.tgz"; url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; - sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; } { @@ -12614,7 +12614,7 @@ path = fetchurl { name = "yargs___yargs_15.4.1.tgz"; url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz"; - sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8"; + sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; } { @@ -12622,7 +12622,7 @@ path = fetchurl { name = "yargs___yargs_17.0.1.tgz"; url = "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz"; - sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; + sha512 = "xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ=="; }; } { @@ -12630,7 +12630,7 @@ path = fetchurl { name = "zlibjs___zlibjs_0.3.1.tgz"; url = "https://registry.yarnpkg.com/zlibjs/-/zlibjs-0.3.1.tgz"; - sha1 = "50197edb28a1c42ca659cc8b4e6a9ddd6d444554"; + sha1 = "UBl+2yihxCymWcyLTmqd3W1ERVQ="; }; } ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix index 1e69fcd777..cde926de26 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix @@ -1,22 +1,40 @@ -{ stdenv, lib, fetchFromGitLab, rustPlatform, }: +{ stdenv, lib, fetchFromGitLab, rustPlatform, pkgs }: rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; rev = "v${version}"; - sha256 = "0k3313bnv399v738j1xja9hngsmi39r3vzvgwssl5c24yvkvskdr"; + sha256 = "sha256-jCBvenwXPgYms5Tbu16q/F8UNpvaw0Shao9kLEZLbHM="; }; - cargoSha256 = "0379dvc8m8clc9lrxd1x0aciqvcgv3hjq7xfspz3bh8aq2a43pcs"; + cargoSha256 = "sha256-fpjzc2HiWP6nV8YZOwxsIOhy4ht/tQqcvCkcLMIFUaQ="; + + nativeBuildInputs = with pkgs; [ + clang + llvmPackages.libclang + ]; + + buildInputs = with pkgs; [ + pkg-config + clangStdenv + llvmPackages.libclang.lib + rocksdb + ]; + + preBuild = with pkgs; '' + export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; + ''; + + cargoBuildFlags = "--bin conduit"; meta = with lib; { description = "A Matrix homeserver written in Rust"; homepage = "https://conduit.rs/"; license = licenses.asl20; - maintainers = with maintainers; [ pstn piegames ]; + maintainers = with maintainers; [ pstn piegames pimeys ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix index 5c0dc1e2ce..3df7f1e5a5 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix @@ -1,18 +1,26 @@ -{ buildPythonPackage, fetchFromGitHub, twisted }: +{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted }: buildPythonPackage rec { pname = "matrix-synapse-shared-secret-auth"; - version = "1.0.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "devture"; repo = "matrix-synapse-shared-secret-auth"; rev = version; - sha256 = "0cnxp3bp8mmk01a0g3lzgvaawyywjg754j4nb9iwkmm3c2nqvnpz"; + sha256 = "sha256-kaok5IwKx97FYDrVIGAtUJfExqDln5vxEKrZda2RdzE="; }; doCheck = false; pythonImportsCheck = [ "shared_secret_authenticator" ]; + buildInputs = [ matrix-synapse ]; propagatedBuildInputs = [ twisted ]; + + meta = with lib; { + description = "Shared Secret Authenticator password provider module for Matrix Synapse"; + homepage = "https://github.com/devture/matrix-synapse-shared-secret-auth"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ sumnerevans ]; + }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 68099e50b1..46c9add3d8 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.32"; + version = "0.33.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e3fc0db4920d36092a00080fe5b6dac867a6d19f630f69822c8544568f5885e2"; + sha256 = "sha256-eIpRyx1iErZuB3n+Sl231BE47ckIXYzaelod7OtdSF8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index 78e2ace875..fe2a9e0b16 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, buildGo117Package, buildEnv +{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv # The suffix for the Mattermost version. , versionSuffix ? "nixpkgs" @@ -10,11 +10,11 @@ , storePathAsBuildHash ? false }: let - version = "6.3.1"; + version = "6.3.2"; goPackagePath = "github.com/mattermost/mattermost-server"; - mattermost-server-build = buildGo117Package rec { + mattermost-server-build = buildGoPackage rec { pname = "mattermost-server"; inherit version goPackagePath; @@ -22,7 +22,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "cUeGjKutz6Yeq/cP7nYx0zPJ87GKOQWRyNSERzq/nPw="; + sha256 = "+6bLkzqlcty8X+mbNkZnHzC8tK8EJwmWAYz3jZ/6q2w="; }; ldflags = [ @@ -65,7 +65,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "lFwSZsAcQuuWTN+4wCe7GDLkhp1ASn5GE7/K5Vppr14="; + sha256 = "dxgoYFgW+KKtfNr+1pr7bA9K79gCXpKebTIWDhneuv0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index 7579db1c09..a56ef8c835 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, olm }: +{ lib, buildGoModule, fetchFromGitHub, olm }: -buildGo117Module rec { +buildGoModule rec { pname = "mautrix-whatsapp"; version = "0.2.3"; diff --git a/third_party/nixpkgs/pkgs/servers/mediatomb/default.nix b/third_party/nixpkgs/pkgs/servers/mediatomb/default.nix deleted file mode 100644 index 3f5ac6530e..0000000000 --- a/third_party/nixpkgs/pkgs/servers/mediatomb/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file -, pkg-config, autoreconfHook, nixosTests }: - -stdenv.mkDerivation rec { - pname = "mediatomb"; - version = "0.12.1"; - - src = fetchgit { - url = meta.repositories.git; - rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2"; - sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; - }; - - buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac - pkg-config autoreconfHook ]; - - passthru.tests = { inherit (nixosTests) mediatomb; }; - - meta = with lib; { - homepage = "http://mediatomb.cc"; - repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb"; - description = "UPnP MediaServer with a web user interface"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index 2bec7f6912..17e648e59a 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -4,17 +4,17 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.47.0"; + version = "0.47.5"; src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-MoBv2dTCotLnGaZOUWLScYd1+gKSjPXTSkHAR6UircA="; + sha256 = "sha256-AkSjtln53HDdIcQgnA8Wj010RXnOlOsFm2wfVgbvwtc="; } else { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz"; - sha256 = "sha256-FIjrw+BBJXOjh1AoVdfPZIdcDyk5yS/zKD1O+u31YlE="; + sha256 = "sha256-+VBRiV2zKa6PwamWj/jmE4iuoohAD6oeGnlFi4/01HM="; }); nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix new file mode 100644 index 0000000000..6d5ebbb76c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitLab, libcap_ng, libseccomp }: + +rustPlatform.buildRustPackage rec { + pname = "virtiofsd"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "virtio-fs"; + repo = "virtiofsd"; + rev = "v${version}"; + sha256 = "010xf482qip91mv91wy9zjdsq0gfg1fd6iclrcry0nfnwlbigbwd"; + }; + + cargoSha256 = "0bfvqbmvkf17slra5k0nnva6j6w07769k226qnbzb3947zf4x2ga"; + + buildInputs = [ libcap_ng libseccomp ]; + + meta = with lib; { + homepage = "https://gitlab.com/virtio-fs/virtiofsd"; + description = "vhost-user virtio-fs device backend written in Rust"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + license = with licenses; [ asl20 /* and */ bsd3 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index bb6c0b7f38..21620c6354 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: -buildGo117Module rec { +buildGoModule rec { pname = "grafana"; - version = "8.3.4"; + version = "8.3.5"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Ikvl8jsStMGDIc0y4cKWwyXJHTu4V4nCKiLUyERjRsw="; + sha256 = "sha256-frkrYDiPxP3zDpZyYp/9MbNthaJlBF4Z+DdBs2G4jE8="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-UI+NouSRwQVmAgx19OHhWcoDLj9KD05xh57/1gLvWmA="; + sha256 = "sha256-1gk9MK110K5bV3hIPAE2dSS8wgH12dxvmNu3Ku/42e0="; }; - vendorSha256 = "sha256-gaY6liueEmngxjPSegmycrLpfsB0p1YWWrNGbzpHHOc="; + vendorSha256 = "sha256-Wg4VELJyrR/VbaFNamoziRU66GTVJxBUZ1vluKjn0O8="; nativeBuildInputs = [ wire ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 28ff8ac807..d284c94e20 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix @@ -89,6 +89,10 @@ stdenv.mkDerivation rec { sed -i '/ENV{PATH}/d' node/lib/Munin/Node/Service.pm ''; + # Disable parallel build, errors: + # Can't locate Munin/Common/Defaults.pm in @INC ... + enableParallelBuilding = false; + # DESTDIR shouldn't be needed (and shouldn't have worked), but munin # developers have forgotten to use PREFIX everywhere, so we use DESTDIR to # ensure that everything is installed in $out. diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix index 251c977bd4..db9443fc04 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,20 +1,22 @@ -{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "alertmanager"; - version = "0.21.0"; + version = "0.23.0"; rev = "v${version}"; - goPackagePath = "github.com/prometheus/alertmanager"; - src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; + sha256 = "sha256-06mKgWUyw5jsjKiRXQ9/oqHvFdkY2nS9Z3eW60lTNbU="; }; - ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ + vendorSha256 = "sha256-zJvzCC7Vn5repWssyDuGtoUSZC2ojQhMqDX5Orr0ST0="; + + subPackages = [ "cmd/alertmanager" "cmd/amtool" ]; + + ldflags = let t = "github.com/prometheus/common/version"; in [ "-X ${t}.Version=${version}" "-X ${t}.Revision=${src.rev}" "-X ${t}.Branch=unknown" @@ -28,6 +30,8 @@ buildGoPackage rec { postInstall = '' $out/bin/amtool --completion-script-bash > amtool.bash installShellCompletion amtool.bash + $out/bin/amtool --completion-script-zsh > amtool.zsh + installShellCompletion amtool.zsh ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 4db534add8..af6d6cfebb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { - owner = "wrouesnel"; + owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-QU/pPw0gOHF5SAET8S/v7nTPyEvBqkxwwGQ42PbQNvw="; + sha256 = "sha256-AH4nVwmNS4YtKxrWlFNqN+Q59TaSCGdoiCfpelPtJuM="; }; - vendorSha256 = "sha256-sSJjJR0wlW95I6bgzLKx4aVcqwKMRyzzWC4uz0BKLNY="; + vendorSha256 = "sha256-ST/Mc8RDEu2G6ufus8Gi7dwdBNIpaKJjn+Fw1AKCaXs="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 59ccf2c805..1fd9cda2da 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.34.1"; + version = "1.35.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-poD7cuOxrNhhyW/GRxBjlJlRle38aYrQJ/g1d8TZ5o0="; + sha256 = "sha256-Bdgj72AuRkstmqKq8tJemK46bJKk0pJtemoDNg28ww8="; }; - vendorSha256 = "sha256-1ogMI8Aw1xBd2PQ2QRiDLifQL3Z3kU4PbbCgHLHtp6A="; + vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 12b124b784..1166855deb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGo117Module rec { +buildGoModule rec { pname = "telegraf"; version = "1.20.4"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix index 269a8c6ba6..f11af18099 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent.nix @@ -24,6 +24,10 @@ import ./versions.nix ({ version, sha256 }: "--with-libpcre" "--with-openssl=${openssl.dev}" ]; + makeFlags = [ + "AR:=$(AR)" + "RANLIB:=$(RANLIB)" + ]; postInstall = '' cp conf/zabbix_agentd/*.conf $out/etc/zabbix_agentd.conf.d/ diff --git a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix index d260614876..92e446487c 100644 --- a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchFromGitHub, pkgs, lib, nodejs, nodePackages, pkg-config, libjpeg +{ stdenv, fetchFromGitHub, pkgs, lib, nodejs-14_x, nodePackages, pkg-config, libjpeg , pixman, cairo, pango }: let + nodejs = nodejs-14_x; # No official version ever released src = fetchFromGitHub { owner = "matrix-discord"; repo = "mx-puppet-discord"; - rev = "c17384a6a12a42a528e0b1259f8073e8db89b8f4"; - sha256 = "1yczhfpa4qzvijcpgc2pr10s009qb6jwlfwpcbb17g2wsx6zj0c2"; + rev = "bb6438a504182a7a64048b992179427587ccfded"; + sha256 = "0g2p5xwxxgvlnq0fg0x4q9x4asqyppdv6b5z6bvncm62kc70z6xk"; }; myNodePackages = import ./node-composition.nix { @@ -17,6 +18,7 @@ let in myNodePackages.package.override { pname = "mx-puppet-discord"; + version = "2021-08-01"; inherit src; diff --git a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/generate.sh b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/generate.sh index 851671a147..deac865a33 100755 --- a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/generate.sh +++ b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/generate.sh @@ -2,14 +2,15 @@ #! nix-shell -i bash -p nodePackages.node2nix # No official release -rev=c17384a6a12a42a528e0b1259f8073e8db89b8f4 +rev=bb6438a504182a7a64048b992179427587ccfded u=https://raw.githubusercontent.com/matrix-discord/mx-puppet-discord/$rev # Download package.json and package-lock.json curl -O $u/package.json -curl -O $u/package-lock.json +curl $u/package-lock.json | + sed -e 's|git+ssh://git@|git+https://|g' > package-lock.json node2nix \ - --nodejs-12 \ + --nodejs-14 \ --node-env ../../development/node-packages/node-env.nix \ --input package.json \ --lock package-lock.json \ diff --git a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix index 1285e13cfb..51af28fd44 100644 --- a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import ../../.. { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-packages.nix b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-packages.nix index b3dc83bb34..696e401347 100644 --- a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-packages.nix @@ -58,13 +58,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sorunome/matrix-bot-sdk-0.5.8" = { + "@sorunome/matrix-bot-sdk-0.5.13" = { name = "_at_sorunome_slash_matrix-bot-sdk"; packageName = "@sorunome/matrix-bot-sdk"; - version = "0.5.8"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@sorunome/matrix-bot-sdk/-/matrix-bot-sdk-0.5.8.tgz"; - sha512 = "Uifu8saeD1fPrj6F8ZdYiCeADCluySbdi/nVKJy0NQOi6cA5p68ZaeydlCyl+YuFJoCjsDWBe+Szq9CgFd/SpA=="; + url = "https://registry.npmjs.org/@sorunome/matrix-bot-sdk/-/matrix-bot-sdk-0.5.13.tgz"; + sha512 = "WEeuei8/QS9FO76n71nT17TBZ3tRW2POjOpN7YIvsy5tA0WD0tMUKWZDcTo1A+xKOvzgjRTy9v88rKSLIr4wHA=="; }; }; "@szmarczak/http-timer-4.0.5" = { @@ -76,13 +76,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@types/body-parser-1.19.0" = { + "@types/body-parser-1.19.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; }; }; "@types/cacheable-request-6.0.1" = { @@ -94,31 +94,31 @@ let sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; }; }; - "@types/connect-3.4.34" = { + "@types/connect-3.4.35" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.34"; + version = "3.4.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; - sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; + sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; - "@types/express-4.17.11" = { + "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.11"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; - sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.18" = { + "@types/express-serve-static-core-4.17.24" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.18"; + version = "4.17.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; - sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="; }; }; "@types/http-cache-semantics-4.0.0" = { @@ -166,22 +166,22 @@ let sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; }; }; - "@types/qs-6.9.5" = { + "@types/qs-6.9.7" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.5"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; - sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; + sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; }; - "@types/range-parser-1.2.3" = { + "@types/range-parser-1.2.4" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; "@types/react-17.0.0" = { @@ -202,13 +202,13 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; - "@types/serve-static-1.13.9" = { + "@types/serve-static-1.13.10" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.9"; + version = "1.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; - sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; "abbrev-1.1.1" = { @@ -383,13 +383,13 @@ let sha256 = "ab87453cc9db05b3bc691f27e92c5a4a6a14a528c98c7d313d6dd42f1741124a"; }; }; - "better-sqlite3-6.0.1" = { + "better-sqlite3-7.4.3" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "6.0.1"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-6.0.1.tgz"; - sha512 = "4aV1zEknM9g1a6B0mVBx1oIlmYioEJ8gSS3J6EpN1b1bKYEE+N5lmpmXHKNKTi0qjHziSd7XrXwHl1kpqvEcHQ=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.3.tgz"; + sha512 = "07bKjClZg/f4KMVRkzWtoIvazVPcF1gsvVKVIXlxwleC2DxuIhnra3KCMlUT1rFeRYXXckot2a46UciF2d9KLw=="; }; }; "bindings-1.5.0" = { @@ -410,13 +410,13 @@ let sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; }; - "bl-4.0.3" = { + "bl-4.1.0" = { name = "bl"; packageName = "bl"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; - sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; "blurhash-1.1.3" = { @@ -518,13 +518,13 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-4.1.0" = { + "chalk-4.1.1" = { name = "chalk"; packageName = "chalk"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; - sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; }; }; "chownr-1.1.4" = { @@ -536,6 +536,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "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=="; + }; + }; "clone-response-1.0.2" = { name = "clone-response"; packageName = "clone-response"; @@ -608,6 +617,15 @@ let sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; }; }; + "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"; @@ -788,6 +806,15 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; + "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=="; + }; + }; "defer-to-connect-2.0.0" = { name = "defer-to-connect"; packageName = "defer-to-connect"; @@ -860,32 +887,32 @@ let sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; - "discord-markdown-git://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" = { + "discord-markdown-git+https://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" = { name = "discord-markdown"; packageName = "discord-markdown"; version = "2.3.1"; src = fetchgit { - url = "git://github.com/Sorunome/discord-markdown.git"; + url = "https://github.com/Sorunome/discord-markdown.git"; rev = "0f38420fdd41340d6eadd38cd5b71784ca954085"; sha256 = "61a5ffd248b6d2784665fa710bfe4c39f241c75be07dbe53f5f48575a4df229c"; }; }; - "dom-serializer-1.2.0" = { + "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; - sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; }; - "domelementtype-2.1.0" = { + "domelementtype-2.2.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; - sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; "domhandler-3.3.0" = { @@ -897,22 +924,22 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.0.0" = { + "domhandler-4.2.0" = { name = "domhandler"; packageName = "domhandler"; - version = "4.0.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz"; - sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz"; + sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; }; }; - "domutils-2.4.4" = { + "domutils-2.7.0" = { name = "domutils"; packageName = "domutils"; - version = "2.4.4"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz"; - sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"; + sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; }; }; "ee-first-1.1.1" = { @@ -960,13 +987,13 @@ let sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; - "entities-2.1.0" = { + "entities-2.2.0" = { name = "entities"; packageName = "entities"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; - sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; "escape-html-1.0.3" = { @@ -987,6 +1014,15 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "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=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -1158,13 +1194,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; "fresh-0.5.2" = { @@ -1194,6 +1230,15 @@ let sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; + "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.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1257,13 +1302,13 @@ let sha512 = "ErhWb4IUjQzJ3vGs3+RR12NWlBDDkRciFpAkQ1LPUxi6OnwhGj07gQxjPsyIk69s7qMihwKrKquV6VQq7JNYLA=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.6" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; }; }; "has-flag-3.0.0" = { @@ -1329,6 +1374,15 @@ let sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="; }; }; + "html-to-text-6.0.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz"; + sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; + }; + }; "htmlencode-0.0.4" = { name = "htmlencode"; packageName = "htmlencode"; @@ -1347,6 +1401,15 @@ let sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; }; }; + "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-cache-semantics-4.1.0" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -1437,15 +1500,6 @@ let sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; - "integer-3.0.1" = { - name = "integer"; - packageName = "integer"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/integer/-/integer-3.0.1.tgz"; - sha512 = "OqtER6W2GIJTIcnT5o2B/pWGgvurnVOYs4OZCgay40QEIbMTnNq4R0KSaIw1TZyFtPWjm5aNM+pBBMTfc3exmw=="; - }; - }; "ipaddr.js-1.9.1" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -1482,6 +1536,15 @@ let sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; }; }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; @@ -1545,6 +1608,15 @@ let sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; }; }; + "klona-2.0.4" = { + name = "klona"; + packageName = "klona"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -1563,13 +1635,13 @@ let sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw=="; }; }; - "lodash-4.17.20" = { + "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; "lodash.camelcase-4.3.0" = { @@ -1797,6 +1869,15 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; + "minipass-3.1.3" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"; + sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; + }; + }; "minizlib-1.3.3" = { name = "minizlib"; packageName = "minizlib"; @@ -1806,6 +1887,15 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; + "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.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1878,13 +1968,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mx-puppet-bridge-0.1.4" = { + "mx-puppet-bridge-0.1.6" = { name = "mx-puppet-bridge"; packageName = "mx-puppet-bridge"; - version = "0.1.4"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.1.4.tgz"; - sha512 = "Jg4hszVqQv1n35Mvb5HcfK4VafjB0LaCEay8ylgiu/M2oIPE0fadFNdQpkwssXmShDzSeth/xga3HgP8G6O5Fg=="; + url = "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.1.6.tgz"; + sha512 = "q8XtOcmn25NkdBPM1LWYGAlgZZi+mI7+Dp7F5a1zQD0JM9cMcpW9FIO/JqAer+s3Y8CgTim3JZ2AyrUjfLRKsg=="; }; }; "nan-2.14.2" = { @@ -1896,6 +1986,15 @@ let sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; + "nanoid-3.1.23" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.23"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz"; + sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; + }; + }; "napi-build-utils-1.0.2" = { name = "napi-build-utils"; packageName = "napi-build-utils"; @@ -1923,13 +2022,13 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "node-abi-2.19.3" = { + "node-abi-2.30.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.19.3"; + version = "2.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz"; - sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz"; + sha512 = "g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg=="; }; }; "node-emoji-1.10.0" = { @@ -1968,15 +2067,6 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "noop-logger-0.1.1" = { - name = "noop-logger"; - packageName = "noop-logger"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; - }; - }; "nopt-4.0.3" = { name = "nopt"; packageName = "nopt"; @@ -1986,13 +2076,13 @@ let sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; - "normalize-url-4.5.0" = { + "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; "normalize-version-1.0.5" = { @@ -2292,13 +2382,13 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "postcss-7.0.35" = { + "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; - version = "7.0.35"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; "postgres-array-2.0.0" = { @@ -2337,13 +2427,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "prebuild-install-5.3.6" = { + "prebuild-install-6.1.3" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "5.3.6"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz"; - sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz"; + sha512 = "iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q=="; }; }; "prism-media-1.2.3" = { @@ -2382,13 +2472,13 @@ let sha512 = "M7ZNjIO6x+2R/vjSD13yjJPjpoZA8eEwH2Bp2Re0/PvzozD7azikv+SaBtZes4Q1ca/xHjZ4RSCuTag3YZLg1A=="; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; "pump-3.0.0" = { @@ -2526,13 +2616,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-1.27.5" = { + "sanitize-html-2.4.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.27.5"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz"; - sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.4.0.tgz"; + sha512 = "Y1OgkUiTPMqwZNRLPERSEi39iOebn2XJLbeiGOBhaJD/yLqtLGu6GE5w7evx177LeGgSE+4p4e107LMiydOf6A=="; }; }; "sax-1.2.4" = { @@ -2661,13 +2751,13 @@ let sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; }; }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; }; }; "spex-3.2.0" = { @@ -2769,15 +2859,6 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-6.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -2805,6 +2886,15 @@ let sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; + "tar-6.1.0" = { + name = "tar"; + packageName = "tar"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; + sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + }; + }; "tar-fs-2.1.1" = { name = "tar-fs"; packageName = "tar-fs"; @@ -3039,15 +3129,6 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "which-pm-runs-1.0.0" = { - name = "which-pm-runs"; - packageName = "which-pm-runs"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; - sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; - }; - }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -3111,13 +3192,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.4.1" = { + "ws-7.5.3" = { name = "ws"; packageName = "ws"; - version = "7.4.1"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz"; - sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz"; + sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; }; }; "xtend-4.0.2" = { @@ -3160,10 +3241,10 @@ let sources."@discordjs/collection-0.1.6" sources."@discordjs/form-data-3.0.1" sources."@sindresorhus/is-3.1.2" - (sources."@sorunome/matrix-bot-sdk-0.5.8" // { + (sources."@sorunome/matrix-bot-sdk-0.5.13" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -3172,20 +3253,20 @@ let ]; }) sources."@szmarczak/http-timer-4.0.5" - sources."@types/body-parser-1.19.0" + sources."@types/body-parser-1.19.1" sources."@types/cacheable-request-6.0.1" - sources."@types/connect-3.4.34" - sources."@types/express-4.17.11" - sources."@types/express-serve-static-core-4.17.18" + sources."@types/connect-3.4.35" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.24" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/node-14.6.3" sources."@types/prop-types-15.7.3" - sources."@types/qs-6.9.5" - sources."@types/range-parser-1.2.3" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" sources."@types/react-17.0.0" sources."@types/responselike-1.0.0" - (sources."@types/serve-static-1.13.9" // { + (sources."@types/serve-static-1.13.10" // { dependencies = [ sources."@types/mime-1.3.2" ]; @@ -3207,10 +3288,19 @@ let sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."better-discord.js-git+https://github.com/Sorunome/better-discord.js.git#5e58e1e7510cf2192f3503ca146dd61a56a75c72" - sources."better-sqlite3-6.0.1" + (sources."better-sqlite3-7.4.3" // { + dependencies = [ + sources."chownr-2.0.0" + sources."fs-minipass-2.1.0" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."tar-6.1.0" + ]; + }) sources."bindings-1.5.0" sources."bintrees-1.0.1" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."inherits-2.0.4" sources."readable-stream-3.6.0" @@ -3234,6 +3324,7 @@ let sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -3261,6 +3352,7 @@ let ]; }) sources."deep-extend-0.6.0" + sources."deepmerge-4.2.2" sources."defer-to-connect-2.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -3268,24 +3360,24 @@ let sources."destroy-1.0.4" sources."detect-libc-1.0.3" sources."diff-3.5.0" - sources."discord-markdown-git://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" - (sources."dom-serializer-1.2.0" // { + sources."discord-markdown-git+https://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" + (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.0.0" + sources."domhandler-4.2.0" ]; }) - sources."domelementtype-2.1.0" + sources."domelementtype-2.2.0" sources."domhandler-3.3.0" - (sources."domutils-2.4.4" // { + (sources."domutils-2.7.0" // { dependencies = [ - sources."domhandler-4.0.0" + sources."domhandler-4.2.0" ]; }) sources."ee-first-1.1.1" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -3305,7 +3397,7 @@ let sources."finalhandler-1.1.2" sources."find-replace-3.0.0" sources."fn.name-1.1.0" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-minipass-1.2.7" @@ -3316,13 +3408,14 @@ let sources."glob-7.1.4" sources."glob-to-regexp-0.4.1" sources."got-11.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hash.js-1.1.7" sources."hasha-5.2.2" sources."he-1.2.0" sources."highlight.js-10.4.1" + sources."html-to-text-6.0.0" sources."htmlencode-0.0.4" sources."htmlparser2-4.1.0" sources."http-cache-semantics-4.1.0" @@ -3334,11 +3427,11 @@ let sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" - sources."integer-3.0.1" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-1.0.0" + sources."is-plain-object-5.0.0" sources."is-promise-2.2.2" sources."is-stream-2.0.0" sources."isarray-1.0.0" @@ -3346,9 +3439,10 @@ let sources."js-yaml-3.13.1" sources."json-buffer-3.0.1" sources."keyv-4.0.1" + sources."klona-2.0.4" sources."kuler-2.0.0" sources."linkify-it-2.2.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.padend-4.6.1" sources."lodash.toarray-4.4.0" @@ -3392,12 +3486,13 @@ let ]; }) sources."ms-2.0.0" - (sources."mx-puppet-bridge-0.1.4" // { + (sources."mx-puppet-bridge-0.1.6" // { dependencies = [ sources."events-3.2.0" ]; }) sources."nan-2.14.2" + sources."nanoid-3.1.23" sources."napi-build-utils-1.0.2" (sources."needle-2.6.0" // { dependencies = [ @@ -3406,14 +3501,13 @@ let ]; }) sources."negotiator-0.6.2" - sources."node-abi-2.19.3" + sources."node-abi-2.30.0" sources."node-emoji-1.10.0" sources."node-fetch-2.6.1" sources."node-html-parser-1.4.9" sources."node-pre-gyp-0.11.0" - sources."noop-logger-0.1.1" sources."nopt-4.0.3" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."normalize-version-1.0.5" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -3447,21 +3541,17 @@ let sources."pg-types-2.2.0" sources."pgpass-1.0.4" sources."pify-3.0.0" - (sources."postcss-7.0.35" // { - dependencies = [ - sources."supports-color-6.1.0" - ]; - }) + sources."postcss-8.3.6" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - sources."prebuild-install-5.3.6" + sources."prebuild-install-6.1.3" sources."prism-media-1.2.3" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prom-client-13.0.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" @@ -3476,7 +3566,13 @@ let sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sanitize-html-1.27.5" + (sources."sanitize-html-2.4.0" // { + dependencies = [ + sources."domhandler-4.2.0" + sources."escape-string-regexp-4.0.0" + sources."htmlparser2-6.1.0" + ]; + }) sources."sax-1.2.4" sources."semver-5.7.0" sources."semver-closest-0.1.2" @@ -3500,7 +3596,7 @@ let }) sources."simple-markdown-0.7.2" sources."simple-swizzle-0.2.2" - sources."source-map-0.6.1" + sources."source-map-js-0.6.2" sources."spex-3.2.0" (sources."split2-3.2.2" // { dependencies = [ @@ -3556,7 +3652,6 @@ let sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."vary-1.1.2" - sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" (sources."winston-3.3.3" // { dependencies = [ @@ -3582,7 +3677,7 @@ let ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.5.3" sources."xtend-4.0.2" sources."yallist-4.0.0" ]; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 5490b29090..a530a58e90 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -46,18 +46,18 @@ in { ''; nextcloud21 = generic { - version = "21.0.7"; - sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c="; + version = "21.0.8"; + sha256 = "00c37wp6fsnpm40bbhk6r6xycacfa5zk7arzc3i4xmhm89cyvm6z"; }; nextcloud22 = generic { - version = "22.2.3"; - sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo="; + version = "22.2.4"; + sha256 = "0vnf2j1hz0d7lxby73r2mq2rjm72nq55xajzm8sipj6wlbys15zl"; }; nextcloud23 = generic { - version = "23.0.0"; - sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw="; + version = "23.0.1"; + sha256 = "047pnkp49rf0a9gl03dwkkdgzmdsf88m79mzq04bwmgkb3a3qxay"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream deleted file mode 100644 index a18675347d..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream +++ /dev/null @@ -1,4 +0,0 @@ -name apache-jena-fuseki -attribute apache-jena-fuseki -target fuseki-binary.nix -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix index 7002749a0d..7f9ce7d5b5 100644 --- a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - vendorSha256 = "sha256-bmF38dj+ovVlSbTtv2TSXGLe/W1R4NUbeDrpgGlfPf4="; + vendorSha256 = "sha256-+5/j2lZJpyo67uRRSn4Fd8S2K0gfAGMe69OoEEdWijc="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/plex/default.nix b/third_party/nixpkgs/pkgs/servers/plex/default.nix index fd580d52d8..1855ac1af5 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/default.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/default.nix @@ -65,6 +65,7 @@ buildFHSUserEnv { # First, remove all of the symlinks in the plugins directory. while IFS= read -r -d $'\0' f; do echo "Removing plugin symlink: $f" + rm "$f" done < <(find "$pluginDir" -type l -print0) echo "Symlinking plugins" @@ -94,6 +95,7 @@ buildFHSUserEnv { echo "Removing old symlinks" while IFS= read -r -d $'\0' f; do echo "Removing scanner symlink: $f" + rm "$f" done < <(find "$scannerDir" -type l -print0) echo "Symlinking scanners" diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index b2a1b78e85..52e099f8db 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.25.3.5409-f11334058"; + version = "1.25.4.5487-648a8f9f9"; 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"; - hash = "sha256-Q0768UxZXSuUm26Ro2XIrw8qoQEWCU23P7EBtbiIa0c="; + hash = "sha256-HWQFArhKNpEW1J6RNg0aWOXn38oTeoz7k9Nk13KRrqM="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - hash = "sha256-TaOvXVeo385vqtv/dYvmQQx8c1K/EMw4MTDucg511Cs="; + hash = "sha256-eDrtukVP5PQqgh1UBgXdpRkotrGQlLisCrP0XF1iVXw="; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index d320deff4e..d05056b604 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-pkuq7waABHEo6gx6d3qJs4IXFu0EcrdpsQdKoMkjN3s="; - arm64-linux_hash = "sha256-+BLyb6mygCFQfe7u/MbGbJROF7XT0wdRPi08izI6u8c="; - x64-osx_hash = "sha256-f5EHxxXdXzj8x6BmTZCHQ9p8Sl8T0Rxe/K9FwTzbR4Q="; + x64-linux_hash = "sha256-NTkb6E0GRofd63TozLPxyNZ6GxO4pAc+MWsUDKWLZDY="; + arm64-linux_hash = "sha256-eB1Izvf/E0iOGkWt6fSc4oAt1sJ7XTxn/iwDNYz7WkA="; + x64-osx_hash = "sha256-TAphdcbzbNUZpWYVaHBkhI+RsgxWmI8n8Z6VwYxHXWg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.1.10.1375"; + version = "0.2.0.1448"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix index 9922b98a82..d0ed5cc97a 100644 --- a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.0"; + version = "3.1.5"; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-LtPv+3FQMGC2YP2+1cSPZVUIzrUhteJTl58+JdvGcQg="; + hash = "sha256-PGPUV0oOWmzc7Lih6D0sCwIuUB8FOyOrYUEIvMpr4HE="; }; postPatch = '' @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://radicale.org/v3.html"; description = "CalDAV and CardDAV server"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda erictapen ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix b/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix index 14161b5d5a..9b896cd2a1 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-bridge/default.nix @@ -2,71 +2,80 @@ , alsa-utils , autoPatchelfHook , fetchurl +, ffmpeg , lib , makeWrapper +, openssl , stdenv , zlib }: -let - inherit (stdenv.targetPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; -in stdenv.mkDerivation rec { pname = "roon-bridge"; - version = "1.8-814"; + version = "1.8-880"; src = let urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; + inherit (stdenv.targetPlatform) system; + noSuchSystem = throw "Unsupposed system: ${system}"; in { x86_64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; + sha256 = "sha256-YTLy3D1CQR1hlsGw2MmZtxHT82T0PCYZxD4adt2m1+o="; }; aarch64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxarmv8_${urlVersion}.tar.bz2"; - sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U="; + sha256 = "sha256-aCQtYMUIzwhmYJW4a8cFzIRuxyMVIkeaJH4w1Lasp3M="; }; - }.${system} or throwSystem; + }.${system} or noSuchSystem; + + dontConfigure = true; + dontBuild = true; buildInputs = [ alsa-lib - alsa-utils zlib + stdenv.cc.cc.lib ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' - runHook preInstall - mkdir -p $out - mv * $out - runHook postInstall - ''; - - postFixup = + installPhase = let - linkFix = bin: '' - sed -i '/ulimit/d' ${bin} - sed -i '/ln -sf/d' ${bin} - ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} - ''; - wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} + fixBin = binPath: '' + ( + sed -i '/ulimit/d' ${binPath} + sed -i 's@^SCRIPT=.*@SCRIPT="$(basename "${binPath}")"@' ${binPath} + wrapProgram ${binPath} \ + --argv0 "$(basename ${binPath})" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib ffmpeg openssl ]}" \ + --prefix PATH : "${lib.makeBinPath [ alsa-utils ffmpeg ]}" + ) ''; in '' - ${linkFix "$out/Bridge/RAATServer"} - ${linkFix "$out/Bridge/RoonBridge"} - ${linkFix "$out/Bridge/RoonBridgeHelper"} + runHook preInstall + mkdir -p $out + mv * $out - ${wrapFix "$out/check.sh"} - ${wrapFix "$out/start.sh"} + rm $out/check.sh + rm $out/start.sh + rm $out/VERSION + + ${fixBin "${placeholder "out"}/Bridge/RAATServer"} + ${fixBin "${placeholder "out"}/Bridge/RoonBridge"} + ${fixBin "${placeholder "out"}/Bridge/RoonBridgeHelper"} + + mkdir -p $out/bin + makeWrapper "$out/Bridge/RoonBridge" "$out/bin/RoonBridge" --run "cd $out" + + runHook postInstall ''; meta = with lib; { description = "The music player for music lovers"; + changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18"; homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix index e62f0a9dfd..4a61953977 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-880"; + version = "1.8-898"; src = let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-Td3iRYGmTg8Vx9c4e4ugIIbAqhDFPax9vR2BsCIQCZA="; + sha256 = "sha256-khp2E5BYb7bGEW6xfCKEqYDqAdElOFLbAkaHjILfyqo="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix index e7f526d3bc..32c82cfad1 100644 --- a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -20,17 +20,18 @@ let sabyenc3 puremagic guessit + pysocks ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.4.2"; + version = "3.5.0"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Pl2i/k5tilPvMWLRtzZ2imOJQdZYKDAz8bt847ZAXF8="; + sha256 = "sha256-Ay+y02kvFuwefT6f/8orClMiBK201AwSEWnPKgoeOFQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index 2001ae0052..d32a545069 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.2"; + version = "4.15.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-YoHXxqjEn3mQqfJJpmeEs1GA/iSVV+8RR82KbRZqIRM="; + sha256 = "sha256-aRFeM4MZN7pRUb4CR5QxR3Za7OZYunQ/RHQWcq1o0X8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix b/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix index 464c808bac..526bc456ac 100644 --- a/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, python3, autoreconfHook , libuuid, sqlite, glib, libevent, libsearpc, openssl, fuse, libarchive, which -, vala, cmake, oniguruma }: +, vala, cmake, oniguruma, nixosTests }: let # seafile-server relies on a specific version of libevhtp. @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "seafile-server"; - version = "8.0.7"; + version = "8.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-server"; - rev = "27dac89bb3a81c5acc3f764ce92134eb357ea64b"; - sha256 = "1h2hxvv0l5m9nbkdyjpznb7ddk8hb8hhwj8b2lx6aqbvp8gll9q7"; + rev = "807867afb7a86f526a6584278914ce9f3f51d1da"; + sha256 = "1nq6dw4xzifbyhxn7yn5398q2sip1p1xwqz6xbis4nzgx4jldd4g"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -42,6 +42,10 @@ in stdenv.mkDerivation rec { cp -r scripts/sql $out/share/seafile ''; + passthru.tests = { + inherit (nixosTests) seafile; + }; + meta = with lib; { description = "File syncing and sharing software with file encryption and group sharing, emphasis on reliability and high performance"; homepage = "https://github.com/haiwen/seafile-server"; diff --git a/third_party/nixpkgs/pkgs/servers/serviio/default.nix b/third_party/nixpkgs/pkgs/servers/serviio/default.nix index 29c223a347..1363aea11e 100644 --- a/third_party/nixpkgs/pkgs/servers/serviio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/serviio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serviio"; - version = "2.1"; + version = "2.2.1"; src = fetchurl { url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz"; - sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i"; + sha256 = "sha256-uRRWKMv4f2b1yIE9OnXDIZAmcoqw/8F0z1LOesQBsyQ="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/shellinabox/default.nix b/third_party/nixpkgs/pkgs/servers/shellinabox/default.nix deleted file mode 100644 index 0240cd5a86..0000000000 --- a/third_party/nixpkgs/pkgs/servers/shellinabox/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }: - -stdenv.mkDerivation rec { - version = "2.20"; - pname = "shellinabox"; - - src = fetchFromGitHub { - owner = "shellinabox"; - repo = "shellinabox"; - rev = "v${version}"; - sha256 = "1hmfayh21cks2lyj572944ll0mmgsxbnj981b3hq3nhdg8ywzjfr"; - }; - - patches = [ - ./shellinabox-minus.patch - (fetchpatch { - name = "CVE-2018-16789.patch"; - url = "https://github.com/shellinabox/shellinabox/commit/4f0ecc31ac6f985e0dd3f5a52cbfc0e9251f6361.patch"; - sha256 = "1mpm6acxdb0fms9pa2b88fx6hp07ph87ahxi82yyqj2m7p79jx7a"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook makeWrapper ]; - buildInputs = [ pam openssl openssh ]; - - # Disable GSSAPIAuthentication errors. Also, paths in certain source files are - # hardcoded. Replace the hardcoded paths with correct paths. - preConfigure = '' - substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" "" - substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin" - substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login" - substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login" - substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin" - ''; - - postInstall = '' - wrapProgram $out/bin/shellinaboxd \ - --prefix LD_LIBRARY_PATH : ${openssl.out}/lib - mkdir -p $out/lib - cp shellinabox/* $out/lib - ''; - - meta = with lib; { - homepage = "https://github.com/shellinabox/shellinabox"; - description = "Web based AJAX terminal emulator"; - license = licenses.gpl2; - maintainers = with maintainers; [ tomberek lihop ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/shellinabox/shellinabox-minus.patch b/third_party/nixpkgs/pkgs/servers/shellinabox/shellinabox-minus.patch deleted file mode 100644 index d84bdd2eb1..0000000000 --- a/third_party/nixpkgs/pkgs/servers/shellinabox/shellinabox-minus.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru shellinabox-2.14/shellinabox/vt100.jspp shellinabox-2.14.new/shellinabox/vt100.jspp ---- shellinabox-2.14/shellinabox/vt100.jspp 2012-04-21 21:30:44.000000000 +0400 -+++ shellinabox-2.14.new/shellinabox/vt100.jspp 2014-03-27 16:33:31.012344164 +0400 -@@ -2676,6 +2676,7 @@ - switch (key) { - case 33: /* Page Up */ this.scrollBack(); return; - case 34: /* Page Down */ this.scrollFore(); return; -+ case 173: /* _ */ ch = this.applyModifiers(95, event); break; - default: break; - } - } -@@ -2738,6 +2739,7 @@ - case 123: /* F12 */ ch = '\u001B[24~'; break; - case 144: /* Num Lock */ return; - case 145: /* Scroll Lock */ return; -+ case 173: /* - */ ch = this.applyModifiers(45, event); break; - case 186: /* ; */ ch = this.applyModifiers(59, event); break; - case 187: /* = */ ch = this.applyModifiers(61, event); break; - case 188: /* , */ ch = this.applyModifiers(44, event); break; -@@ -2882,6 +2884,7 @@ - case 109: /* - -> _ */ u = 45; s = 95; break; - case 111: /* / -> ? */ u = 47; s = 63; break; - -+ case 173: /* - -> _ */ u = 45; s = 95; break; - case 186: /* ; -> : */ u = 59; s = 58; break; - case 187: /* = -> + */ u = 61; s = 43; break; - case 188: /* , -> < */ u = 44; s = 60; break; - diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index df2e9fe03a..bed8da0488 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.24"; + version = "0.25.26"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-x6v7CKJkN6gt9askpp/W0CVCKvRaHLBXbagtC+rVNVc="; + sha256 = "153zd0yq39vmh00ydw42yw8dx18cy3as36xml228hq244cxypkwp"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix index b289177e79..dab8df564f 100644 --- a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix +++ b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-sRlEF1ee+oBnYOGSN6rDOvNr3OnfAqV+1Wx5XOyIylw="; + sha256 = "sha256-DEtWFWzUytj9xhNCVTPgSy2vR3sL2VYG76UmF6Dx78M="; }; - vendorSha256 = "sha256-FukkmuBTPPhY0UTe3r1iU3nbGoMsPTcRKTLBd+VMGUk="; + vendorSha256 = "sha256-ljbUAsbgonEFDVY6cSeVPkjieXWgF9JFGl6c7J6/164="; doCheck = false; @@ -27,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "A tasty, self-hosted Git server for the command line"; homepage = "https://github.com/charmbracelet/soft-serve"; + mainProgram = "soft"; license = licenses.mit; maintainers = with maintainers; [ penguwin ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/softether/4.29.nix b/third_party/nixpkgs/pkgs/servers/softether/default.nix similarity index 65% rename from third_party/nixpkgs/pkgs/servers/softether/4.29.nix rename to third_party/nixpkgs/pkgs/servers/softether/default.nix index 83eb3b05b3..2f80afc370 100644 --- a/third_party/nixpkgs/pkgs/servers/softether/4.29.nix +++ b/third_party/nixpkgs/pkgs/servers/softether/default.nix @@ -4,28 +4,28 @@ stdenv.mkDerivation rec { pname = "softether"; - version = "4.29"; - build = "9680"; + version = "4.38"; + build = "9760"; src = fetchurl { url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz"; - sha256 = "1r169s5dr31060r2mxkmm08riy6zrxgapmrc6kdrpxdav6kmy0z6"; + sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6"; }; buildInputs = [ openssl readline ncurses zlib ]; preConfigure = '' - ./configure + ./configure ''; buildPhase = '' - mkdir -p $out/bin - sed -i \ - -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ - -e "/_DIR=/s|/usr|${dataDir}|g" \ - -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ - -e "/echo/s|echo $out/|echo |g" \ - Makefile + mkdir -p $out/bin + sed -i \ + -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ + -e "/_DIR=/s|/usr|${dataDir}|g" \ + -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ + -e "/echo/s|echo $out/|echo |g" \ + Makefile ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 4e4a0640df..dd849ef958 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-7nmpsmisrtBxdLgC9mwSDYbjtbCrGl564+deC9CaYps="; + vendorSha256 = "sha256-pP/KCj92Y8fEh9AXKEOxuXxMeTMcGJrYSW+OrfXvajk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix index 8b1c8b04bd..1e9884eb73 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.2.3"; - sha256 = "1x1i4ck4c3sgkw083v02zk3rbkm5h0x1vl4m58j95q1qcijkiamn"; + version = "3.2.5"; + sha256 = "0w0fimdiiqrrm012iflz8l4rnafryq7y0qqijzxn7nwzxhm9jsr9"; }) diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix index 3f0697bd2c..dbf8e36e9e 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -11,10 +11,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - urls = [ - "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz" - "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz" - ]; + url = "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix index 3f1f3448da..fb07bc3915 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nixosTests +{ lib, stdenv, fetchurl, nixosTests, buildPackages # Native buildInputs components , bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config # Common components @@ -18,7 +18,7 @@ let # in mariadb # spans the whole file libExt = stdenv.hostPlatform.extensions.sharedLibrary; -mytopEnv = perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]); +mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]); mariadbPackage = packageSettings: (server packageSettings) // { client = client packageSettings; # MariaDB Client @@ -208,6 +208,10 @@ in stdenv.mkDerivation (common // { "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_PLUGIN_S3=1" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # revisit this if nixpkgs supports any architecture whose stack grows upwards + "-DSTACK_DIRECTION=-1" + "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" ]; preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix index c1ce4d9e1e..1c8b21f399 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, cmake, bison, pkg-config , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds -, libtirpc, rpcsvc-proto +, libtirpc, rpcsvc-proto, nixosTests }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -9,11 +9,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "5.7.27"; + version = "5.7.37"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; - sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; + sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0="; }; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -75,6 +75,7 @@ self = stdenv.mkDerivation rec { connector-c = self; server = self; mysqlVersion = "5.7"; + tests = nixosTests.mysql.mysql57; }; meta = with lib; { 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 58b264c9b1..ae2e170379 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 @@ -1,22 +1,18 @@ { lib, stdenv, fetchurl, bison, cmake, pkg-config -, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd -, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools +, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd, libfido2 +, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests }: let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.27"; + version = "8.0.28"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Sn5y+Jnm8kvNR503jt0vMvWD5of5OiYpF3SBXVpUm5c="; + sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI="; }; - patches = [ - ./abi-check.patch - ]; - nativeBuildInputs = [ bison cmake pkg-config ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; @@ -28,7 +24,7 @@ self = stdenv.mkDerivation rec { buildInputs = [ boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib - zstd + zstd libfido2 ] ++ lib.optionals stdenv.isLinux [ numactl libtirpc ] ++ lib.optionals stdenv.isDarwin [ @@ -68,6 +64,7 @@ self = stdenv.mkDerivation rec { connector-c = self; server = self; mysqlVersion = "8.0"; + tests = nixosTests.mysql.mysql80; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix index 142dfe29fa..ab8f7f9a69 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix @@ -129,6 +129,10 @@ stdenv.mkDerivation rec { sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config + # https://github.com/sysown/proxysql/issues/3679 + # TODO: remove when upgrading past 2.3.2 + sed -i -e 's@^\(\s\+cd curl/curl \&\& ./configure .*\) \(--with-ssl=.*\)$@\1 --without-zstd \2@' Makefile + popd patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/servers/t-rex/default.nix b/third_party/nixpkgs/pkgs/servers/t-rex/default.nix index 8475d5df4d..551282b605 100644 --- a/third_party/nixpkgs/pkgs/servers/t-rex/default.nix +++ b/third_party/nixpkgs/pkgs/servers/t-rex/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "t-rex"; - version = "0.14.3-beta4"; + version = "0.14.3"; src = fetchFromGitHub { owner = "t-rex-tileserver"; repo = pname; rev = "v${version}"; - hash = "sha256-EG/nnHxnBwlxreJ+RWHvKqLpaVtlU95+YTJynEnypOE="; - + hash = "sha256-LUVk5li2cl/LKbhKOh6Bbwav0GEuI/vUbDPLn7NSRIs="; }; - cargoHash = "sha256-noDZNFZlfX6lZ4czsSrHXe7xbBLTD0Gz8i5EyfEp8lc="; + cargoHash = "sha256-I4QmjTTKUp9iugEwzM0xCcNLvF5ozeBdYmbi8sytY88="; nativeBuildInputs = [ pkg-config ]; @@ -21,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Vector tile server specialized on publishing MVT tiles"; homepage = "https://t-rex.tileserver.ch/"; + changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index ee768981f9..e3852931d1 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-uW/C4Bks7qGJEQhPoqd2LSk8MAD9gcDRsJbbowgsSuY="; + sha256 = "sha256-6ZiMkid5RneOIlDDSDkB8m0nAywZEUCJ96qveE2l53k="; }; 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 ac29b20a10..c09e60cd0e 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.8.1"; + version = "2.9.3"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vaH8PdWsWwBE2eW0i1QsjfOZdG5luME12gAY2uykyng="; + sha256 = "sha256-LaKbhRAC/T4BuBHLQ+qUZYGsWjj/v8xg6yz55yEib0A="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index b69355dfa7..ac57cc5133 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ { lib -, buildGo117Module +, buildGoModule , rustPlatform , fetchFromGitHub , makeWrapper @@ -16,9 +16,9 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-02Wsj2V7RNjKlkgAqj7IqyRGCxml8pw5h0vflqcGAB8="; + sha256 = "sha256-ir2NMNIjSpv7l6dVNHczARg6b+doFofinsJy1smEC7o="; }; - version = "8.0.6"; + version = "8.1.3"; roleTester = rustPlatform.buildRustPackage { name = "teleport-roletester"; @@ -39,11 +39,11 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "240464d54ac498281592eb0b30c871dc3c7ce09b"; - sha256 = "sha256-8gt8x2fNh8mA1KCop5dEZmpBWBu7HsrTY5zVUlmKDgs="; + rev = "ea3c67c941c56cfb6c228612e88100df09fb6f9c"; + sha256 = "sha256-oKvDXkxA73IJOi+ciBFVLkYcmeRUsTC+3rcYf64vDoY="; }; in -buildGo117Module rec { +buildGoModule rec { pname = "teleport"; inherit src version; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index 91a2664274..95ef4b0ea7 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.5.7"; + version = "2.6.0"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-CQXrAKdfNqGKXw3Ds47uq6ALsDh6JRf+94axOvLzWbE="; + sha256 = "sha256-+95GB4D6upo6s0K+rxpuolzF5Knind0bYCzgO33mNis="; stripRoot = false; }; - vendorSha256 = "sha256-aZemr1waV2hIujbI+1PrivXxa1RrT0Ams4xT4QxTQPY="; + vendorSha256 = "sha256-H67oCOCkS/xpkCZ4C3BuIzpUKuLvItDqC4tNSNKjv0E="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index 33f5044cb7..4902123181 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -63,4 +63,9 @@ in rec { version = "6.5.55"; sha256 = "sha256-NUGRO+f6JzWvYPwiitZsgp+LQwnGSncnost03mgNVxA="; }; + + unifi7 = generic { + version = "7.0.20-894288bd9b"; + sha256 = "sha256-lDSU4D159svqkv+e61v/RWIyw0KOrF8X0nNpo9eQe50="; + }; } diff --git a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix index 3eaf95a451..f0c55051fc 100644 --- a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix @@ -2,19 +2,21 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "08xcxs4qh25qsjaf6wivhpszl61zdp59hlkd57igf9fv4lywb41q"; + sha256 = "sha256-lQqa1YtMLsCEfiC3Ld+lw4SvAD8wctSGi2YdXt9lrTA="; }; - vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z"; + vendorSha256 = "sha256-W9lTIjntaNZSJVt6Jow8uSew+zCaGWU9qzseClNiVUI="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + ldflags = [ "-s" "-w" "-X golift.io/version.Version=${version}" ]; + meta = with lib; { description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import"; homepage = "https://github.com/davidnewhall/unpackerr"; diff --git a/third_party/nixpkgs/pkgs/servers/varnish/default.nix b/third_party/nixpkgs/pkgs/servers/varnish/default.nix index 030af84787..7d52b3a0a2 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/default.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/default.nix @@ -48,12 +48,12 @@ let in { varnish60 = common { - version = "6.0.9"; - sha256 = "1g0pwyckc0xh6ag6wj082x9wn4q6p6krjgc16fkw1arl71c18wsh"; + version = "6.0.10"; + sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb"; }; varnish70 = (common { - version = "7.0.1"; - sha256 = "0q265fzarz5530g8lasvfpgks8z1kq1yh7rn88bn2qfly3pmpry4"; + version = "7.0.2"; + sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj"; }).overrideAttrs (oA: { patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/default.nix new file mode 100644 index 0000000000..270b2e4cff --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, pkgs +, lib +, nodejs-14_x +}: + +let + nodejs = nodejs-14_x; + + nodePackages = import ./node-packages.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; + + ethercalc = lib.head (lib.attrValues nodePackages); + + combined = ethercalc.override { + meta = with lib; { + description = "Online collaborative spreadsheet"; + license = with licenses; [ cpal10 artistic2 mit asl20 cc0 mpl20 ]; + homepage = "https://github.com/audreyt/ethercalc"; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; + }; +in + combined diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/generate.sh b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/generate.sh new file mode 100755 index 0000000000..814a83a033 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/generate.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`. +# Else `nix-shell` will not find this script. + +set -euo pipefail + +cd -- "$(dirname -- "$BASH_SOURCE[0]")" + +node2nix \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ../../../development/node-packages/node-env.nix diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix new file mode 100644 index 0000000000..97435a5225 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix @@ -0,0 +1,2086 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "accepts-1.0.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz"; + sha1 = "5b501fb4f0704309964ccdb048172541208dab1a"; + }; + }; + "adler-32-1.0.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.0.0.tgz"; + sha1 = "28728a71756f629666dd1653cd80793a9df18651"; + }; + }; + "adler-32-1.2.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz"; + sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25"; + }; + }; + "adler-32-1.3.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz"; + sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g=="; + }; + }; + "after-0.8.1" = { + name = "after"; + packageName = "after"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; + sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "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"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "arraybuffer.slice-0.0.6" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + }; + }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; + "babyparse-0.2.1" = { + name = "babyparse"; + packageName = "babyparse"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babyparse/-/babyparse-0.2.1.tgz"; + sha1 = "069f035df3fdce6f3a455dd5dafc75178dcf3760"; + }; + }; + "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-arraybuffer-0.1.2" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; + sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; + }; + }; + "base64-url-1.2.1" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + }; + }; + "base64id-0.1.0" = { + name = "base64id"; + packageName = "base64id"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + }; + }; + "basic-auth-1.0.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"; + sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637"; + }; + }; + "basic-auth-connect-1.0.0" = { + name = "basic-auth-connect"; + packageName = "basic-auth-connect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }; + }; + "batch-0.5.1" = { + name = "batch"; + packageName = "batch"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.5.1.tgz"; + sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2"; + }; + }; + "better-assert-1.0.2" = { + name = "better-assert"; + packageName = "better-assert"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + }; + }; + "blob-0.0.2" = { + name = "blob"; + packageName = "blob"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz"; + sha1 = "b89562bd6994af95ba1e812155536333aa23cf24"; + }; + }; + "body-parser-1.6.7" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz"; + sha1 = "82306becadf44543e826b3907eae93f0237c4e5c"; + }; + }; + "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=="; + }; + }; + "buffer-crc32-0.2.3" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; + sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; + }; + }; + "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=="; + }; + }; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + }; + "callsite-1.0.0" = { + name = "callsite"; + packageName = "callsite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }; + }; + "cfb-0.11.1" = { + name = "cfb"; + packageName = "cfb"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cfb/-/cfb-0.11.1.tgz"; + sha1 = "a96db8f272a6c3fb99dbbb23ef41223f48be1ea7"; + }; + }; + "cfb-1.2.1" = { + name = "cfb"; + packageName = "cfb"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz"; + sha512 = "wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ=="; + }; + }; + "codepage-1.14.0" = { + name = "codepage"; + packageName = "codepage"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz"; + sha1 = "8cbe25481323559d7d307571b0fff91e7a1d2f99"; + }; + }; + "codepage-1.8.1" = { + name = "codepage"; + packageName = "codepage"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/codepage/-/codepage-1.8.1.tgz"; + sha1 = "f1a009d5261dc2754628bacb6fbbf0e6e2abffaa"; + }; + }; + "coffee-css-0.0.5" = { + name = "coffee-css"; + packageName = "coffee-css"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-css/-/coffee-css-0.0.5.tgz"; + sha1 = "589a822fba5ae0d4f1a0424b22ba7501683275a4"; + }; + }; + "coffee-script-1.12.7" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; + }; + }; + "coffeecup-0.3.21" = { + name = "coffeecup"; + packageName = "coffeecup"; + version = "0.3.21"; + src = fetchurl { + url = "https://registry.npmjs.org/coffeecup/-/coffeecup-0.3.21.tgz"; + sha1 = "54e714175cb223ddd10568517196e0cd566d198a"; + }; + }; + "colors-0.6.2" = { + name = "colors"; + packageName = "colors"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; + "commander-1.3.2" = { + name = "commander"; + packageName = "commander"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + }; + }; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; + }; + }; + "commander-2.17.1" = { + name = "commander"; + packageName = "commander"; + version = "2.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + }; + }; + "component-emitter-1.1.2" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + }; + "component-inherit-0.0.3" = { + name = "component-inherit"; + packageName = "component-inherit"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + }; + }; + "compressible-1.1.1" = { + name = "compressible"; + packageName = "compressible"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-1.1.1.tgz"; + sha1 = "23b71ea90ea6c6a66289701a918182c24d0729ef"; + }; + }; + "compression-1.0.11" = { + name = "compression"; + packageName = "compression"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.0.11.tgz"; + sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb"; + }; + }; + "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-2.0.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"; + sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; + }; + }; + "connect-2.25.9" = { + name = "connect"; + packageName = "connect"; + version = "2.25.9"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.25.9.tgz"; + sha1 = "9680d6f2fb200eadab3d272e419e78e5d87cf31f"; + }; + }; + "connect-timeout-1.2.2" = { + name = "connect-timeout"; + packageName = "connect-timeout"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.2.2.tgz"; + sha1 = "5953602bb66abfd5fa21ae911a7221c5e825a1c0"; + }; + }; + "cookie-0.1.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }; + }; + "cookie-parser-1.3.2" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.2.tgz"; + sha1 = "52211cc82c955d79ff0c088954407724e19cf562"; + }; + }; + "cookie-signature-1.0.4" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz"; + sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca"; + }; + }; + "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.0.2" = { + name = "crc-32"; + packageName = "crc-32"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.0.2.tgz"; + sha1 = "09507984ee9bcce3bd1b8861f0de8ab10ae8187d"; + }; + }; + "crc-32-1.2.0" = { + name = "crc-32"; + packageName = "crc-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; + sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + }; + }; + "csrf-2.0.7" = { + name = "csrf"; + packageName = "csrf"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/csrf/-/csrf-2.0.7.tgz"; + sha1 = "d04f52e0f6a28a7e2cfe1e01dd5ebc251b3d4201"; + }; + }; + "cssom-0.2.5" = { + name = "cssom"; + packageName = "cssom"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz"; + sha1 = "2682709b5902e7212df529116ff788cd5b254894"; + }; + }; + "csurf-1.4.1" = { + name = "csurf"; + packageName = "csurf"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/csurf/-/csurf-1.4.1.tgz"; + sha1 = "0ccaf026992b2d218771d6174f5c6c402a6289fd"; + }; + }; + "csv-parse-0.0.6" = { + name = "csv-parse"; + packageName = "csv-parse"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-0.0.6.tgz"; + sha1 = "94610722650feac81cf549c2c9298632d2b6037c"; + }; + }; + "debug-0.6.0" = { + name = "debug"; + packageName = "debug"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; + sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; + }; + }; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + }; + "debug-1.0.4" = { + name = "debug"; + packageName = "debug"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; + sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + }; + }; + "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=="; + }; + }; + "depd-0.4.4" = { + name = "depd"; + packageName = "depd"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; + sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + }; + }; + "destroy-1.0.3" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + }; + "ee-first-1.0.5" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; + sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; + }; + }; + "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { + name = "emitter"; + packageName = "emitter"; + version = "1.0.1"; + src = fetchurl { + name = "emitter-1.0.1.tar.gz"; + url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; + sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; + }; + }; + "engine.io-1.3.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; + sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; + }; + }; + "engine.io-client-1.3.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; + sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; + }; + }; + "engine.io-parser-1.0.6" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; + sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; + }; + }; + "errorhandler-1.1.1" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz"; + sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691"; + }; + }; + "escape-html-1.0.1" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + }; + }; + "exit-on-epipe-1.0.1" = { + name = "exit-on-epipe"; + packageName = "exit-on-epipe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; + }; + }; + "express-3.16.9" = { + name = "express"; + packageName = "express"; + version = "3.16.9"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.16.9.tgz"; + sha1 = "993747be5669700280d9682cb61ad138939847fc"; + }; + }; + "express-session-1.7.6" = { + name = "express-session"; + packageName = "express-session"; + version = "1.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.7.6.tgz"; + sha1 = "e1c369ba2176f7afdb79e77d65dcd8c7c46e48a5"; + }; + }; + "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"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "finalhandler-0.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz"; + sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa"; + }; + }; + "frac-0.3.1" = { + name = "frac"; + packageName = "frac"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/frac/-/frac-0.3.1.tgz"; + sha1 = "577677b7fdcbe6faf7c461f1801d34137cda4354"; + }; + }; + "frac-1.0.6" = { + name = "frac"; + packageName = "frac"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/frac/-/frac-1.0.6.tgz"; + sha1 = "9a0dfc23956852a8b320623bebcf1be9ea048229"; + }; + }; + "frac-1.1.2" = { + name = "frac"; + packageName = "frac"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz"; + sha512 = "w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="; + }; + }; + "fresh-0.2.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; + sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; + }; + }; + "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { + name = "global"; + packageName = "global"; + version = "2.0.1"; + src = fetchurl { + name = "global-2.0.1.tar.gz"; + url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; + sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "harb-0.1.1" = { + name = "harb"; + packageName = "harb"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/harb/-/harb-0.1.1.tgz"; + sha1 = "b8239bae2f0724b65aaaf2e74e9eb15a04db50eb"; + }; + }; + "has-binary-data-0.1.1" = { + name = "has-binary-data"; + packageName = "has-binary-data"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz"; + sha1 = "e10749fb87828a52df96f4086587eb4a03966439"; + }; + }; + "has-cors-1.0.3" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; + sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3"; + }; + }; + "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.4.4" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; + sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; + }; + }; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + }; + "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-0.1.2" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; + sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + }; + }; + "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"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "j-0.4.5" = { + name = "j"; + packageName = "j"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/j/-/j-0.4.5.tgz"; + sha1 = "02cf29f1ddbe54e527263d0754d6e8d217a6064e"; + }; + }; + "json3-3.2.6" = { + name = "json3"; + packageName = "json3"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; + sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + }; + }; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + }; + "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"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "livescript-1.5.0" = { + name = "livescript"; + packageName = "livescript"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/livescript/-/livescript-1.5.0.tgz"; + sha1 = "4fe7121c41217e4608e334eb9cbe1762e63e5566"; + }; + }; + "media-typer-0.2.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz"; + sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984"; + }; + }; + "merge-descriptors-0.0.2" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }; + }; + "method-override-2.1.3" = { + name = "method-override"; + packageName = "method-override"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.1.3.tgz"; + sha1 = "511f41c4fb1dccdb6ab1844da5dc6ea81b7c1135"; + }; + }; + "methods-1.1.0" = { + name = "methods"; + packageName = "methods"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; + sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + }; + }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; + "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-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; + "mkdirp-0.5.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + }; + "morgan-1.2.3" = { + name = "morgan"; + packageName = "morgan"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.2.3.tgz"; + sha1 = "3b0f1704df90255a542591abacd797891a8c40a1"; + }; + }; + "ms-0.6.2" = { + name = "ms"; + packageName = "ms"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + }; + "multiparty-3.3.2" = { + name = "multiparty"; + packageName = "multiparty"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + }; + }; + "mz-1.3.0" = { + name = "mz"; + packageName = "mz"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-1.3.0.tgz"; + sha1 = "06f093fdd9956a06d37e1b1e81344e27478c42f0"; + }; + }; + "nan-0.3.2" = { + name = "nan"; + packageName = "nan"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; + }; + }; + "native-or-bluebird-1.1.2" = { + name = "native-or-bluebird"; + packageName = "native-or-bluebird"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"; + sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e"; + }; + }; + "negotiator-0.4.7" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; + sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + }; + }; + "node-uuid-1.4.1" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }; + }; + "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"; + }; + }; + "object-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + }; + "on-finished-2.1.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; + sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; + }; + }; + "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=="; + }; + }; + "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"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "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=="; + }; + }; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + }; + "optparse-1.0.3" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.3.tgz"; + sha1 = "2ff49a3d691b90b0b9a1be9117f292373eb1bd66"; + }; + }; + "parsejson-0.0.1" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; + sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + }; + }; + "parseqs-0.0.2" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; + sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + }; + }; + "parseuri-0.0.2" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; + sha1 = "db41878f2d6964718be870b3140973d8093be156"; + }; + }; + "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=="; + }; + }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; + "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"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "printj-1.1.2" = { + name = "printj"; + packageName = "printj"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"; + sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + }; + }; + "printj-1.2.3" = { + name = "printj"; + packageName = "printj"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz"; + sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="; + }; + }; + "printj-1.3.0" = { + name = "printj"; + packageName = "printj"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz"; + sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="; + }; + }; + "proxy-addr-1.0.1" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; + sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + }; + }; + "qs-2.2.2" = { + name = "qs"; + packageName = "qs"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz"; + sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c"; + }; + }; + "range-parser-1.0.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz"; + sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0"; + }; + }; + "raw-body-1.3.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; + sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "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=="; + }; + }; + "redis-0.12.1" = { + name = "redis"; + packageName = "redis"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; + sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; + }; + }; + "response-time-2.0.1" = { + name = "response-time"; + packageName = "response-time"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz"; + sha1 = "c6d2cbadeac4cb251b21016fe182640c02aff343"; + }; + }; + "rndm-1.1.1" = { + name = "rndm"; + packageName = "rndm"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rndm/-/rndm-1.1.1.tgz"; + sha1 = "efcef4374021f78b63de6226b5985120269d64f1"; + }; + }; + "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=="; + }; + }; + "scmp-1.0.0" = { + name = "scmp"; + packageName = "scmp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"; + sha1 = "a0b272c3fc7292f77115646f00618b0262514e04"; + }; + }; + "send-0.8.3" = { + name = "send"; + packageName = "send"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.8.3.tgz"; + sha1 = "593886004fcb968a1b5727814a32b388b3b99083"; + }; + }; + "send-0.8.5" = { + name = "send"; + packageName = "send"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz"; + sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7"; + }; + }; + "serve-favicon-2.0.1" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz"; + sha1 = "4826975d9f173ca3a4158e9698161f75dec7afec"; + }; + }; + "serve-index-1.1.6" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.1.6.tgz"; + sha1 = "b758318fe781628383f66ac80dd447712ea7781f"; + }; + }; + "serve-static-1.5.4" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz"; + sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782"; + }; + }; + "socialcalc-2.3.0" = { + name = "socialcalc"; + packageName = "socialcalc"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socialcalc/-/socialcalc-2.3.0.tgz"; + sha512 = "hkK5c7eRRGzOiRNPFCQ/kzv2wqOSFaD4AtYag962r0jV0mlyhTQ7xvs3r14MB3Xbo2hAWq5AKYddrtqvuWvDAA=="; + }; + }; + "socket.io-1.0.6" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; + sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; + }; + }; + "socket.io-adapter-0.2.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; + sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; + }; + }; + "socket.io-client-1.0.6" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz"; + sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; + }; + }; + "socket.io-parser-2.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; + sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; + }; + }; + "socket.io-parser-2.2.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; + sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; + }; + }; + "source-map-0.1.34" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.34"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; + sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; + }; + }; + "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"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "ssf-0.10.3" = { + name = "ssf"; + packageName = "ssf"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz"; + sha512 = "pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w=="; + }; + }; + "ssf-0.8.2" = { + name = "ssf"; + packageName = "ssf"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssf/-/ssf-0.8.2.tgz"; + sha1 = "b9d4dc6a1c1bcf76f8abfa96d7d7656fb2abecd6"; + }; + }; + "ssf-0.9.4" = { + name = "ssf"; + packageName = "ssf"; + version = "0.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ssf/-/ssf-0.9.4.tgz"; + sha1 = "8e57a98c19dbbf1edd53f0f8c9e7fd524b0f6c9c"; + }; + }; + "stream-counter-0.2.0" = { + name = "stream-counter"; + packageName = "stream-counter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "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=="; + }; + }; + "stylus-0.27.2" = { + name = "stylus"; + packageName = "stylus"; + version = "0.27.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz"; + sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117"; + }; + }; + "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"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "tinycolor-0.0.1" = { + name = "tinycolor"; + packageName = "tinycolor"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + }; + "to-array-0.1.3" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz"; + sha1 = "d45dadc6363417f60f28474fea50ecddbb4f4991"; + }; + }; + "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"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "type-is-1.3.2" = { + name = "type-is"; + packageName = "type-is"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz"; + sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb"; + }; + }; + "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"; + }; + }; + "uglify-js-1.2.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.6.tgz"; + sha1 = "d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d"; + }; + }; + "uglify-js-2.4.15" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; + sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "uid-safe-1.0.1" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz"; + sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8"; + }; + }; + "uid-safe-1.1.0" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; + sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232"; + }; + }; + "underscore-1.13.2" = { + name = "underscore"; + packageName = "underscore"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz"; + sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="; + }; + }; + "utf8-2.0.0" = { + name = "utf8"; + packageName = "utf8"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz"; + sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; + }; + }; + "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"; + }; + }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; + "uuid-pure-1.0.10" = { + name = "uuid-pure"; + packageName = "uuid-pure"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid-pure/-/uuid-pure-1.0.10.tgz"; + sha1 = "72f231b59cf6c3af5e9f6ba7b963a9186d109b5d"; + }; + }; + "vary-0.1.0" = { + name = "vary"; + packageName = "vary"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; + sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; + }; + }; + "vary-1.0.1" = { + name = "vary"; + packageName = "vary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + }; + "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"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "vhost-2.0.0" = { + name = "vhost"; + packageName = "vhost"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vhost/-/vhost-2.0.0.tgz"; + sha1 = "1e26770bd0fce86c40945591e6f284c6891791e2"; + }; + }; + "voc-1.2.0" = { + name = "voc"; + packageName = "voc"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/voc/-/voc-1.2.0.tgz"; + sha512 = "BOuDjFFYvJdZO6e/N65AlaDItXo2TgyLjeyRYcqgAPkXpp5yTJcvkL2n+syO1r9Qc5g96tfBD2tuiMhYDmaGcA=="; + }; + }; + "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=="; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "ws-0.4.31" = { + name = "ws"; + packageName = "ws"; + version = "0.4.31"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; + }; + }; + "xlsjs-0.7.6" = { + name = "xlsjs"; + packageName = "xlsjs"; + version = "0.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/xlsjs/-/xlsjs-0.7.6.tgz"; + sha1 = "d88754569aabcf8eea70cc23961b462634a49565"; + }; + }; + "xlsx-0.14.5" = { + name = "xlsx"; + packageName = "xlsx"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xlsx/-/xlsx-0.14.5.tgz"; + sha512 = "s/5f4/mjeWREmIWZ+HtDfh/rnz51ar+dZ4LWKZU3u9VBx2zLdSIWTdXgoa52/pnZ9Oe/Vu1W1qzcKzLVe+lq4w=="; + }; + }; + "xlsx-0.9.13" = { + name = "xlsx"; + packageName = "xlsx"; + version = "0.9.13"; + src = fetchurl { + url = "https://registry.npmjs.org/xlsx/-/xlsx-0.9.13.tgz"; + sha1 = "5861d11e10a1f99b6f2b491e2d119a7777d066e7"; + }; + }; + "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { + name = "xmlhttprequest"; + packageName = "xmlhttprequest"; + version = "1.5.0"; + src = fetchurl { + name = "xmlhttprequest-1.5.0.tar.gz"; + url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; + sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; + }; + }; + "xoauth2-1.2.0" = { + name = "xoauth2"; + packageName = "xoauth2"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xoauth2/-/xoauth2-1.2.0.tgz"; + sha1 = "f2eefac11472c971ea3bc46e554eb4b1232146e5"; + }; + }; + "zappajs-0.5.0" = { + name = "zappajs"; + packageName = "zappajs"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zappajs/-/zappajs-0.5.0.tgz"; + sha1 = "1cc786d31c1559ba180f01ca3adf1e13ca02ca5c"; + }; + }; + }; +in +{ + "whitebophir-git+https://github.com/audreyt/ethercalc.git#b196277081d677be991d104e454a52d242ef0189" = nodeEnv.buildNodePackage { + name = "ethercalc"; + packageName = "ethercalc"; + version = "0.20201228.1"; + src = fetchgit { + url = "https://github.com/audreyt/ethercalc.git"; + rev = "b196277081d677be991d104e454a52d242ef0189"; + sha256 = "4494bada571057d86009f27470cc34f1e8a3b2c03b395cdba639c08d502a9bfe"; + }; + dependencies = [ + sources."accepts-1.0.7" + sources."adler-32-1.2.0" + sources."after-0.8.1" + sources."amdefine-1.0.1" + sources."any-promise-1.3.0" + sources."arraybuffer.slice-0.0.6" + sources."async-0.2.10" + sources."babyparse-0.2.1" + sources."balanced-match-1.0.2" + sources."base64-arraybuffer-0.1.2" + sources."base64-url-1.2.1" + sources."base64id-0.1.0" + sources."basic-auth-1.0.0" + sources."basic-auth-connect-1.0.0" + sources."batch-0.5.1" + sources."better-assert-1.0.2" + sources."blob-0.0.2" + (sources."body-parser-1.6.7" // { + dependencies = [ + sources."iconv-lite-0.4.4" + ]; + }) + sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.3" + sources."buffer-from-1.1.2" + sources."bytes-1.0.0" + sources."callsite-1.0.0" + (sources."cfb-1.2.1" // { + dependencies = [ + (sources."adler-32-1.3.0" // { + dependencies = [ + sources."printj-1.2.3" + ]; + }) + sources."printj-1.3.0" + ]; + }) + (sources."codepage-1.14.0" // { + dependencies = [ + sources."commander-2.14.1" + ]; + }) + sources."coffee-css-0.0.5" + sources."coffee-script-1.12.7" + (sources."coffeecup-0.3.21" // { + dependencies = [ + sources."uglify-js-1.2.6" + ]; + }) + sources."colors-0.6.2" + sources."commander-2.17.1" + sources."component-bind-1.0.0" + sources."component-emitter-1.1.2" + sources."component-inherit-0.0.3" + sources."compressible-1.1.1" + (sources."compression-1.0.11" // { + dependencies = [ + sources."vary-1.0.1" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-2.0.0" + sources."connect-2.25.9" + sources."connect-timeout-1.2.2" + sources."cookie-0.1.2" + sources."cookie-parser-1.3.2" + sources."cookie-signature-1.0.4" + sources."core-util-is-1.0.3" + sources."cors-2.8.5" + sources."crc-32-1.2.0" + sources."csrf-2.0.7" + sources."cssom-0.2.5" + sources."csurf-1.4.1" + sources."csv-parse-0.0.6" + sources."debug-1.0.4" + sources."deep-is-0.1.4" + sources."depd-0.4.4" + sources."destroy-1.0.3" + sources."ee-first-1.0.5" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + (sources."engine.io-1.3.1" // { + dependencies = [ + sources."debug-0.6.0" + ]; + }) + (sources."engine.io-client-1.3.1" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + sources."engine.io-parser-1.0.6" + sources."errorhandler-1.1.1" + sources."escape-html-1.0.1" + sources."exit-on-epipe-1.0.1" + (sources."express-3.16.9" // { + dependencies = [ + sources."commander-1.3.2" + sources."vary-0.1.0" + ]; + }) + (sources."express-session-1.7.6" // { + dependencies = [ + sources."uid-safe-1.0.1" + ]; + }) + sources."fast-levenshtein-2.0.6" + sources."finalhandler-0.1.0" + sources."frac-1.1.2" + sources."fresh-0.2.2" + sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" + sources."graceful-readlink-1.0.1" + (sources."harb-0.1.1" // { + dependencies = [ + sources."frac-0.3.1" + sources."ssf-0.8.2" + ]; + }) + sources."has-binary-data-0.1.1" + sources."has-cors-1.0.3" + sources."iconv-lite-0.4.24" + sources."indexof-0.0.1" + sources."inherits-2.0.4" + sources."ipaddr.js-0.1.2" + sources."isarray-0.0.1" + (sources."j-0.4.5" // { + dependencies = [ + sources."adler-32-1.0.0" + sources."cfb-0.11.1" + sources."codepage-1.8.1" + sources."crc-32-1.0.2" + sources."frac-1.0.6" + sources."ssf-0.9.4" + (sources."xlsx-0.9.13" // { + dependencies = [ + sources."commander-2.9.0" + ]; + }) + ]; + }) + sources."json3-3.2.6" + sources."keypress-0.1.0" + sources."levn-0.3.0" + sources."livescript-1.5.0" + sources."media-typer-0.2.0" + sources."merge-descriptors-0.0.2" + (sources."method-override-2.1.3" // { + dependencies = [ + sources."vary-1.0.1" + ]; + }) + sources."methods-1.1.0" + sources."mime-1.2.11" + sources."mime-types-1.0.2" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" + (sources."mkdirp-0.5.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."morgan-1.2.3" + sources."ms-0.6.2" + (sources."multiparty-3.3.2" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."mz-1.3.0" + sources."nan-0.3.2" + sources."native-or-bluebird-1.1.2" + sources."negotiator-0.4.7" + sources."node-uuid-1.4.1" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + sources."on-finished-2.1.0" + sources."on-headers-1.0.2" + sources."optimist-0.6.1" + sources."optionator-0.8.3" + sources."options-0.0.6" + sources."optparse-1.0.3" + sources."parsejson-0.0.1" + sources."parseqs-0.0.2" + sources."parseuri-0.0.2" + sources."parseurl-1.3.3" + sources."pause-0.0.1" + sources."prelude-ls-1.1.2" + sources."printj-1.1.2" + sources."proxy-addr-1.0.1" + sources."qs-2.2.2" + sources."range-parser-1.0.0" + (sources."raw-body-1.3.0" // { + dependencies = [ + sources."iconv-lite-0.4.4" + ]; + }) + sources."readable-stream-3.6.0" + sources."redis-0.12.1" + sources."response-time-2.0.1" + sources."rndm-1.1.1" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."scmp-1.0.0" + sources."send-0.8.3" + sources."serve-favicon-2.0.1" + sources."serve-index-1.1.6" + (sources."serve-static-1.5.4" // { + dependencies = [ + sources."send-0.8.5" + ]; + }) + sources."socialcalc-2.3.0" + (sources."socket.io-1.0.6" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + (sources."socket.io-adapter-0.2.0" // { + dependencies = [ + sources."debug-0.7.4" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + sources."socket.io-parser-2.1.2" + ]; + }) + (sources."socket.io-client-1.0.6" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + (sources."socket.io-parser-2.2.0" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + sources."source-map-0.5.7" + sources."ssf-0.10.3" + (sources."stream-counter-0.2.0" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."string_decoder-1.3.0" + (sources."stylus-0.27.2" // { + dependencies = [ + sources."mkdirp-0.3.5" + ]; + }) + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."tinycolor-0.0.1" + sources."to-array-0.1.3" + sources."type-check-0.3.2" + sources."type-is-1.3.2" + sources."typedarray-0.0.6" + (sources."uglify-js-2.4.15" // { + dependencies = [ + sources."optimist-0.3.7" + sources."source-map-0.1.34" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-safe-1.1.0" + sources."underscore-1.13.2" + sources."utf8-2.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.0" + sources."uuid-pure-1.0.10" + sources."vary-1.1.2" + sources."vhost-2.0.0" + sources."voc-1.2.0" + sources."word-wrap-1.2.3" + sources."wordwrap-0.0.3" + (sources."ws-0.4.31" // { + dependencies = [ + sources."commander-0.6.1" + ]; + }) + (sources."xlsjs-0.7.6" // { + dependencies = [ + sources."cfb-0.11.1" + sources."frac-0.3.1" + sources."ssf-0.8.2" + ]; + }) + sources."xlsx-0.14.5" + sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" + sources."xoauth2-1.2.0" + sources."zappajs-0.5.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Multi-User Spreadsheet Server"; + homepage = "http://ethercalc.net/"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.json b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.json new file mode 100644 index 0000000000..24675d7395 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.json @@ -0,0 +1,3 @@ +[ + { "whitebophir": "git+https://github.com/audreyt/ethercalc.git#b196277081d677be991d104e454a52d242ef0189" } +] diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix new file mode 100644 index 0000000000..0961603968 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +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-generated.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} 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 50d71e4228..acf3746de3 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix @@ -12,13 +12,13 @@ let pname = "plausible"; - version = "1.4.0"; + version = "1.4.4"; src = fetchFromGitHub { owner = "plausible"; repo = "analytics"; rev = "v${version}"; - sha256 = "1d31y7mwvml17w97dm5c4312n0ciq39kf4hz3g80hdzbbn72mi4q"; + sha256 = "1ckw5cd4z96jkjhmzjq7k3kzjj7bvj38i5xq9r43cz0sn7w3470k"; }; # TODO consider using `mix2nix` as soon as it supports git dependencies. diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/package.json index 7d6daeca09..2fb83b8e14 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/package.json @@ -64,5 +64,5 @@ "webpack-bundle-analyzer": "^4.4.2" }, "name": "plausible", - "version": "v1.4.0" + "version": "v1.4.4" } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.lock b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.lock index 9481f797e5..4e720b0eb5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.lock +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.lock @@ -9,32 +9,32 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== +"@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.0" + "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.0.tgz#ea269d7f78deb3a7826c39a4048eecda541ebdaa" - integrity sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60" + integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q== "@babel/core@>=7.9.0", "@babel/core@^7.14.3": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" - integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ== + version "7.16.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784" + integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helpers" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.8" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helpers" "^7.16.7" + "@babel/parser" "^7.16.12" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.10" + "@babel/types" "^7.16.8" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -42,64 +42,65 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" - integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew== +"@babel/generator@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe" + integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.8" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" - integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" - integrity sha512-9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ== +"@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.0" - "@babel/types" "^7.16.0" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz#01d615762e796c17952c29e3ede9d6de07d235a8" - integrity sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": + 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.0" - "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.16.6" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" - integrity sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA== +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c" + integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-member-expression-to-functions" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" - integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA== +"@babel/helper-create-regexp-features-plugin@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48" + integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" regexpu-core "^4.7.1" -"@babel/helper-define-polyfill-provider@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz#8867aed79d3ea6cade40f801efb7ac5c66916b10" - integrity sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ== +"@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" @@ -110,101 +111,109 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-explode-assignable-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" - integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" - integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== +"@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/helper-get-function-arity" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" - integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== +"@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/types" "^7.16.0" + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-hoist-variables@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" - integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" - integrity sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" - integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5" - integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA== +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": + 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/helper-module-imports" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-simple-access" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/helper-validator-identifier" "^7.15.7" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-optimise-call-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" - integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw== +"@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/types" "^7.16.0" + "@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-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.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== - -"@babel/helper-remap-async-to-generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz#d5aa3b086e13a5fe05238ff40c3a5a0c2dab3ead" - integrity sha512-MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew== +"@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/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-wrap-function" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-replace-supers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" - integrity sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" +"@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-simple-access@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" - integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== +"@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/types" "^7.16.0" + "@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" @@ -213,199 +222,199 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" - integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== +"@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.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== +"@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" - integrity sha512-VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g== +"@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.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@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.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.0.tgz#875519c979c232f41adfbd43a3b0398c2e388183" - integrity sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ== +"@babel/helpers@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc" + integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw== dependencies: - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== +"@babel/highlight@^7.10.4", "@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.15.7" + "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.16.0", "@babel/parser@^7.7.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.0.tgz#cf147d7ada0a3655e79bf4b08ee846f00a00a295" - integrity sha512-TEHWXf0xxpi9wKVyBCmRcSSDjbJ/cl6LUdlbYUHEaNQUJGhreJbZrXT6sR4+fZLxVUJqNRB4KyOvjuy/D9009A== +"@babel/parser@^7.16.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7", "@babel/parser@^7.7.0": + version "7.16.12" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6" + integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.0": - version "7.16.0" - 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.0.tgz#efb7f147042aca34ce8156a055906a7abaadeaf0" - integrity sha512-djyecbGMEh4rOb/Tc1M5bUW2Ih1IZRa9PoubnPOCzM+DRE89uGUHR1Y+3aDdTMW4drjGRZ2ol8dt1JUFg6hJLQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" - integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" -"@babel/plugin-proposal-async-generator-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz#11425d47a60364352f668ad5fbc1d6596b2c5caf" - integrity sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw== +"@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.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.0" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz#c029618267ddebc7280fa286e0f8ca2a278a2d1a" - integrity sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A== +"@babel/plugin-proposal-class-properties@^7.16.7": + 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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-class-static-block@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz#5296942c564d8144c83eea347d0aa8a0b89170e7" - integrity sha512-mAy3sdcY9sKAkf3lQbDiv3olOfiLqI51c9DR9b19uMoR2Z6r5pmGl7dfNFqEvqOyqbf1ta4lknK4gc5PJn3mfA== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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-dynamic-import@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" - integrity sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz#9c01dee40b9d6b847b656aaf4a3976a71740f222" - integrity sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz#cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25" - integrity sha512-kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz#a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd" - integrity sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz#44e1cce08fe2427482cf446a91bb451528ed0596" - integrity sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz#5d418e4fbbf8b9b7d03125d3a52730433a373734" - integrity sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz#5fb32f6d924d6e6712810362a60e12a2609872e6" - integrity sha512-LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg== +"@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.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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.0" + "@babel/plugin-transform-parameters" "^7.16.7" -"@babel/plugin-proposal-optional-catch-binding@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz#5910085811ab4c28b00d6ebffa4ab0274d1e5f16" - integrity sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz#56dbc3970825683608e9efb55ea82c2a2d6c8dc0" - integrity sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg== +"@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.14.5" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz#b4dafb9c717e4301c5776b30d080d6383c89aff6" - integrity sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz#69e935b2c5c79d2488112d886f0c4e2790fee76f" - integrity sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw== +"@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.0" - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz#890482dfc5ea378e42e19a71e709728cabf18612" - integrity sha512-ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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" @@ -449,12 +458,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz#f9624394317365a9a88c82358d3f8471154698f1" - integrity sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg== +"@babel/plugin-syntax-jsx@^7.16.7": + 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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" @@ -512,313 +521,315 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz#951706f8b449c834ed07bd474c0924c944b95a8e" - integrity sha512-vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-async-to-generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz#df12637f9630ddfa0ef9d7a11bc414d629d38604" - integrity sha512-PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.0" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" - integrity sha512-V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoping@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" - integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-classes@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" - integrity sha512-HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ== +"@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.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" - integrity sha512-63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" - integrity sha512-Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" - integrity sha512-FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-duplicate-keys@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" - integrity sha512-LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-exponentiation-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" - integrity sha512-OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-for-of@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" - integrity sha512-5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" - integrity sha512-lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg== +"@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-function-name" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" - integrity sha512-gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-member-expression-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b" - integrity sha512-WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" - integrity sha512-rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" - integrity sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.16.0" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" - integrity sha512-yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg== +"@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.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-identifier" "^7.15.7" + "@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" - integrity sha512-nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" - integrity sha512-LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg== +"@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.0" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" -"@babel/plugin-transform-new-target@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" - integrity sha512-fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-object-super@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" - integrity sha512-fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg== +"@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.14.5" - "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" -"@babel/plugin-transform-parameters@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz#1b50765fc421c229819dc4c7cdb8911660b3c2d7" - integrity sha512-XgnQEm1CevKROPx+udOi/8f8TiGhrUWiHiaUCIp47tE0tpFDjzXNTZc9E5CmCwxNjXTWEVqvRfWZYOTFvMa/ZQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-property-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" - integrity sha512-XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-display-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" - integrity sha512-FJFdJAqaCpndL+pIf0aeD/qlQwT7QXOvR6Cc8JPvNhKJBi2zc/DPc4g05Y3fbD/0iWAMQFGij4+Xw+4L/BMpTg== +"@babel/plugin-transform-react-display-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" + integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-jsx-development@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz#1cb52874678d23ab11d0d16488d54730807303ef" - integrity sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw== +"@babel/plugin-transform-react-jsx-development@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" + integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A== dependencies: - "@babel/plugin-transform-react-jsx" "^7.16.0" + "@babel/plugin-transform-react-jsx" "^7.16.7" -"@babel/plugin-transform-react-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" - integrity sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw== +"@babel/plugin-transform-react-jsx@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz#86a6a220552afd0e4e1f0388a68a372be7add0d4" + integrity sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-jsx" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-jsx" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/plugin-transform-react-pure-annotations@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz#23db6ddf558d8abde41b8ad9d59f48ad5532ccab" - integrity sha512-NC/Bj2MG+t8Ef5Pdpo34Ay74X4Rt804h5y81PwOpfPtmAK3i6CizmQqwyBQzIepz1Yt8wNr2Z2L7Lu3qBMfZMA== +"@babel/plugin-transform-react-pure-annotations@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" + integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" - integrity sha512-JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg== +"@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.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" - integrity sha512-Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-shorthand-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" - integrity sha512-iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" - integrity sha512-Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" -"@babel/plugin-transform-sticky-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" - integrity sha512-/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" - integrity sha512-Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typeof-symbol@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" - integrity sha512-++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-escapes@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" - integrity sha512-VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A== +"@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.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" - integrity sha512-jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A== +"@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.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/preset-env@^7.14.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.0.tgz#97228393d217560d6a1c6c56f0adb9d12bca67f5" - integrity sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg== + 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.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.0" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-async-generator-functions" "^7.16.0" - "@babel/plugin-proposal-class-properties" "^7.16.0" - "@babel/plugin-proposal-class-static-block" "^7.16.0" - "@babel/plugin-proposal-dynamic-import" "^7.16.0" - "@babel/plugin-proposal-export-namespace-from" "^7.16.0" - "@babel/plugin-proposal-json-strings" "^7.16.0" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.0" - "@babel/plugin-proposal-numeric-separator" "^7.16.0" - "@babel/plugin-proposal-object-rest-spread" "^7.16.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-private-methods" "^7.16.0" - "@babel/plugin-proposal-private-property-in-object" "^7.16.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.0" + "@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" @@ -833,44 +844,44 @@ "@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.0" - "@babel/plugin-transform-async-to-generator" "^7.16.0" - "@babel/plugin-transform-block-scoped-functions" "^7.16.0" - "@babel/plugin-transform-block-scoping" "^7.16.0" - "@babel/plugin-transform-classes" "^7.16.0" - "@babel/plugin-transform-computed-properties" "^7.16.0" - "@babel/plugin-transform-destructuring" "^7.16.0" - "@babel/plugin-transform-dotall-regex" "^7.16.0" - "@babel/plugin-transform-duplicate-keys" "^7.16.0" - "@babel/plugin-transform-exponentiation-operator" "^7.16.0" - "@babel/plugin-transform-for-of" "^7.16.0" - "@babel/plugin-transform-function-name" "^7.16.0" - "@babel/plugin-transform-literals" "^7.16.0" - "@babel/plugin-transform-member-expression-literals" "^7.16.0" - "@babel/plugin-transform-modules-amd" "^7.16.0" - "@babel/plugin-transform-modules-commonjs" "^7.16.0" - "@babel/plugin-transform-modules-systemjs" "^7.16.0" - "@babel/plugin-transform-modules-umd" "^7.16.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.0" - "@babel/plugin-transform-new-target" "^7.16.0" - "@babel/plugin-transform-object-super" "^7.16.0" - "@babel/plugin-transform-parameters" "^7.16.0" - "@babel/plugin-transform-property-literals" "^7.16.0" - "@babel/plugin-transform-regenerator" "^7.16.0" - "@babel/plugin-transform-reserved-words" "^7.16.0" - "@babel/plugin-transform-shorthand-properties" "^7.16.0" - "@babel/plugin-transform-spread" "^7.16.0" - "@babel/plugin-transform-sticky-regex" "^7.16.0" - "@babel/plugin-transform-template-literals" "^7.16.0" - "@babel/plugin-transform-typeof-symbol" "^7.16.0" - "@babel/plugin-transform-unicode-escapes" "^7.16.0" - "@babel/plugin-transform-unicode-regex" "^7.16.0" + "@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.0" - babel-plugin-polyfill-corejs2 "^0.2.3" - babel-plugin-polyfill-corejs3 "^0.3.0" - babel-plugin-polyfill-regenerator "^0.2.3" - core-js-compat "^3.19.0" + "@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": @@ -885,68 +896,69 @@ esutils "^2.0.2" "@babel/preset-react@^7.13.13": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.0.tgz#f71d3e8dff5218478011df037fad52660ee6d82a" - integrity sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw== + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" + integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-transform-react-display-name" "^7.16.0" - "@babel/plugin-transform-react-jsx" "^7.16.0" - "@babel/plugin-transform-react-jsx-development" "^7.16.0" - "@babel/plugin-transform-react-pure-annotations" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-transform-react-display-name" "^7.16.7" + "@babel/plugin-transform-react-jsx" "^7.16.7" + "@babel/plugin-transform-react-jsx-development" "^7.16.7" + "@babel/plugin-transform-react-pure-annotations" "^7.16.7" "@babel/runtime-corejs3@^7.10.2": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz#58a7fb00e6948508f12f53a303993e8b6e2f6c70" - integrity sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ== + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz#ea533d96eda6fdc76b1812248e9fbd0c11d4a1a7" + integrity sha512-3fKhuICS1lMz0plI5ktOE/yEtBRMVxplzRkdn6mJQ197XiY0JnrzYV0+Mxozq3JZ8SBV9Ecurmw1XsGbwOf+Sg== dependencies: - core-js-pure "^3.19.0" + core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.14.8", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz#e27b977f2e2088ba24748bf99b5e1dece64e4f0b" - integrity sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.14.8", "@babel/runtime@^7.16.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa" + integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" - integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== +"@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.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.7.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.0.tgz#965df6c6bfc0a958c1e739284d3c9fa4a6e3c45b" - integrity sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.7.0": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f" + integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.8" + "@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.16.10" + "@babel/types" "^7.16.8" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.16.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" - integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== +"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1" + integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" "@discoveryjs/json-ext@^0.5.0": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" - integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== + version "0.5.6" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" + integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== "@eslint/eslintrc@^0.4.3": version "0.4.3" @@ -964,9 +976,9 @@ strip-json-comments "^3.1.1" "@headlessui/react@^1.3.0": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.1.tgz#0a8dbb20e1d63dcea55bfc3ab1b87637aaac7777" - integrity sha512-gL6Ns5xQM57cZBzX6IVv6L7nsam8rDEpRhs5fg28SN64ikfmuuMgunc+Rw5C1cMScnvFM+cz32ueVrlSFEVlSg== + version "1.4.3" + resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.3.tgz#f77c6bb5cb4a614a5d730fb880cab502d48abf37" + integrity sha512-n2IQkaaw0aAAlQS5MEXsM4uRK+w18CrM72EqnGRl/UBOQeQajad8oiKXR9Nk15jOzTFQjpxzrZMf1NxHidFBiw== "@heroicons/react@^1.0.1": version "1.0.5" @@ -983,9 +995,9 @@ minimatch "^3.0.4" "@humanwhocodes/object-schema@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" - integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== "@juggle/resize-observer@^3.3.1": version "3.3.1" @@ -1071,17 +1083,17 @@ integrity sha1-dvjy6RWa5WKWWy+g5vvuGqZDobw= "@types/eslint-scope@^3.7.0": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" - integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g== + version "3.7.3" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" + integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "7.28.2" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.2.tgz#0ff2947cdd305897c52d5372294e8c76f351db68" - integrity sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA== + version "8.4.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" + integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -1096,7 +1108,7 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4" integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg== -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": 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== @@ -1119,9 +1131,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*": - version "16.11.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" - integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== + version "17.0.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.13.tgz#5ed7ed7c662948335fcad6c412bb42d99ea754e3" + integrity sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1259,22 +1271,22 @@ "@webassemblyjs/ast" "1.11.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.0.tgz#8342bef0badfb7dfd3b576f2574ab80c725be043" - integrity sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg== +"@webpack-cli/configtest@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" + integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== -"@webpack-cli/info@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.0.tgz#b9179c3227ab09cbbb149aa733475fcf99430223" - integrity sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw== +"@webpack-cli/info@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" + integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz#2c275aa05c895eccebbfc34cfb223c6e8bd591a2" - integrity sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA== +"@webpack-cli/serve@^1.6.1": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" + integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -1321,15 +1333,29 @@ acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.0.4, acorn@^8.2.1: - version "8.5.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" - integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== + version "8.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" ajv-keywords@^3.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-keywords@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -1340,21 +1366,16 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.1: - version "8.6.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" - integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== +ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18" + integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" uri-js "^4.2.2" -alphanum-sort@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - alpinejs@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/alpinejs/-/alpinejs-2.8.2.tgz#b14ec21ae3cd78dcee4aed0a78ed0f01b676dac4" @@ -1412,7 +1433,7 @@ aria-query@^4.2.2: "@babel/runtime" "^7.10.2" "@babel/runtime-corejs3" "^7.10.2" -array-includes@^3.1.1, array-includes@^3.1.3, array-includes@^3.1.4: +array-includes@^3.1.3, array-includes@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== @@ -1437,7 +1458,7 @@ array.prototype.flat@^1.2.5: define-properties "^1.1.3" es-abstract "^1.19.0" -array.prototype.flatmap@^1.2.4: +array.prototype.flatmap@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== @@ -1462,16 +1483,16 @@ astral-regex@^2.0.0: integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== autoprefixer@^10.2.6: - version "10.4.0" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" - integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA== + version "10.4.2" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b" + integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ== dependencies: - browserslist "^4.17.5" - caniuse-lite "^1.0.30001272" - fraction.js "^4.1.1" + browserslist "^4.19.1" + caniuse-lite "^1.0.30001297" + fraction.js "^4.1.2" normalize-range "^0.1.2" picocolors "^1.0.0" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" autoprefixer@^9.8.6: version "9.8.8" @@ -1486,7 +1507,7 @@ autoprefixer@^9.8.6: postcss "^7.0.32" postcss-value-parser "^4.1.0" -axe-core@^4.0.2: +axe-core@^4.3.5: version "4.3.5" resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5" integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA== @@ -1525,29 +1546,29 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-polyfill-corejs2@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz#6ed8e30981b062f8fe6aca8873a37ebcc8cc1c0f" - integrity sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA== +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.2.4" + "@babel/helper-define-polyfill-provider" "^0.3.1" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz#fa7ca3d1ee9ddc6193600ffb632c9785d54918af" - integrity sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg== +babel-plugin-polyfill-corejs3@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060" + integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A== dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.4" - core-js-compat "^3.18.0" + "@babel/helper-define-polyfill-provider" "^0.3.1" + core-js-compat "^3.20.0" -babel-plugin-polyfill-regenerator@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz#2e9808f5027c4336c994992b48a4262580cb8d6d" - integrity sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g== +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.2.4" + "@babel/helper-define-polyfill-provider" "^0.3.1" bail@^1.0.0: version "1.0.5" @@ -1604,13 +1625,13 @@ brfs@^1.3.0: static-module "^2.2.0" through2 "^2.0.0" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.17.5: - version "4.17.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.5.tgz#c827bbe172a4c22b123f5e337533ceebadfdd559" - integrity sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, 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.30001271" - electron-to-chromium "^1.3.878" + caniuse-lite "^1.0.30001286" + electron-to-chromium "^1.4.17" escalade "^3.1.1" node-releases "^2.0.1" picocolors "^1.0.0" @@ -1626,9 +1647,9 @@ buffer-from@^1.0.0: integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== bytes@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -1672,10 +1693,10 @@ caniuse-api@^3.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.30001271, caniuse-lite@^1.0.30001272: - version "1.0.30001274" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz#26ca36204d15b17601ba6fc35dbdad950a647cc7" - integrity sha512-+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297: + version "1.0.30001304" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz#38af55ed3fc8220cb13e35e6e7309c8c65a05559" + integrity sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ== chalk@^2.0.0: version "2.4.2" @@ -1710,14 +1731,14 @@ character-reference-invalid@^1.0.0: integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== chart.js@^3.3.2: - version "3.6.0" - resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.6.0.tgz#a87fce8431d4e7c5523d721f487f53aada1e42fe" - integrity sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ== + version "3.7.0" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.7.0.tgz#7a19c93035341df801d613993c2170a1fcf1d882" + integrity sha512-31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg== chokidar@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + 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" @@ -1779,26 +1800,26 @@ color-name@^1.0.0, 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== -color-string@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" - integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== +color-string@^1.9.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@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/color/-/color-4.0.1.tgz#21df44cd10245a91b1ccf5ba031609b0e10e7d67" - integrity sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA== + version "4.2.0" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz#0c782459a3e98838ea01e4bc0fb43310ca35af78" + integrity sha512-hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ== dependencies: color-convert "^2.0.1" - color-string "^1.6.0" + color-string "^1.9.0" -colord@^2.0.1, colord@^2.6: - version "2.9.1" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e" - integrity sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw== +colord@^2.9.1: + version "2.9.2" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" + integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== colorette@^2.0.14: version "2.0.16" @@ -1810,16 +1831,16 @@ commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" - integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== - commander@^7.0.0, commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^8.0.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -1853,30 +1874,29 @@ convert-source-map@^1.5.1, convert-source-map@^1.7.0: safe-buffer "~5.1.1" copy-webpack-plugin@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59" - integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw== + version "9.1.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" + integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== dependencies: - fast-glob "^3.2.5" - glob-parent "^6.0.0" + fast-glob "^3.2.7" + glob-parent "^6.0.1" globby "^11.0.3" normalize-path "^3.0.0" - p-limit "^3.1.0" - schema-utils "^3.0.0" + schema-utils "^3.1.1" serialize-javascript "^6.0.0" -core-js-compat@^3.18.0, core-js-compat@^3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.0.tgz#b3b93f93c8721b3ed52b91f12f964cc410967f8b" - integrity sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw== +core-js-compat@^3.20.0, core-js-compat@^3.20.2: + version "3.20.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz#d71f85f94eb5e4bea3407412e549daa083d23bd6" + integrity sha512-c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw== dependencies: - browserslist "^4.17.5" + browserslist "^4.19.1" semver "7.0.0" -core-js-pure@^3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.0.tgz#db6fdadfdd4dc280ec93b64c3c2e8460e6f10094" - integrity sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ== +core-js-pure@^3.20.2: + version "3.20.3" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.20.3.tgz#6cc4f36da06c61d95254efc54024fe4797fd5d02" + integrity sha512-Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA== core-util-is@~1.0.0: version "1.0.3" @@ -1908,15 +1928,10 @@ css-color-names@^0.0.4: resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= -css-color-names@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" - integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== - css-declaration-sorter@^6.0.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" - integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA== + version "6.1.4" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4" + integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw== dependencies: timsort "^0.3.0" @@ -1937,28 +1952,27 @@ css-loader@^5.2.6: semver "^7.3.5" css-minimizer-webpack-plugin@^3.0.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.1.tgz#27bafa3b75054713565b2266c64b0228acd18634" - integrity sha512-KlB8l5uoNcf9F7i5kXnkxoqJGd2BXH4f0+Lj2vSWSmuvMLYO1kNsJ1KHSzeDW8e45/whgSOPcKVT/3JopkT8dg== + version "3.4.1" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" + integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== dependencies: cssnano "^5.0.6" jest-worker "^27.0.2" - p-limit "^3.0.2" postcss "^8.3.5" - schema-utils "^3.1.0" + schema-utils "^4.0.0" serialize-javascript "^6.0.0" source-map "^0.6.1" css-select@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" - integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + 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.0.0" - domhandler "^4.2.0" - domutils "^2.6.0" - nth-check "^2.0.0" + css-what "^5.1.0" + domhandler "^4.3.0" + domutils "^2.8.0" + nth-check "^2.0.1" css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" @@ -1973,7 +1987,7 @@ css-unit-converter@^1.1.1: resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA== -css-what@^5.0.0: +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== @@ -1983,53 +1997,52 @@ cssesc@^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@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz#359943bf00c5c8e05489f12dd25f3006f2c1cbd2" - integrity sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ== +cssnano-preset-default@^5.1.11: + version "5.1.11" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.11.tgz#db10fb1ecee310e8285c5aca45bd8237be206828" + integrity sha512-ETet5hqHxmzQq2ynXMOQofKuLm7VOjMiOB7E2zdtm/hSeCKlD9fabzIUV4GoPcRyJRHi+4kGf0vsfGYbQ4nmPw== dependencies: css-declaration-sorter "^6.0.3" - cssnano-utils "^2.0.1" - postcss-calc "^8.0.0" - postcss-colormin "^5.2.0" - postcss-convert-values "^5.0.1" - postcss-discard-comments "^5.0.1" - postcss-discard-duplicates "^5.0.1" - postcss-discard-empty "^5.0.1" - postcss-discard-overridden "^5.0.1" - postcss-merge-longhand "^5.0.2" - postcss-merge-rules "^5.0.2" - postcss-minify-font-values "^5.0.1" - postcss-minify-gradients "^5.0.2" - postcss-minify-params "^5.0.1" - postcss-minify-selectors "^5.1.0" - postcss-normalize-charset "^5.0.1" - postcss-normalize-display-values "^5.0.1" - postcss-normalize-positions "^5.0.1" - postcss-normalize-repeat-style "^5.0.1" - postcss-normalize-string "^5.0.1" - postcss-normalize-timing-functions "^5.0.1" - postcss-normalize-unicode "^5.0.1" - postcss-normalize-url "^5.0.2" - postcss-normalize-whitespace "^5.0.1" - postcss-ordered-values "^5.0.2" - postcss-reduce-initial "^5.0.1" - postcss-reduce-transforms "^5.0.1" - postcss-svgo "^5.0.2" - postcss-unique-selectors "^5.0.1" + cssnano-utils "^3.0.1" + postcss-calc "^8.2.0" + postcss-colormin "^5.2.4" + postcss-convert-values "^5.0.3" + postcss-discard-comments "^5.0.2" + postcss-discard-duplicates "^5.0.2" + postcss-discard-empty "^5.0.2" + postcss-discard-overridden "^5.0.3" + postcss-merge-longhand "^5.0.5" + postcss-merge-rules "^5.0.5" + postcss-minify-font-values "^5.0.3" + postcss-minify-gradients "^5.0.5" + postcss-minify-params "^5.0.4" + postcss-minify-selectors "^5.1.2" + postcss-normalize-charset "^5.0.2" + postcss-normalize-display-values "^5.0.2" + postcss-normalize-positions "^5.0.3" + postcss-normalize-repeat-style "^5.0.3" + postcss-normalize-string "^5.0.3" + postcss-normalize-timing-functions "^5.0.2" + postcss-normalize-unicode "^5.0.3" + postcss-normalize-url "^5.0.4" + postcss-normalize-whitespace "^5.0.3" + postcss-ordered-values "^5.0.4" + postcss-reduce-initial "^5.0.2" + postcss-reduce-transforms "^5.0.3" + postcss-svgo "^5.0.3" + postcss-unique-selectors "^5.0.3" -cssnano-utils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" - integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== +cssnano-utils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.1.tgz#d3cc0a142d3d217f8736837ec0a2ccff6a89c6ea" + integrity sha512-VNCHL364lh++/ono+S3j9NlUK+d97KNkxI77NlqZU2W3xd2/qmyN61dsa47pTpb55zuU4G4lI7qFjAXZJH1OAQ== cssnano@^5.0.6: - version "5.0.8" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz#39ad166256980fcc64faa08c9bb18bb5789ecfa9" - integrity sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg== + version "5.0.16" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.16.tgz#4ee97d30411693f3de24cef70b36f7ae2a843e04" + integrity sha512-ryhRI9/B9VFCwPbb1z60LLK5/ldoExi7nwdnJzpkLZkm2/r7j2X3jfY+ZvDVJhC/0fPZlrAguYdHNFg0iglPKQ== dependencies: - cssnano-preset-default "^5.1.4" - is-resolvable "^1.1.0" + cssnano-preset-default "^5.1.11" lilconfig "^2.0.3" yaml "^1.10.2" @@ -2041,9 +2054,9 @@ csso@^4.2.0: css-tree "^1.1.2" csstype@^3.0.2: - version "3.0.9" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" - integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== + version "3.0.10" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" + integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== d3-geo-projection@0.2: version "0.2.16" @@ -2067,10 +2080,10 @@ d3@3, d3@^3.5.6: resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g= -damerau-levenshtein@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d" - integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw== +damerau-levenshtein@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" + integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== datamaps@^0.5.9: version "0.5.9" @@ -2101,9 +2114,9 @@ debug@^3.2.7: ms "^2.1.1" debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + 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" @@ -2219,10 +2232,10 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domhandler@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" - integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== +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" @@ -2234,7 +2247,7 @@ domutils@^1.5.1: dom-serializer "0" domelementtype "1" -domutils@^2.6.0: +domutils@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -2266,17 +2279,17 @@ duplexer@^0.1.2: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -electron-to-chromium@^1.3.878: - version "1.3.885" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.885.tgz#c8cec32fbc61364127849ae00f2395a1bae7c454" - integrity sha512-JXKFJcVWrdHa09n4CNZYfYaK6EW5aAew7/wr3L1OnsD1L+JHL+RCtd7QgIsxUbFPeTwPlvnpqNNTOLkoefmtXg== +electron-to-chromium@^1.4.17: + version "1.4.57" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz#2b2766df76ac8dbc0a1d41249bc5684a31849892" + integrity sha512-FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw== emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emoji-regex@^9.0.0: +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== @@ -2415,50 +2428,50 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" - integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== +eslint-module-utils@^2.7.2: + version "2.7.3" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" + integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== dependencies: debug "^3.2.7" find-up "^2.1.0" - pkg-dir "^2.0.0" eslint-plugin-import@^2.22.1: - version "2.25.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz#b3b9160efddb702fc1636659e71ba1d10adbe9e9" - integrity sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g== + version "2.25.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" + integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.0" + eslint-module-utils "^2.7.2" has "^1.0.3" - is-core-module "^2.7.0" + is-core-module "^2.8.0" is-glob "^4.0.3" minimatch "^3.0.4" object.values "^1.1.5" resolve "^1.20.0" - tsconfig-paths "^3.11.0" + tsconfig-paths "^3.12.0" eslint-plugin-jsx-a11y@^6.4.1: - version "6.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd" - integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg== + version "6.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8" + integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g== dependencies: - "@babel/runtime" "^7.11.2" + "@babel/runtime" "^7.16.3" aria-query "^4.2.2" - array-includes "^3.1.1" + array-includes "^3.1.4" ast-types-flow "^0.0.7" - axe-core "^4.0.2" + axe-core "^4.3.5" axobject-query "^2.2.0" - damerau-levenshtein "^1.0.6" - emoji-regex "^9.0.0" + damerau-levenshtein "^1.0.7" + emoji-regex "^9.2.2" has "^1.0.3" - jsx-ast-utils "^3.1.0" + jsx-ast-utils "^3.2.1" language-tags "^1.0.5" + minimatch "^3.0.4" eslint-plugin-prettier@^3.3.0: version "3.4.1" @@ -2468,29 +2481,29 @@ eslint-plugin-prettier@^3.3.0: prettier-linter-helpers "^1.0.0" eslint-plugin-react-hooks@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" - integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" + integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== eslint-plugin-react@^7.21.5: - version "7.26.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e" - integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ== + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz#8f3ff450677571a659ce76efc6d80b6a525adbdf" + integrity sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw== dependencies: - array-includes "^3.1.3" - array.prototype.flatmap "^1.2.4" + array-includes "^3.1.4" + array.prototype.flatmap "^1.2.5" doctrine "^2.1.0" - estraverse "^5.2.0" + estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.0.4" - object.entries "^1.1.4" - object.fromentries "^2.0.4" - object.hasown "^1.0.0" - object.values "^1.1.4" + object.entries "^1.1.5" + object.fromentries "^2.0.5" + object.hasown "^1.1.0" + object.values "^1.1.5" prop-types "^15.7.2" resolve "^2.0.0-next.3" semver "^6.3.0" - string.prototype.matchall "^4.0.5" + string.prototype.matchall "^4.0.6" eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" @@ -2601,7 +2614,7 @@ estraverse@^4.1.1, estraverse@^4.2.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: +estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== @@ -2663,10 +2676,10 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== +fast-glob@^3.2.5, fast-glob@^3.2.7, fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2748,19 +2761,19 @@ flatpickr@^4.6.2: integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw== flatted@^3.1.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" - integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== foreach@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= -fraction.js@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.1.tgz#ac4e520473dae67012d618aab91eda09bcb400ff" - integrity sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg== +fraction.js@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8" + integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA== fs-extra@^10.0.0: version "10.0.0" @@ -2830,7 +2843,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.0, glob-parent@^6.0.1: +glob-parent@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== @@ -2842,7 +2855,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.0.0, glob@^7.1.3: +glob@^7.1.3, glob@^7.1.7: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -2883,15 +2896,15 @@ globals@^13.6.0, globals@^13.9.0: type-fest "^0.20.2" globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" slash "^3.0.0" globjoin@^0.1.4: @@ -2907,9 +2920,9 @@ gonzales-pe@^4.3.0: minimist "^1.2.5" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + 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@^6.0.0: version "6.0.0" @@ -2987,9 +3000,9 @@ hosted-git-info@^2.1.4: integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== hosted-git-info@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -3045,17 +3058,10 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -import-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" - integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg== - dependencies: - import-from "^3.0.0" +ignore@^5.1.8, ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" @@ -3065,22 +3071,15 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966" - integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ== - dependencies: - resolve-from "^5.0.0" - import-lazy@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== import-local@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" - integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -3127,11 +3126,6 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -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-alphabetical@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" @@ -3199,10 +3193,10 @@ is-color-stop@^1.1.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== +is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.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" @@ -3241,9 +3235,9 @@ is-hexadecimal@^1.0.0: integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + 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" @@ -3287,11 +3281,6 @@ is-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d" integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA== -is-resolvable@^1.1.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" @@ -3327,11 +3316,11 @@ is-unicode-supported@^0.1.0: integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== is-weakref@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" - integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== + 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.0" + call-bind "^1.0.2" isarray@0.0.1: version "0.0.1" @@ -3358,10 +3347,10 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -jest-worker@^27.0.2, jest-worker@^27.0.6: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz#0def7feae5b8042be38479799aeb7b5facac24b2" - integrity sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g== +jest-worker@^27.0.2, jest-worker@^27.4.1: + version "27.4.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e" + integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -3438,7 +3427,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: +"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== @@ -3451,7 +3440,7 @@ kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klona@^2.0.4: +klona@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== @@ -3489,15 +3478,15 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lilconfig@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" - integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== +lilconfig@^2.0.3, lilconfig@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + 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-runner@^4.2.0: version "4.2.0" @@ -3514,9 +3503,9 @@ loader-utils@^1.4.0: json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz#3b8d4386f42378d6434d32d7bc08e7a52d39575e" - integrity sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ== + 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" @@ -3542,11 +3531,6 @@ lodash.castarray@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -3706,7 +3690,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0: +merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -3727,22 +3711,17 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.50.0: - version "1.50.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" - integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== +mime-db@1.51.0: + 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.27: - version "2.1.33" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" - integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== + 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.50.0" - -mime@^2.3.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + mime-db "1.51.0" mimic-fn@^2.1.0: version "2.1.0" @@ -3802,6 +3781,11 @@ modern-normalize@^1.1.0: resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7" integrity sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA== +mrmime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b" + integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -3817,15 +3801,10 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -nanocolors@^0.1.12: - version "0.1.12" - resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6" - integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ== - nanoid@^3.1.30: - version "3.1.30" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" - integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== natural-compare@^1.4.0: version "1.4.0" @@ -3896,7 +3875,7 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -nth-check@^2.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== @@ -3919,9 +3898,9 @@ object-hash@^2.2.0: integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + 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-inspect@~1.4.0: version "1.4.1" @@ -3943,7 +3922,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.1.4: +object.entries@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== @@ -3952,7 +3931,7 @@ object.entries@^1.1.4: define-properties "^1.1.3" es-abstract "^1.19.1" -object.fromentries@^2.0.4: +object.fromentries@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== @@ -3961,7 +3940,7 @@ object.fromentries@^2.0.4: define-properties "^1.1.3" es-abstract "^1.19.1" -object.hasown@^1.0.0: +object.hasown@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== @@ -3969,7 +3948,7 @@ object.hasown@^1.0.0: define-properties "^1.1.3" es-abstract "^1.19.1" -object.values@^1.1.4, object.values@^1.1.5: +object.values@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== @@ -4042,13 +4021,6 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -4122,7 +4094,7 @@ path-key@^3.0.0, 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-parse@^1.0.6: +path-parse@^1.0.6, 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== @@ -4156,16 +4128,9 @@ picocolors@^1.0.0: integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -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" + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" @@ -4174,50 +4139,50 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -postcss-calc@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" - integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== +postcss-calc@^8.2.0: + version "8.2.3" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.3.tgz#53b95ce93de19213c2a5fdd71277a81690ef41d0" + integrity sha512-EGM2EBBWqP57N0E7N7WOLT116PJ39dwHVU01WO4XPPQLJfkL2xVgkMZ+TZvCfapj/uJH07UEfKHQNPHzSw/14Q== dependencies: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" -postcss-colormin@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz#2b620b88c0ff19683f3349f4cf9e24ebdafb2c88" - integrity sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw== +postcss-colormin@^5.2.4: + version "5.2.4" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.4.tgz#7726d3f3d24f111d39faff50a6500688225d5324" + integrity sha512-rYlC5015aNqVQt/B6Cy156g7sH5tRUJGmT9xeagYthtKehetbKx7jHxhyLpulP4bs4vbp8u/B2rac0J7S7qPQg== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" - colord "^2.0.1" - postcss-value-parser "^4.1.0" + colord "^2.9.1" + postcss-value-parser "^4.2.0" -postcss-convert-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz#4ec19d6016534e30e3102fdf414e753398645232" - integrity sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg== +postcss-convert-values@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.3.tgz#492db08a28af84d57651f10edc8f6c8fb2f6df40" + integrity sha512-fVkjHm2T0PSMqXUCIhHNWVGjhB9mHEWX2GboVs7j3iCgr6FpIl9c/IdXy0PHWZSQ9LFTRgmj98amxJE6KOnlsA== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-discard-comments@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" - integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== +postcss-discard-comments@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.2.tgz#811ed34e2b6c40713daab0beb4d7a04125927dcd" + integrity sha512-6VQ3pYTsJHEsN2Bic88Aa7J/Brn4Bv8j/rqaFQZkH+pcVkKYwxCIvoMQkykEW7fBjmofdTnQgcivt5CCBJhtrg== -postcss-discard-duplicates@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" - integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== +postcss-discard-duplicates@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.2.tgz#61076f3d256351bdaac8e20aade730fef0609f44" + integrity sha512-LKY81YjUjc78p6rbXIsnppsaFo8XzCoMZkXVILJU//sK0DgPkPSpuq/cZvHss3EtdKvWNYgWzQL+wiJFtEET4g== -postcss-discard-empty@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" - integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== +postcss-discard-empty@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.2.tgz#0676a9bcfc44bb00d338352a45ab80845a31d8f0" + integrity sha512-SxBsbTjlsKUvZLL+dMrdWauuNZU8TBq5IOL/DHa6jBUSXFEwmDqeXRfTIK/FQpPTa8MJMxEHjSV3UbiuyLARPQ== -postcss-discard-overridden@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" - integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== +postcss-discard-overridden@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.3.tgz#004b9818cabb407e60616509267567150b327a3f" + integrity sha512-yRTXknIZA4k8Yo4FiF1xbsLj/VBxfXEWxJNIrtIy6HC9KQ4xJxcPtoaaskh6QptCGrrcGnhKsTsENTRPZOBu4g== postcss-html@^0.36.0: version "0.36.0" @@ -4242,21 +4207,20 @@ postcss-less@^3.1.4: postcss "^7.0.14" postcss-load-config@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.0.tgz#d39c47091c4aec37f50272373a6a648ef5e97829" - integrity sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g== + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.1.tgz#2f53a17f2f543d9e63864460af42efdac0d41f87" + integrity sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg== dependencies: - import-cwd "^3.0.0" - lilconfig "^2.0.3" + lilconfig "^2.0.4" yaml "^1.10.2" postcss-loader@^6.1.1: - version "6.2.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.0.tgz#714370a3f567141cf4cadcdf9575f5234d186bc5" - integrity sha512-H9hv447QjQJVDbHj3OUdciyAXY3v5+UDduzEytAlZCVHCpNAAg/mCSwhYYqZr9BiGYhmYspU8QXxZwiHTLn3yA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" + integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== dependencies: cosmiconfig "^7.0.0" - klona "^2.0.4" + klona "^2.0.5" semver "^7.3.5" postcss-media-query-parser@^0.2.3: @@ -4264,59 +4228,54 @@ postcss-media-query-parser@^0.2.3: resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= -postcss-merge-longhand@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" - integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== +postcss-merge-longhand@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.5.tgz#cbc217ca22fb5a3e6ee22a6a1aa6920ec1f3c628" + integrity sha512-R2BCPJJ/U2oh1uTWEYn9CcJ7MMcQ1iIbj9wfr2s/zHu5om5MP/ewKdaunpfJqR1WYzqCsgnXuRoVXPAzxdqy8g== dependencies: - css-color-names "^1.0.1" - postcss-value-parser "^4.1.0" - stylehacks "^5.0.1" + postcss-value-parser "^4.2.0" + stylehacks "^5.0.2" -postcss-merge-rules@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a" - integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg== +postcss-merge-rules@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.5.tgz#2a18669ec214019884a60f0a0d356803a8138366" + integrity sha512-3Oa26/Pb9VOFVksJjFG45SNoe4nhGvJ2Uc6TlRimqF8uhfOCEhVCaJ3rvEat5UFOn2UZqTY5Da8dFgCh3Iq0Ug== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" - cssnano-utils "^2.0.1" + cssnano-utils "^3.0.1" postcss-selector-parser "^6.0.5" - vendors "^1.0.3" -postcss-minify-font-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" - integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== +postcss-minify-font-values@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.3.tgz#48c455c4cd980ecd07ac9bf3fc58e9d8a2ae4168" + integrity sha512-bC45rVzEwsLhv/cL1eCjoo2OOjbSk9I7HKFBYnBvtyuIZlf7uMipMATXtA0Fc3jwPo3wuPIW1jRJWKzflMh1sA== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-minify-gradients@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz#7c175c108f06a5629925d698b3c4cf7bd3864ee5" - integrity sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ== +postcss-minify-gradients@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.5.tgz#a5572b9c98ed52cbd7414db24b873f8b9e418290" + integrity sha512-/YjvXs8PepsoiZAIpjstOO4IHKwFAqYNqbA1yVdqklM84tbUUneh6omJxGlRlF3mi6K5Pa067Mg6IwqEnYC8Zg== dependencies: - colord "^2.6" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + colord "^2.9.1" + cssnano-utils "^3.0.1" + postcss-value-parser "^4.2.0" -postcss-minify-params@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" - integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== +postcss-minify-params@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.4.tgz#230a4d04456609e614db1d48c2eebc21f6490a45" + integrity sha512-Z0vjod9lRZEmEPfEmA2sCfjbfEEFKefMD3RDIQSUfXK4LpCyWkX1CniUgyNvnjJFLDPSxtgKzozhHhPHKoeGkg== dependencies: - alphanum-sort "^1.0.2" - browserslist "^4.16.0" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - uniqs "^2.0.0" + browserslist "^4.16.6" + cssnano-utils "^3.0.1" + postcss-value-parser "^4.2.0" -postcss-minify-selectors@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" - integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== +postcss-minify-selectors@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.2.tgz#bc9698f713b9dab7f44f1ec30643fcbad9a043c0" + integrity sha512-gpn1nJDMCf3g32y/7kl+jsdamhiYT+/zmEt57RoT9GmzlixBNRPohI7k8UIHelLABhdLf3MSZhtM33xuH5eQOQ== dependencies: - alphanum-sort "^1.0.2" postcss-selector-parser "^6.0.5" postcss-modules-extract-imports@^3.0.0: @@ -4354,96 +4313,91 @@ postcss-nested@5.0.6: dependencies: postcss-selector-parser "^6.0.6" -postcss-normalize-charset@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" - integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== - -postcss-normalize-display-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" - integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-positions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" - integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-normalize-repeat-style@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" - integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-string@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" - integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-normalize-timing-functions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" - integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-unicode@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" - integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== - dependencies: - browserslist "^4.16.0" - postcss-value-parser "^4.1.0" - -postcss-normalize-url@^5.0.2: +postcss-normalize-charset@^5.0.2: version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763" - integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ== + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.2.tgz#eb6130c8a8e950ce25f9ea512de1d9d6a6f81439" + integrity sha512-fEMhYXzO8My+gC009qDc/3bgnFP8Fv1Ic8uw4ec4YTlhIOw63tGPk1YFd7fk9bZUf1DAbkhiL/QPWs9JLqdF2g== + +postcss-normalize-display-values@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz#8b5273c6c7d0a445e6ef226b8a5bb3204a55fb99" + integrity sha512-RxXoJPUR0shSjkMMzgEZDjGPrgXUVYyWA/YwQRicb48H15OClPuaDR7tYokLAlGZ2tCSENEN5WxjgxSD5m4cUw== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-positions@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.3.tgz#b63fcc4ff5fbf65934fafaf83270b2da214711d1" + integrity sha512-U+rmhjrNBvIGYqr/1tD4wXPFFMKUbXsYXvlUCzLi0tOCUS6LoeEAnmVXXJY/MEB/1CKZZwBSs2tmzGawcygVBA== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-repeat-style@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.3.tgz#488c0ad8aac0fa4f66ef56cc8d604b3fd9bf705f" + integrity sha512-uk1+xYx0AMbA3nLSNhbDrqbf/rx+Iuq5tVad2VNyaxxJzx79oGieJ6D9F6AfOL2GtiIbP7vTYlpYHtG+ERFXTg== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-string@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.3.tgz#49e0a1d58a119d5435ef21893ad03136a6e8f0e6" + integrity sha512-Mf2V4JbIDboNGQhW6xW0YREDiYXoX3WrD3EjKkjvnpAJ6W4qqjLnK/c9aioyVFaWWHVdP5zVRw/9DI5S3oLDFw== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-timing-functions@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz#db4f4f49721f47667afd1fdc5edb032f8d9cdb2e" + integrity sha512-Ao0PP6MoYsRU1LxeVUW740ioknvdIUmfr6uAA3xWlQJ9s69/Tupy8qwhuKG3xWfl+KvLMAP9p2WXF9cwuk/7Bg== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-unicode@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.3.tgz#10f0d30093598a58c48a616491cc7fa53256dd43" + integrity sha512-uNC7BmS/7h6to2UWa4RFH8sOTzu2O9dVWPE/F9Vm9GdhONiD/c1kNaCLbmsFHlKWcEx7alNUChQ+jH/QAlqsQw== + dependencies: + browserslist "^4.16.6" + postcss-value-parser "^4.2.0" + +postcss-normalize-url@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz#3b0322c425e31dd275174d0d5db0e466f50810fb" + integrity sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg== dependencies: - is-absolute-url "^3.0.3" normalize-url "^6.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" - integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== +postcss-normalize-whitespace@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.3.tgz#fb6bcc9ff2f834448b802657c7acd0956f4591d1" + integrity sha512-333JWRnX655fSoUbufJ10HJop3c8mrpKkCCUnEmgz/Cb/QEtW+/TMZwDAUt4lnwqP6tCCk0x0b58jqvDgiQm/A== dependencies: - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" -postcss-ordered-values@^5.0.2: +postcss-ordered-values@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.4.tgz#f799dca87a7f17526d31a20085e61768d0b00534" + integrity sha512-taKtGDZtyYUMVYkg+MuJeBUiTF6cGHZmo/qcW7ibvW79UlyKuSHbo6dpCIiqI+j9oJsXWzP+ovIxoyLDOeQFdw== + dependencies: + cssnano-utils "^3.0.1" + postcss-value-parser "^4.2.0" + +postcss-reduce-initial@^5.0.2: version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" - integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ== + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz#fa424ce8aa88a89bc0b6d0f94871b24abe94c048" + integrity sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw== dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-reduce-initial@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" - integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== - dependencies: - browserslist "^4.16.0" + browserslist "^4.16.6" caniuse-api "^3.0.0" -postcss-reduce-transforms@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" - integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== +postcss-reduce-transforms@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.3.tgz#df60fab34698a43073e8b87938c71df7a3b040ac" + integrity sha512-yDnTUab5i7auHiNwdcL1f+pBnqQFf+7eC4cbC7D8Lc1FkvNZhtpkdad+9U4wDdFb84haupMf0rA/Zc5LcTe/3A== dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" postcss-resolve-nested-selector@^0.1.1: version "0.1.1" @@ -4473,44 +4427,42 @@ postcss-scss@^2.1.1: postcss "^7.0.6" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" - integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + 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@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz#bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f" - integrity sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A== +postcss-svgo@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + integrity sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA== dependencies: postcss-value-parser "^4.1.0" - svgo "^2.3.0" + svgo "^2.7.0" postcss-syntax@^0.36.2: version "0.36.2" resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c" integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w== -postcss-unique-selectors@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" - integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== +postcss-unique-selectors@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.3.tgz#07fd116a8fbd9202e7030f7c4952e7b52c26c63d" + integrity sha512-V5tX2hadSSn+miVCluuK1IDGy+7jAXSOfRZ2DQ+s/4uQZb/orDYBjH0CHgFrXsRw78p4QTuEFA9kI6C956UnHQ== dependencies: - alphanum-sort "^1.0.2" postcss-selector-parser "^6.0.5" - uniqs "^2.0.0" postcss-value-parser@^3.3.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.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6: version "7.0.39" @@ -4520,14 +4472,14 @@ postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0. picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.6, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.3.0, postcss@^8.3.5: - version "8.3.11" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" - integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA== +postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.0, postcss@^8.3.5: + version "8.4.5" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" + integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== dependencies: nanoid "^3.1.30" picocolors "^1.0.0" - source-map-js "^0.6.2" + source-map-js "^1.0.1" prelude-ls@^1.2.1: version "1.2.1" @@ -4562,13 +4514,13 @@ progress@^2.0.0: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" - react-is "^16.8.1" + react-is "^16.13.1" punycode@^2.1.0: version "2.1.1" @@ -4576,14 +4528,14 @@ punycode@^2.1.0: integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== purgecss@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz#8147b429f9c09db719e05d64908ea8b672913742" - integrity sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw== + version "4.1.3" + resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz#683f6a133c8c4de7aa82fe2746d1393b214918f7" + integrity sha512-99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw== dependencies: - commander "^6.0.0" - glob "^7.0.0" - postcss "^8.2.1" - postcss-selector-parser "^6.0.2" + commander "^8.0.0" + glob "^7.1.7" + postcss "^8.3.5" + postcss-selector-parser "^6.0.6" queue-microtask@^1.2.2: version "1.2.3" @@ -4639,7 +4591,7 @@ react-flip-move@^3.0.4: resolved "https://registry.yarnpkg.com/react-flip-move/-/react-flip-move-3.0.4.tgz#261f66101fbc305f9b7b28959c5cf8236413ca74" integrity sha512-HyUVv9g3t/BS7Yz9HgrtYSWyRNdR2F81nkj+C5iRY675AwlqCLB5JU9mnZWg0cdVz7IM4iquoyZx70vzZv3Z8Q== -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -4793,9 +4745,9 @@ regenerator-transform@^0.14.2: "@babel/runtime" "^7.8.4" regexp.prototype.flags@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + 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" @@ -4885,12 +4837,13 @@ resolve-pathname@^3.0.0: integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== resolve@^1.1.5, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + 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.2.0" - path-parse "^1.0.6" + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" resolve@^2.0.0-next.3: version "2.0.0-next.3" @@ -4961,7 +4914,7 @@ schema-utils@^2.6.5: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: +schema-utils@^3.0.0, schema-utils@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== @@ -4970,6 +4923,16 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" +schema-utils@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.8.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.0.0" + "semver@2 || 3 || 4 || 5": version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -5042,9 +5005,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== simple-swizzle@^0.2.2: version "0.2.2" @@ -5054,12 +5017,12 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sirv@^1.0.7: - version "1.0.18" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.18.tgz#105fab52fb656ce8a2bebbf36b11052005952899" - integrity sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA== + version "1.0.19" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" + integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== dependencies: "@polka/url" "^1.0.0-next.20" - mime "^2.3.1" + mrmime "^1.0.0" totalist "^1.0.0" slash@^3.0.0: @@ -5081,15 +5044,15 @@ source-list-map@^2.0.0, source-list-map@^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: - version "0.6.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" - integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== +source-map-js@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== source-map-support@~0.5.20: - version "0.5.20" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" - integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + 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" @@ -5131,9 +5094,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.10" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" - integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== specificity@^0.4.1: version "0.4.1" @@ -5186,7 +5149,7 @@ string-width@^4.2.2, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.matchall@^4.0.5: +string.prototype.matchall@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== @@ -5264,12 +5227,12 @@ style-search@^0.1.0: resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI= -stylehacks@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" - integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== +stylehacks@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.2.tgz#fa10e5181c6e8dc0bddb4a3fb372e9ac42bba2ad" + integrity sha512-114zeJdOpTrbQYRD4OU5UWJ99LKUaqCPJTU1HQ/n3q3BwmllFN8kHENaLnOeqVq6AhXrWfxHNZTl33iJ4oy3cQ== dependencies: - browserslist "^4.16.0" + browserslist "^4.16.6" postcss-selector-parser "^6.0.4" stylelint-config-prettier@^8.0.2: @@ -5371,31 +5334,35 @@ supports-color@^8.0.0: 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-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= -svgo@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.7.0.tgz#e164cded22f4408fe4978f082be80159caea1e2d" - integrity sha512-aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w== +svgo@^2.7.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" css-select "^4.1.3" css-tree "^1.1.3" csso "^4.2.0" - nanocolors "^0.1.12" + picocolors "^1.0.0" stable "^0.1.8" table@^6.0.9, table@^6.6.0: - version "6.7.2" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" - integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== dependencies: ajv "^8.0.1" - lodash.clonedeep "^4.5.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.3" @@ -5445,21 +5412,20 @@ tapable@^2.1.1, tapable@^2.2.0: integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.1.2: - version "5.2.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz#ad1be7639b1cbe3ea49fab995cbe7224b31747a1" - integrity sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA== + version "5.3.0" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f" + integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ== dependencies: - jest-worker "^27.0.6" - p-limit "^3.1.0" + jest-worker "^27.4.1" schema-utils "^3.1.1" serialize-javascript "^6.0.0" source-map "^0.6.1" terser "^5.7.2" terser@^5.7.2: - version "5.9.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351" - integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ== + version "5.10.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -5539,10 +5505,10 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -tsconfig-paths@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" - integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== +tsconfig-paths@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" + integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" @@ -5645,11 +5611,6 @@ unified@^9.1.0: trough "^1.0.0" vfile "^4.0.0" -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - unist-util-find-all-after@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6" @@ -5709,11 +5670,6 @@ value-equal@^1.0.1: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== -vendors@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" - integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== - vfile-message@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" @@ -5738,9 +5694,9 @@ vlq@^0.2.2: integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== watchpack@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" - integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" + integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -5761,14 +5717,14 @@ webpack-bundle-analyzer@^4.4.2: ws "^7.3.1" webpack-cli@^4.7.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.1.tgz#b64be825e2d1b130f285c314caa3b1ba9a4632b3" - integrity sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ== + version "4.9.2" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" + integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.0" - "@webpack-cli/info" "^1.4.0" - "@webpack-cli/serve" "^1.6.0" + "@webpack-cli/configtest" "^1.1.1" + "@webpack-cli/info" "^1.4.1" + "@webpack-cli/serve" "^1.6.1" colorette "^2.0.14" commander "^7.0.0" execa "^5.0.0" @@ -5887,9 +5843,9 @@ write-file-atomic@^3.0.3: typedarray-to-buffer "^3.1.5" ws@^7.3.1: - version "7.5.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" - integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== + version "7.5.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" + integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== xtend@^4.0.2, xtend@~4.0.1: version "4.0.2" @@ -5911,11 +5867,6 @@ yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - zwitch@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix index 044005f80e..8429259ef8 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix @@ -10,179 +10,187 @@ }; } { - name = "_babel_code_frame___code_frame_7.16.0.tgz"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha1 = "0dfc80309beec8411e65e706461c408b0bb9b431"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha1 = "44416b6bd7624b998f5b1af5d470856c40138789"; }; } { - name = "_babel_compat_data___compat_data_7.16.0.tgz"; + name = "_babel_compat_data___compat_data_7.16.8.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.0.tgz"; - sha1 = "ea269d7f78deb3a7826c39a4048eecda541ebdaa"; + name = "_babel_compat_data___compat_data_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz"; + sha1 = "31560f9f29fdf1868de8cb55049538a1b9732a60"; }; } { - name = "_babel_core___core_7.16.0.tgz"; + name = "_babel_core___core_7.16.12.tgz"; path = fetchurl { - name = "_babel_core___core_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz"; - sha1 = "c4ff44046f5fe310525cc9eb4ef5147f0c5374d4"; + name = "_babel_core___core_7.16.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz"; + sha1 = "5edc53c1b71e54881315923ae2aedea2522bb784"; }; } { - name = "_babel_generator___generator_7.16.0.tgz"; + name = "_babel_generator___generator_7.16.8.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz"; - sha1 = "d40f3d1d5075e62d3500bccb67f3daa8a95265b2"; + name = "_babel_generator___generator_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz"; + sha1 = "359d44d966b8cd059d543250ce79596f792f2ebe"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; - sha1 = "9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"; + 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"; + sha1 = "bb2339a7534a9c128e3102024c60760a3a7f3862"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz"; - sha1 = "f1a686b92da794020c26582eb852e9accd0d7882"; + 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"; + sha1 = "38d138561ea207f0f69eb1626a418e4f7e6a580b"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz"; - sha1 = "01d615762e796c17952c29e3ede9d6de07d235a8"; + 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"; + sha1 = "06e66c5f299601e6c7da350049315e83209d551b"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.0.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.10.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz"; - sha1 = "090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; + sha1 = "8a6959b9cc818a88815ba3c5474619e9c0f2c21c"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.0.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; - sha1 = "06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; + sha1 = "0cb82b9bac358eb73bfbd73985a776bfa6b14d48"; }; } { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.4.tgz"; + 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.2.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz"; - sha1 = "8867aed79d3ea6cade40f801efb7ac5c66916b10"; + 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"; + sha1 = "52411b445bdb2e676869e5a74960d2d3826d2665"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.0.tgz"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; - sha1 = "753017337a15f46f9c09f674cff10cee9b9d7778"; + 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"; + sha1 = "ff484094a839bde9d89cd63cba017d7aae80ecd7"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; - sha1 = "b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"; + 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"; + sha1 = "12a6d8522fdd834f194e868af6354e8650242b7a"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; - sha1 = "0088c7486b29a9cb5d948b1a1de46db66e089cfa"; + 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"; + sha1 = "f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; - sha1 = "4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"; + 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"; + sha1 = "ea08ac753117a669f1508ba06ebcc49156387419"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz"; - sha1 = "29287040efd197c77636ef75188e81da8bccd5a4"; + 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"; + sha1 = "86bcb19a77a509c7b77d0e22323ef588fa58c246"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.16.0.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; - sha1 = "90538e60b672ecf1b448f5f4f5433d37e79a3ec3"; + 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"; + sha1 = "42b9ca4b2b200123c3b7e726b0ae5153924905b0"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.16.0.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz"; - sha1 = "1c82a8dd4cb34577502ebd2909699b194c3e9bb5"; + 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"; + sha1 = "25612a8091a999704461c8a222d0efec5d091437"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; - sha1 = "cecdb145d70c54096b1564f8e9f10cd7d193b338"; + 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"; + sha1 = "7665faeb721a01ca5327ddc6bba15a5cb34b6a41"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; - sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; + 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"; + sha1 = "a34e3560605abbd31a18546bd2aad3e6d9a174f2"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.0.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz"; - sha1 = "d5aa3b086e13a5fe05238ff40c3a5a0c2dab3ead"; + 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"; + sha1 = "aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.0.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.8.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz"; - sha1 = "73055e8d3cf9bcba8ddb55cad93fedc860f68f17"; + 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"; + sha1 = "29ffaade68a367e2ed09c90901986918d25e57e3"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.16.0.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; - sha1 = "21d6a27620e383e37534cf6c10bba019a6f90517"; + 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"; + sha1 = "e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"; + }; + } + { + 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"; + sha1 = "d656654b9ea08dbb9659b69d61063ccd343ff0f7"; }; } { @@ -194,195 +202,195 @@ }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; - sha1 = "29672f43663e936df370aaeb22beddb3baec7438"; + 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"; + sha1 = "0b648c0c42da9d3920d85ad585f2778620b8726b"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha1 = "220df993bfe904a4a6b02ab4f3385a5ebf6e2389"; + 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"; + sha1 = "e8c602438c4a8195751243da9031d1607d247cad"; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; + 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"; + sha1 = "b203ce62ce5fe153899b617c08957de860de4d23"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.16.0.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.16.8.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz"; - sha1 = "b3cf318afce774dfe75b86767cd6d68f3482e57c"; + 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"; + sha1 = "58afda087c4cd235de92f7ceedebca2c41274200"; }; } { - name = "_babel_helpers___helpers_7.16.0.tgz"; + name = "_babel_helpers___helpers_7.16.7.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.0.tgz"; - sha1 = "875519c979c232f41adfbd43a3b0398c2e388183"; + name = "_babel_helpers___helpers_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz"; + sha1 = "7e3504d708d50344112767c3542fc5e357fffefc"; }; } { - name = "_babel_highlight___highlight_7.16.0.tgz"; + name = "_babel_highlight___highlight_7.16.10.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz"; - sha1 = "6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"; + name = "_babel_highlight___highlight_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz"; + sha1 = "744f2eb81579d6eea753c227b0f570ad785aba88"; }; } { - name = "_babel_parser___parser_7.16.0.tgz"; + name = "_babel_parser___parser_7.16.12.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.0.tgz"; - sha1 = "cf147d7ada0a3655e79bf4b08ee846f00a00a295"; + name = "_babel_parser___parser_7.16.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz"; + sha1 = "9474794f9a650cf5e2f892444227f98e28cdf8b6"; }; } { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.0.tgz"; + 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.0.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.0.tgz"; - sha1 = "efb7f147042aca34ce8156a055906a7abaadeaf0"; + 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"; + sha1 = "4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"; }; } { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.0.tgz"; + 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.0.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.0.tgz"; - sha1 = "358972eaab006f5eb0826183b0c93cbcaf13e1e2"; + 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"; + sha1 = "cc001234dfc139ac45f6bcf801866198c8c72ff9"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz"; - sha1 = "11425d47a60364352f668ad5fbc1d6596b2c5caf"; + 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"; + sha1 = "3bdd1ebbe620804ea9416706cd67d60787504bc8"; }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz"; - sha1 = "c029618267ddebc7280fa286e0f8ca2a278a2d1a"; + 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"; + sha1 = "925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"; }; } { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz"; - sha1 = "5296942c564d8144c83eea347d0aa8a0b89170e7"; + 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"; + sha1 = "712357570b612106ef5426d13dc433ce0f200c2a"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz"; - sha1 = "783eca61d50526202f9b296095453977e88659f1"; + 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"; + sha1 = "c19c897eaa46b27634a00fee9fb7d829158704b2"; }; } { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz"; - sha1 = "9c01dee40b9d6b847b656aaf4a3976a71740f222"; + 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"; + sha1 = "09de09df18445a5786a305681423ae63507a6163"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz"; - sha1 = "cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25"; + 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"; + sha1 = "9732cb1d17d9a2626a08c5be25186c195b6fa6e8"; }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz"; - sha1 = "a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd"; + 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"; + sha1 = "be23c0ba74deec1922e639832904be0bea73cdea"; }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz"; - sha1 = "44e1cce08fe2427482cf446a91bb451528ed0596"; + 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"; + sha1 = "141fc20b6857e59459d430c850a0011e36561d99"; }; } { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz"; - sha1 = "5d418e4fbbf8b9b7d03125d3a52730433a373734"; + 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"; + sha1 = "d6b69f4af63fb38b6ca2558442a7fb191236eba9"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz"; - sha1 = "5fb32f6d924d6e6712810362a60e12a2609872e6"; + 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"; + sha1 = "94593ef1ddf37021a25bdcb5754c4a8d534b01d8"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz"; - sha1 = "5910085811ab4c28b00d6ebffa4ab0274d1e5f16"; + 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"; + sha1 = "c623a430674ffc4ab732fd0a0ae7722b67cb74cf"; }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz"; - sha1 = "56dbc3970825683608e9efb55ea82c2a2d6c8dc0"; + 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"; + sha1 = "7cd629564724816c0e8a969535551f943c64c39a"; }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz"; - sha1 = "b4dafb9c717e4301c5776b30d080d6383c89aff6"; + 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"; + sha1 = "e8df108288555ff259f4527dbe84813aac3a1c50"; }; } { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz"; - sha1 = "69e935b2c5c79d2488112d886f0c4e2790fee76f"; + 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"; + sha1 = "b0b8cef543c2c3d57e59e2c611994861d46a3fce"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz"; - sha1 = "890482dfc5ea378e42e19a71e709728cabf18612"; + 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"; + sha1 = "635d18eb10c6214210ffc5ff4932552de08188a2"; }; } { @@ -434,11 +442,11 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.0.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz"; - sha1 = "f9624394317365a9a88c82358d3f8471154698f1"; + 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"; + sha1 = "50b6571d13f764266a113d77c82b4a6508bbe665"; }; } { @@ -506,299 +514,299 @@ }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz"; - sha1 = "951706f8b449c834ed07bd474c0924c944b95a8e"; + 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"; + sha1 = "44125e653d94b98db76369de9c396dc14bef4154"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz"; - sha1 = "df12637f9630ddfa0ef9d7a11bc414d629d38604"; + 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"; + sha1 = "b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz"; - sha1 = "c618763233ad02847805abcac4c345ce9de7145d"; + 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"; + sha1 = "4d0d57d9632ef6062cdf354bb717102ee042a620"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz"; - sha1 = "bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"; + 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"; + sha1 = "f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.0.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz"; - sha1 = "54cf5ff0b2242c6573d753cd4bfc7077a8b282f5"; + 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"; + sha1 = "8f4b9562850cd973de3b498f1218796eb181ce00"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz"; - sha1 = "e0c385507d21e1b0b076d66bed6d5231b85110b7"; + 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"; + sha1 = "66dee12e46f61d2aae7a73710f591eb3df616470"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"; - sha1 = "ad3d7e74584ad5ea4eadb1e6642146c590dee33c"; + 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"; + sha1 = "ca9588ae2d63978a4c29d3f33282d8603f618e23"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz"; - sha1 = "50bab00c1084b6162d0a58a818031cf57798e06f"; + 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"; + sha1 = "6b2d67686fab15fb6a7fd4bd895d5982cfc81241"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz"; - sha1 = "8bc2e21813e3e89e5e5bf3b60aa5fc458575a176"; + 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"; + sha1 = "2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz"; - sha1 = "a180cd2881e3533cef9d3901e48dad0fbeff4be4"; + 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"; + sha1 = "efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz"; - sha1 = "f7abaced155260e2461359bbc7c7248aca5e6bd2"; + 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"; + sha1 = "649d639d4617dff502a9a158c479b3b556728d8c"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz"; - sha1 = "02e3699c284c6262236599f751065c5d5f1f400e"; + 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"; + sha1 = "5ab34375c64d61d083d7d2f05c38d90b97ec65cf"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.0.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz"; - sha1 = "79711e670ffceb31bd298229d50f3621f7980cac"; + 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"; + sha1 = "254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz"; - sha1 = "5251b4cce01eaf8314403d21aedb269d79f5e64b"; + 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"; + sha1 = "6e5dcf906ef8a098e630149d14c867dd28f92384"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz"; - sha1 = "09abd41e18dcf4fd479c598c1cef7bd39eb1337e"; + 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"; + sha1 = "b28d323016a7daaae8609781d1f8c9da42b13186"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz"; - sha1 = "add58e638c8ddc4875bd9a9ecb5c594613f6c922"; + 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"; + sha1 = "cdee19aae887b16b9d331009aa9a219af7c86afe"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz"; - sha1 = "a92cf240afeb605f4ca16670453024425e421ea4"; + 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"; + sha1 = "887cefaef88e684d29558c2b13ee0563e287c2d7"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz"; - sha1 = "195f26c2ad6d6a391b70880effce18ce625e06a7"; + 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"; + sha1 = "23dad479fa585283dbd22215bff12719171e7618"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz"; - sha1 = "d3db61cc5d5b97986559967cd5ea83e5c32096ca"; + 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"; + sha1 = "7f860e0e40d844a02c9dcf9d84965e7dfd666252"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz"; - sha1 = "af823ab576f752215a49937779a41ca65825ab35"; + 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"; + sha1 = "9967d89a5c243818e0800fdad89db22c5f514244"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz"; - sha1 = "fb20d5806dc6491a06296ac14ea8e8d6fedda72b"; + 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"; + sha1 = "ac359cf8d32cf4354d27a46867999490b6c32a94"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.0.tgz"; - sha1 = "1b50765fc421c229819dc4c7cdb8911660b3c2d7"; + 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"; + sha1 = "a1721f55b99b736511cb7e0152f61f17688f331f"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz"; - sha1 = "a95c552189a96a00059f6776dc4e00e3690c78d1"; + 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"; + sha1 = "2dadac85155436f22c696c4827730e0fe1057a55"; }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.0.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz"; - sha1 = "9a0ad8aa8e8790883a7bd2736f66229a58125676"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz"; + sha1 = "7b6d40d232f4c0f550ea348593db3b21e2404340"; }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.0.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz"; - sha1 = "1cb52874678d23ab11d0d16488d54730807303ef"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz"; + sha1 = "43a00724a3ed2557ed3f276a01a929e6686ac7b8"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.0.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz"; - sha1 = "55b797d4960c3de04e07ad1c0476e2bc6a4889f1"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz"; + sha1 = "86a6a220552afd0e4e1f0388a68a372be7add0d4"; }; } { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.0.tgz"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz"; - sha1 = "23db6ddf558d8abde41b8ad9d59f48ad5532ccab"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz"; + sha1 = "232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.0.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz"; - sha1 = "eaee422c84b0232d03aea7db99c97deeaf6125a4"; + 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"; + sha1 = "9e7576dc476cb89ccc5096fff7af659243b4adeb"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz"; - sha1 = "fff4b9dcb19e12619394bda172d14f2d04c0379c"; + 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"; + sha1 = "1d798e078f7c5958eec952059c460b220a63f586"; }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz"; - sha1 = "090372e3141f7cc324ed70b3daf5379df2fa384d"; + 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"; + sha1 = "e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.0.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz"; - sha1 = "d21ca099bbd53ab307a8621e019a7bd0f40cdcfb"; + 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"; + sha1 = "a303e2122f9f12e0105daeedd0f30fb197d8ff44"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz"; - sha1 = "c35ea31a02d86be485f6aa510184b677a91738fd"; + 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"; + sha1 = "c84741d4f4a38072b9a1e2e3fd56d359552e8660"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz"; - sha1 = "a8eced3a8e7b8e2d40ec4ec4548a45912630d302"; + 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"; + sha1 = "f3d1c45d28967c8e80f53666fc9c3e50618217ab"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz"; - sha1 = "8b19a244c6f8c9d668dca6a6f754ad6ead1128f2"; + 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"; + sha1 = "9cdbe622582c21368bd482b660ba87d5545d4f7e"; }; } { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz"; - sha1 = "1a354064b4c45663a32334f46fa0cf6100b5b1f3"; + 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"; + sha1 = "da8717de7b3287a2c6d659750c964f302b31ece3"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.0.tgz"; + 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.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz"; - sha1 = "293b80950177c8c85aede87cef280259fb995402"; + 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"; + sha1 = "0f7aa4a501198976e25e82702574c34cfebe9ef2"; }; } { - name = "_babel_preset_env___preset_env_7.16.0.tgz"; + name = "_babel_preset_env___preset_env_7.16.11.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.0.tgz"; - sha1 = "97228393d217560d6a1c6c56f0adb9d12bca67f5"; + name = "_babel_preset_env___preset_env_7.16.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz"; + sha1 = "5dd88fd885fae36f88fd7c8342475c9f0abe2982"; }; } { @@ -810,59 +818,59 @@ }; } { - name = "_babel_preset_react___preset_react_7.16.0.tgz"; + name = "_babel_preset_react___preset_react_7.16.7.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.0.tgz"; - sha1 = "f71d3e8dff5218478011df037fad52660ee6d82a"; + name = "_babel_preset_react___preset_react_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz"; + sha1 = "4c18150491edc69c183ff818f9f2aecbe5d93852"; }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.16.0.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.16.8.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz"; - sha1 = "58a7fb00e6948508f12f53a303993e8b6e2f6c70"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz"; + sha1 = "ea533d96eda6fdc76b1812248e9fbd0c11d4a1a7"; }; } { - name = "_babel_runtime___runtime_7.16.0.tgz"; + name = "_babel_runtime___runtime_7.16.7.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz"; - sha1 = "e27b977f2e2088ba24748bf99b5e1dece64e4f0b"; + name = "_babel_runtime___runtime_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz"; + sha1 = "03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"; }; } { - name = "_babel_template___template_7.16.0.tgz"; + name = "_babel_template___template_7.16.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz"; - sha1 = "d16a35ebf4cd74e202083356fab21dd89363ddd6"; + name = "_babel_template___template_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz"; + sha1 = "8d126c8701fde4d66b264b3eba3d96f07666d155"; }; } { - name = "_babel_traverse___traverse_7.16.0.tgz"; + name = "_babel_traverse___traverse_7.16.10.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.0.tgz"; - sha1 = "965df6c6bfc0a958c1e739284d3c9fa4a6e3c45b"; + name = "_babel_traverse___traverse_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz"; + sha1 = "448f940defbe95b5a8029975b051f75993e8239f"; }; } { - name = "_babel_types___types_7.16.0.tgz"; + name = "_babel_types___types_7.16.8.tgz"; path = fetchurl { - name = "_babel_types___types_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz"; - sha1 = "db3b313804f96aadd0b776c4823e127ad67289ba"; + name = "_babel_types___types_7.16.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz"; + sha1 = "0ba5da91dd71e0a4e7781a30f22770831062e3c1"; }; } { - name = "_discoveryjs_json_ext___json_ext_0.5.5.tgz"; + name = "_discoveryjs_json_ext___json_ext_0.5.6.tgz"; path = fetchurl { - name = "_discoveryjs_json_ext___json_ext_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz"; - sha1 = "9283c9ce5b289a3c4f61c12757469e59377f81f3"; + name = "_discoveryjs_json_ext___json_ext_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz"; + sha1 = "d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"; }; } { @@ -874,11 +882,11 @@ }; } { - name = "_headlessui_react___react_1.4.1.tgz"; + name = "_headlessui_react___react_1.4.3.tgz"; path = fetchurl { - name = "_headlessui_react___react_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.1.tgz"; - sha1 = "0a8dbb20e1d63dcea55bfc3ab1b87637aaac7777"; + name = "_headlessui_react___react_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/@headlessui/react/-/react-1.4.3.tgz"; + sha1 = "f77c6bb5cb4a614a5d730fb880cab502d48abf37"; }; } { @@ -898,11 +906,11 @@ }; } { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; path = fetchurl { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; - sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha1 = "b520529ec21d8e5945a1851dfd1c32e94e39ff45"; }; } { @@ -1010,19 +1018,19 @@ }; } { - name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + name = "_types_eslint_scope___eslint_scope_3.7.3.tgz"; path = fetchurl { - name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "8dc390a7b4f9dd9f1284629efce982e41612116e"; + name = "_types_eslint_scope___eslint_scope_3.7.3.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz"; + sha1 = "125b88504b61e3c8bc6f870882003253005c3224"; }; } { - name = "_types_eslint___eslint_7.28.2.tgz"; + name = "_types_eslint___eslint_8.4.1.tgz"; path = fetchurl { - name = "_types_eslint___eslint_7.28.2.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.2.tgz"; - sha1 = "0ff2947cdd305897c52d5372294e8c76f351db68"; + name = "_types_eslint___eslint_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz"; + sha1 = "c48251553e8759db9e656de3efc846954ac32304"; }; } { @@ -1074,11 +1082,11 @@ }; } { - name = "_types_node___node_16.11.6.tgz"; + name = "_types_node___node_17.0.13.tgz"; path = fetchurl { - name = "_types_node___node_16.11.6.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz"; - sha1 = "6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"; + name = "_types_node___node_17.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.13.tgz"; + sha1 = "5ed7ed7c662948335fcad6c412bb42d99ea754e3"; }; } { @@ -1226,27 +1234,27 @@ }; } { - name = "_webpack_cli_configtest___configtest_1.1.0.tgz"; + name = "_webpack_cli_configtest___configtest_1.1.1.tgz"; path = fetchurl { - name = "_webpack_cli_configtest___configtest_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.0.tgz"; - sha1 = "8342bef0badfb7dfd3b576f2574ab80c725be043"; + name = "_webpack_cli_configtest___configtest_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz"; + sha1 = "9f53b1b7946a6efc2a749095a4f450e2932e8356"; }; } { - name = "_webpack_cli_info___info_1.4.0.tgz"; + name = "_webpack_cli_info___info_1.4.1.tgz"; path = fetchurl { - name = "_webpack_cli_info___info_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.0.tgz"; - sha1 = "b9179c3227ab09cbbb149aa733475fcf99430223"; + name = "_webpack_cli_info___info_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz"; + sha1 = "2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"; }; } { - name = "_webpack_cli_serve___serve_1.6.0.tgz"; + name = "_webpack_cli_serve___serve_1.6.1.tgz"; path = fetchurl { - name = "_webpack_cli_serve___serve_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz"; - sha1 = "2c275aa05c895eccebbfc34cfb223c6e8bd591a2"; + name = "_webpack_cli_serve___serve_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz"; + sha1 = "0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"; }; } { @@ -1314,11 +1322,19 @@ }; } { - name = "acorn___acorn_8.5.0.tgz"; + name = "acorn___acorn_8.7.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz"; - sha1 = "4512ccb99b3698c752591e9bb4472e38ad43cee2"; + name = "acorn___acorn_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz"; + sha1 = "90951fde0f8f09df93549481e5fc141445b791cf"; + }; + } + { + name = "ajv_formats___ajv_formats_2.1.1.tgz"; + path = fetchurl { + name = "ajv_formats___ajv_formats_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz"; + sha1 = "6e669400659eb74973bbf2e33327180a0996b520"; }; } { @@ -1329,6 +1345,14 @@ sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } + { + name = "ajv_keywords___ajv_keywords_5.1.0.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz"; + sha1 = "69d4d385a4733cdbeab44964a1170a88f87f0e16"; + }; + } { name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { @@ -1338,19 +1362,11 @@ }; } { - name = "ajv___ajv_8.6.3.tgz"; + name = "ajv___ajv_8.9.0.tgz"; path = fetchurl { - name = "ajv___ajv_8.6.3.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz"; - sha1 = "11a66527761dc3e9a3845ea775d2d3c0414e8764"; - }; - } - { - 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 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + name = "ajv___ajv_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz"; + sha1 = "738019146638824dea25edcf299dcba1b0e7eb18"; }; } { @@ -1482,11 +1498,11 @@ }; } { - name = "autoprefixer___autoprefixer_10.4.0.tgz"; + name = "autoprefixer___autoprefixer_10.4.2.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_10.4.0.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz"; - sha1 = "c3577eb32a1079a440ec253e404eaf1eb21388c8"; + name = "autoprefixer___autoprefixer_10.4.2.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz"; + sha1 = "25e1df09a31a9fba5c40b578936b90d35c9d4d3b"; }; } { @@ -1538,27 +1554,27 @@ }; } { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.3.tgz"; + 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.2.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz"; - sha1 = "6ed8e30981b062f8fe6aca8873a37ebcc8cc1c0f"; + 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"; + sha1 = "440f1b70ccfaabc6b676d196239b138f8a2cfba5"; }; } { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.3.0.tgz"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.1.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz"; - sha1 = "fa7ca3d1ee9ddc6193600ffb632c9785d54918af"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz"; + sha1 = "d66183bf10976ea677f4149a7fcc4d8df43d4060"; }; } { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.3.tgz"; + 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.2.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz"; - sha1 = "2e9808f5027c4336c994992b48a4262580cb8d6d"; + 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"; + sha1 = "2c0678ea47c75c8cc2fbb1852278d8fb68233990"; }; } { @@ -1634,11 +1650,11 @@ }; } { - name = "browserslist___browserslist_4.17.5.tgz"; + name = "browserslist___browserslist_4.19.1.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.17.5.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.5.tgz"; - sha1 = "c827bbe172a4c22b123f5e337533ceebadfdd559"; + name = "browserslist___browserslist_4.19.1.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz"; + sha1 = "4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"; }; } { @@ -1658,11 +1674,11 @@ }; } { - name = "bytes___bytes_3.1.0.tgz"; + name = "bytes___bytes_3.1.2.tgz"; path = fetchurl { - name = "bytes___bytes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + name = "bytes___bytes_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz"; + sha1 = "8b0beeb98605adf1b128fa4386403c009e0221a5"; }; } { @@ -1714,11 +1730,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001274.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001304.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001274.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz"; - sha1 = "26ca36204d15b17601ba6fc35dbdad950a647cc7"; + name = "caniuse_lite___caniuse_lite_1.0.30001304.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz"; + sha1 = "38af55ed3fc8220cb13e35e6e7309c8c65a05559"; }; } { @@ -1762,19 +1778,19 @@ }; } { - name = "chart.js___chart.js_3.6.0.tgz"; + name = "chart.js___chart.js_3.7.0.tgz"; path = fetchurl { - name = "chart.js___chart.js_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/chart.js/-/chart.js-3.6.0.tgz"; - sha1 = "a87fce8431d4e7c5523d721f487f53aada1e42fe"; + name = "chart.js___chart.js_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/chart.js/-/chart.js-3.7.0.tgz"; + sha1 = "7a19c93035341df801d613993c2170a1fcf1d882"; }; } { - name = "chokidar___chokidar_3.5.2.tgz"; + name = "chokidar___chokidar_3.5.3.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; - sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; + name = "chokidar___chokidar_3.5.3.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz"; + sha1 = "1cf37c8707b932bd1af1ae22c0432e2acd1903bd"; }; } { @@ -1842,27 +1858,27 @@ }; } { - name = "color_string___color_string_1.6.0.tgz"; + name = "color_string___color_string_1.9.0.tgz"; path = fetchurl { - name = "color_string___color_string_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz"; - sha1 = "c3915f61fe267672cb7e1e064c9d692219f6c312"; + name = "color_string___color_string_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz"; + sha1 = "63b6ebd1bec11999d1df3a79a7569451ac2be8aa"; }; } { - name = "color___color_4.0.1.tgz"; + name = "color___color_4.2.0.tgz"; path = fetchurl { - name = "color___color_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-4.0.1.tgz"; - sha1 = "21df44cd10245a91b1ccf5ba031609b0e10e7d67"; + name = "color___color_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz"; + sha1 = "0c782459a3e98838ea01e4bc0fb43310ca35af78"; }; } { - name = "colord___colord_2.9.1.tgz"; + name = "colord___colord_2.9.2.tgz"; path = fetchurl { - name = "colord___colord_2.9.1.tgz"; - url = "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz"; - sha1 = "c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e"; + name = "colord___colord_2.9.2.tgz"; + url = "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz"; + sha1 = "25e2bacbbaa65991422c07ea209e2089428effb1"; }; } { @@ -1881,14 +1897,6 @@ sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } - { - name = "commander___commander_6.2.1.tgz"; - path = fetchurl { - name = "commander___commander_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz"; - sha1 = "0792eb682dfbc325999bb2b84fddddba110ac73c"; - }; - } { name = "commander___commander_7.2.0.tgz"; path = fetchurl { @@ -1897,6 +1905,14 @@ sha1 = "a36cb57d0b501ce108e4d20559a150a391d97ab7"; }; } + { + name = "commander___commander_8.3.0.tgz"; + path = fetchurl { + name = "commander___commander_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; + sha1 = "4837ea1b2da67b9c616a67afbb0fafee567bca66"; + }; + } { name = "commondir___commondir_1.0.1.tgz"; path = fetchurl { @@ -1938,27 +1954,27 @@ }; } { - name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + name = "copy_webpack_plugin___copy_webpack_plugin_9.1.0.tgz"; path = fetchurl { - name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz"; - sha1 = "b71d21991599f61a4ee00ba79087b8ba279bbb59"; + name = "copy_webpack_plugin___copy_webpack_plugin_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz"; + sha1 = "2d2c460c4c4695ec0a58afb2801a1205256c4e6b"; }; } { - name = "core_js_compat___core_js_compat_3.19.0.tgz"; + name = "core_js_compat___core_js_compat_3.20.3.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.19.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.0.tgz"; - sha1 = "b3b93f93c8721b3ed52b91f12f964cc410967f8b"; + name = "core_js_compat___core_js_compat_3.20.3.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz"; + sha1 = "d71f85f94eb5e4bea3407412e549daa083d23bd6"; }; } { - name = "core_js_pure___core_js_pure_3.19.0.tgz"; + name = "core_js_pure___core_js_pure_3.20.3.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.19.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.0.tgz"; - sha1 = "db6fdadfdd4dc280ec93b64c3c2e8460e6f10094"; + name = "core_js_pure___core_js_pure_3.20.3.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.20.3.tgz"; + sha1 = "6cc4f36da06c61d95254efc54024fe4797fd5d02"; }; } { @@ -1994,19 +2010,11 @@ }; } { - name = "css_color_names___css_color_names_1.0.1.tgz"; + name = "css_declaration_sorter___css_declaration_sorter_6.1.4.tgz"; path = fetchurl { - name = "css_color_names___css_color_names_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz"; - sha1 = "6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67"; - }; - } - { - name = "css_declaration_sorter___css_declaration_sorter_6.1.3.tgz"; - path = fetchurl { - name = "css_declaration_sorter___css_declaration_sorter_6.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz"; - sha1 = "e9852e4cf940ba79f509d9425b137d1f94438dc2"; + name = "css_declaration_sorter___css_declaration_sorter_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz"; + sha1 = "b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4"; }; } { @@ -2018,19 +2026,19 @@ }; } { - name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.1.1.tgz"; + name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.4.1.tgz"; path = fetchurl { - name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.1.tgz"; - sha1 = "27bafa3b75054713565b2266c64b0228acd18634"; + name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; + sha1 = "ab78f781ced9181992fe7b6e4f3422e76429878f"; }; } { - name = "css_select___css_select_4.1.3.tgz"; + name = "css_select___css_select_4.2.1.tgz"; path = fetchurl { - name = "css_select___css_select_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz"; - sha1 = "a70440f70317f2669118ad74ff105e65849c7067"; + name = "css_select___css_select_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz"; + sha1 = "9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd"; }; } { @@ -2066,27 +2074,27 @@ }; } { - name = "cssnano_preset_default___cssnano_preset_default_5.1.4.tgz"; + name = "cssnano_preset_default___cssnano_preset_default_5.1.11.tgz"; path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz"; - sha1 = "359943bf00c5c8e05489f12dd25f3006f2c1cbd2"; + name = "cssnano_preset_default___cssnano_preset_default_5.1.11.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.11.tgz"; + sha1 = "db10fb1ecee310e8285c5aca45bd8237be206828"; }; } { - name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; + name = "cssnano_utils___cssnano_utils_3.0.1.tgz"; path = fetchurl { - name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz"; - sha1 = "8660aa2b37ed869d2e2f22918196a9a8b6498ce2"; + name = "cssnano_utils___cssnano_utils_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.1.tgz"; + sha1 = "d3cc0a142d3d217f8736837ec0a2ccff6a89c6ea"; }; } { - name = "cssnano___cssnano_5.0.8.tgz"; + name = "cssnano___cssnano_5.0.16.tgz"; path = fetchurl { - name = "cssnano___cssnano_5.0.8.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz"; - sha1 = "39ad166256980fcc64faa08c9bb18bb5789ecfa9"; + name = "cssnano___cssnano_5.0.16.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.16.tgz"; + sha1 = "4ee97d30411693f3de24cef70b36f7ae2a843e04"; }; } { @@ -2098,11 +2106,11 @@ }; } { - name = "csstype___csstype_3.0.9.tgz"; + name = "csstype___csstype_3.0.10.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz"; - sha1 = "6410af31b26bd0520933d02cbc64fce9ce3fbf0b"; + name = "csstype___csstype_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz"; + sha1 = "2ad3a7bed70f35b965707c092e5f30b327c290e5"; }; } { @@ -2138,11 +2146,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz"; - sha1 = "64368003512a1a6992593741a09a9d31a836f55d"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"; + sha1 = "b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"; }; } { @@ -2178,11 +2186,11 @@ }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.3.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha1 = "04266e0b70a98d4462e6e288e38259213332b664"; }; } { @@ -2322,11 +2330,11 @@ }; } { - name = "domhandler___domhandler_4.2.2.tgz"; + name = "domhandler___domhandler_4.3.0.tgz"; path = fetchurl { - name = "domhandler___domhandler_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz"; - sha1 = "e825d721d19a86b8c201a35264e226c678ee755f"; + name = "domhandler___domhandler_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz"; + sha1 = "16c658c626cf966967e306f966b431f77d4a5626"; }; } { @@ -2370,11 +2378,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.885.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.57.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.885.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.885.tgz"; - sha1 = "c8cec32fbc61364127849ae00f2395a1bae7c454"; + name = "electron_to_chromium___electron_to_chromium_1.4.57.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz"; + sha1 = "2b2766df76ac8dbc0a1d41249bc5684a31849892"; }; } { @@ -2530,27 +2538,27 @@ }; } { - name = "eslint_module_utils___eslint_module_utils_2.7.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz"; - sha1 = "b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"; + name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; + sha1 = "ad7e3a10552fdd0642e1e55292781bd6e34876ee"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.25.2.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.25.4.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.25.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz"; - sha1 = "b3b9160efddb702fc1636659e71ba1d10adbe9e9"; + name = "eslint_plugin_import___eslint_plugin_import_2.25.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz"; + sha1 = "322f3f916a4e9e991ac7af32032c25ce313209f1"; }; } { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.5.1.tgz"; path = fetchurl { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; - sha1 = "a2d84caa49756942f42f1ffab9002436391718fd"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.5.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz"; + sha1 = "cdbf2df901040ca140b6ec14715c988889c2a6d8"; }; } { @@ -2562,19 +2570,19 @@ }; } { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; path = fetchurl { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"; - sha1 = "8c229c268d468956334c943bb45fc860280f5556"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz"; + sha1 = "318dbf312e06fab1c835a4abef00121751ac1172"; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz"; - sha1 = "41bcfe3e39e6a5ac040971c1af94437c80daa40e"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz"; + sha1 = "8f3ff450677571a659ce76efc6d80b6a525adbdf"; }; } { @@ -2738,11 +2746,11 @@ }; } { - name = "fast_glob___fast_glob_3.2.7.tgz"; + name = "fast_glob___fast_glob_3.2.11.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; - sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; + name = "fast_glob___fast_glob_3.2.11.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz"; + sha1 = "a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"; }; } { @@ -2834,11 +2842,11 @@ }; } { - name = "flatted___flatted_3.2.2.tgz"; + name = "flatted___flatted_3.2.5.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; - sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha1 = "76c8584f4fc843db64702a6bd04ab7a8bd666da3"; }; } { @@ -2850,11 +2858,11 @@ }; } { - name = "fraction.js___fraction.js_4.1.1.tgz"; + name = "fraction.js___fraction.js_4.1.2.tgz"; path = fetchurl { - name = "fraction.js___fraction.js_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.1.tgz"; - sha1 = "ac4e520473dae67012d618aab91eda09bcb400ff"; + name = "fraction.js___fraction.js_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz"; + sha1 = "13e420a92422b6cf244dff8690ed89401029fbe8"; }; } { @@ -3002,11 +3010,11 @@ }; } { - name = "globby___globby_11.0.4.tgz"; + name = "globby___globby_11.1.0.tgz"; path = fetchurl { - name = "globby___globby_11.0.4.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; - sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + name = "globby___globby_11.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz"; + sha1 = "bd4be98bb042f83d796f7e3811991fbe82a0d34b"; }; } { @@ -3026,11 +3034,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha1 = "041b05df45755e587a24942279b9d113146e1c96"; }; } { @@ -3130,11 +3138,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha1 = "827b82867e9ff1c8d0c4d9d53880397d2c86d224"; }; } { @@ -3210,19 +3218,11 @@ }; } { - name = "ignore___ignore_5.1.8.tgz"; + name = "ignore___ignore_5.2.0.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.8.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; - sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; - }; - } - { - name = "import_cwd___import_cwd_3.0.0.tgz"; - path = fetchurl { - name = "import_cwd___import_cwd_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz"; - sha1 = "20845547718015126ea9b3676b7592fb8bd4cf92"; + name = "ignore___ignore_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; + sha1 = "6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"; }; } { @@ -3233,14 +3233,6 @@ sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; }; } - { - name = "import_from___import_from_3.0.0.tgz"; - path = fetchurl { - name = "import_from___import_from_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz"; - sha1 = "055cfec38cd5a27d8057ca51376d7d3bf0891966"; - }; - } { name = "import_lazy___import_lazy_4.0.0.tgz"; path = fetchurl { @@ -3250,11 +3242,11 @@ }; } { - name = "import_local___import_local_3.0.3.tgz"; + name = "import_local___import_local_3.1.0.tgz"; path = fetchurl { - name = "import_local___import_local_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz"; - sha1 = "4d51c2c495ca9393da259ec66b62e022920211e0"; + name = "import_local___import_local_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz"; + sha1 = "b4479df8a5fd44f6cdce24070675676063c95cb4"; }; } { @@ -3313,14 +3305,6 @@ sha1 = "1a78a0b5965c40a5416d007ad6f50ad27c417df9"; }; } - { - 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"; - sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; - }; - } { name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; path = fetchurl { @@ -3402,11 +3386,11 @@ }; } { - name = "is_core_module___is_core_module_2.8.0.tgz"; + name = "is_core_module___is_core_module_2.8.1.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; - sha1 = "0321336c3d0925e497fd97f5d95cb114a5ccd548"; + 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"; + sha1 = "f59fdfca701d5879d0a6b100a40aa1560ce27211"; }; } { @@ -3458,11 +3442,11 @@ }; } { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + 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"; + sha1 = "7bf6f03a28003b8b3965de3ac26f664d765f3150"; }; } { @@ -3521,14 +3505,6 @@ sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d"; }; } - { - 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"; - sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; - }; - } { name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; path = fetchurl { @@ -3578,11 +3554,11 @@ }; } { - name = "is_weakref___is_weakref_1.0.1.tgz"; + name = "is_weakref___is_weakref_1.0.2.tgz"; path = fetchurl { - name = "is_weakref___is_weakref_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz"; - sha1 = "842dba4ec17fa9ac9850df2d6efbc1737274f2a2"; + name = "is_weakref___is_weakref_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz"; + sha1 = "9529f383a9338205e89765e0392efc2f100f06f2"; }; } { @@ -3626,11 +3602,11 @@ }; } { - name = "jest_worker___jest_worker_27.3.1.tgz"; + name = "jest_worker___jest_worker_27.4.6.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz"; - sha1 = "0def7feae5b8042be38479799aeb7b5facac24b2"; + name = "jest_worker___jest_worker_27.4.6.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz"; + sha1 = "5d2d93db419566cb680752ca0792780e71b3273e"; }; } { @@ -3794,19 +3770,19 @@ }; } { - name = "lilconfig___lilconfig_2.0.3.tgz"; + name = "lilconfig___lilconfig_2.0.4.tgz"; path = fetchurl { - name = "lilconfig___lilconfig_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz"; - sha1 = "68f3005e921dafbd2a2afb48379986aa6d2579fd"; + name = "lilconfig___lilconfig_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz"; + sha1 = "f4507d043d7058b380b6a8f5cb7bcd4b34cee082"; }; } { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + 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"; + sha1 = "eca284f75d2965079309dc0ad9255abb2ebc1632"; }; } { @@ -3826,11 +3802,11 @@ }; } { - name = "loader_utils___loader_utils_2.0.1.tgz"; + name = "loader_utils___loader_utils_2.0.2.tgz"; path = fetchurl { - name = "loader_utils___loader_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz"; - sha1 = "3b8d4386f42378d6434d32d7bc08e7a52d39575e"; + name = "loader_utils___loader_utils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz"; + sha1 = "d6e3b4fb81870721ae4e0868ab11dd638368c129"; }; } { @@ -3857,14 +3833,6 @@ sha1 = "c02513515e309daddd4c24c60cfddcf5976d9115"; }; } - { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - path = fetchurl { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - } { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; path = fetchurl { @@ -4082,27 +4050,19 @@ }; } { - name = "mime_db___mime_db_1.50.0.tgz"; + name = "mime_db___mime_db_1.51.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.50.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz"; - sha1 = "abd4ac94e98d3c0e185016c67ab45d5fde40c11f"; + name = "mime_db___mime_db_1.51.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; + sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; }; } { - name = "mime_types___mime_types_2.1.33.tgz"; + name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.33.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz"; - sha1 = "1fa12a904472fafd068e48d9e8401f74d3f70edb"; - }; - } - { - name = "mime___mime_2.5.2.tgz"; - path = fetchurl { - name = "mime___mime_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; - sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; + name = "mime_types___mime_types_2.1.34.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; + sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; }; } { @@ -4177,6 +4137,14 @@ sha1 = "da8e80140d9221426bd4f725c6e11283d34f90b7"; }; } + { + name = "mrmime___mrmime_1.0.0.tgz"; + path = fetchurl { + name = "mrmime___mrmime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz"; + sha1 = "14d387f0585a5233d291baba339b063752a2398b"; + }; + } { name = "ms___ms_2.0.0.tgz"; path = fetchurl { @@ -4202,19 +4170,11 @@ }; } { - name = "nanocolors___nanocolors_0.1.12.tgz"; + name = "nanoid___nanoid_3.2.0.tgz"; path = fetchurl { - name = "nanocolors___nanocolors_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz"; - sha1 = "8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"; - }; - } - { - name = "nanoid___nanoid_3.1.30.tgz"; - path = fetchurl { - name = "nanoid___nanoid_3.1.30.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz"; - sha1 = "63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"; + name = "nanoid___nanoid_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz"; + sha1 = "62667522da6673971cca916a6d3eff3f415ff80c"; }; } { @@ -4338,11 +4298,11 @@ }; } { - name = "object_inspect___object_inspect_1.11.0.tgz"; + name = "object_inspect___object_inspect_1.12.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; - sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + name = "object_inspect___object_inspect_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz"; + sha1 = "6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"; }; } { @@ -4465,14 +4425,6 @@ sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } - { - name = "p_limit___p_limit_3.1.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; - sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; - }; - } { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { @@ -4603,19 +4555,11 @@ }; } { - name = "picomatch___picomatch_2.3.0.tgz"; + name = "picomatch___picomatch_2.3.1.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; - }; - } - { - 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 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + name = "picomatch___picomatch_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; + sha1 = "3ba3833733646d9d3e4995946c1365a67fb07a42"; }; } { @@ -4627,59 +4571,59 @@ }; } { - name = "postcss_calc___postcss_calc_8.0.0.tgz"; + name = "postcss_calc___postcss_calc_8.2.3.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz"; - sha1 = "a05b87aacd132740a5db09462a3612453e5df90a"; + name = "postcss_calc___postcss_calc_8.2.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.3.tgz"; + sha1 = "53b95ce93de19213c2a5fdd71277a81690ef41d0"; }; } { - name = "postcss_colormin___postcss_colormin_5.2.0.tgz"; + name = "postcss_colormin___postcss_colormin_5.2.4.tgz"; path = fetchurl { - name = "postcss_colormin___postcss_colormin_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz"; - sha1 = "2b620b88c0ff19683f3349f4cf9e24ebdafb2c88"; + name = "postcss_colormin___postcss_colormin_5.2.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.4.tgz"; + sha1 = "7726d3f3d24f111d39faff50a6500688225d5324"; }; } { - name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; + name = "postcss_convert_values___postcss_convert_values_5.0.3.tgz"; path = fetchurl { - name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz"; - sha1 = "4ec19d6016534e30e3102fdf414e753398645232"; + name = "postcss_convert_values___postcss_convert_values_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.3.tgz"; + sha1 = "492db08a28af84d57651f10edc8f6c8fb2f6df40"; }; } { - name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; + name = "postcss_discard_comments___postcss_discard_comments_5.0.2.tgz"; path = fetchurl { - name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz"; - sha1 = "9eae4b747cf760d31f2447c27f0619d5718901fe"; + name = "postcss_discard_comments___postcss_discard_comments_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.2.tgz"; + sha1 = "811ed34e2b6c40713daab0beb4d7a04125927dcd"; }; } { - name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.2.tgz"; path = fetchurl { - name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz"; - sha1 = "68f7cc6458fe6bab2e46c9f55ae52869f680e66d"; + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.2.tgz"; + sha1 = "61076f3d256351bdaac8e20aade730fef0609f44"; }; } { - name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; + name = "postcss_discard_empty___postcss_discard_empty_5.0.2.tgz"; path = fetchurl { - name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz"; - sha1 = "ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8"; + name = "postcss_discard_empty___postcss_discard_empty_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.2.tgz"; + sha1 = "0676a9bcfc44bb00d338352a45ab80845a31d8f0"; }; } { - name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.3.tgz"; path = fetchurl { - name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz"; - sha1 = "454b41f707300b98109a75005ca4ab0ff2743ac6"; + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.3.tgz"; + sha1 = "004b9818cabb407e60616509267567150b327a3f"; }; } { @@ -4707,19 +4651,19 @@ }; } { - name = "postcss_load_config___postcss_load_config_3.1.0.tgz"; + name = "postcss_load_config___postcss_load_config_3.1.1.tgz"; path = fetchurl { - name = "postcss_load_config___postcss_load_config_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.0.tgz"; - sha1 = "d39c47091c4aec37f50272373a6a648ef5e97829"; + name = "postcss_load_config___postcss_load_config_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.1.tgz"; + sha1 = "2f53a17f2f543d9e63864460af42efdac0d41f87"; }; } { - name = "postcss_loader___postcss_loader_6.2.0.tgz"; + name = "postcss_loader___postcss_loader_6.2.1.tgz"; path = fetchurl { - name = "postcss_loader___postcss_loader_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.0.tgz"; - sha1 = "714370a3f567141cf4cadcdf9575f5234d186bc5"; + name = "postcss_loader___postcss_loader_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz"; + sha1 = "0895f7346b1702103d30fdc66e4d494a93c008ef"; }; } { @@ -4731,51 +4675,51 @@ }; } { - name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.5.tgz"; path = fetchurl { - name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz"; - sha1 = "277ada51d9a7958e8ef8cf263103c9384b322a41"; + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.5.tgz"; + sha1 = "cbc217ca22fb5a3e6ee22a6a1aa6920ec1f3c628"; }; } { - name = "postcss_merge_rules___postcss_merge_rules_5.0.2.tgz"; + name = "postcss_merge_rules___postcss_merge_rules_5.0.5.tgz"; path = fetchurl { - name = "postcss_merge_rules___postcss_merge_rules_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz"; - sha1 = "d6e4d65018badbdb7dcc789c4f39b941305d410a"; + name = "postcss_merge_rules___postcss_merge_rules_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.5.tgz"; + sha1 = "2a18669ec214019884a60f0a0d356803a8138366"; }; } { - name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.3.tgz"; path = fetchurl { - name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz"; - sha1 = "a90cefbfdaa075bd3dbaa1b33588bb4dc268addf"; + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.3.tgz"; + sha1 = "48c455c4cd980ecd07ac9bf3fc58e9d8a2ae4168"; }; } { - name = "postcss_minify_gradients___postcss_minify_gradients_5.0.2.tgz"; + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.5.tgz"; path = fetchurl { - name = "postcss_minify_gradients___postcss_minify_gradients_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz"; - sha1 = "7c175c108f06a5629925d698b3c4cf7bd3864ee5"; + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.5.tgz"; + sha1 = "a5572b9c98ed52cbd7414db24b873f8b9e418290"; }; } { - name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; + name = "postcss_minify_params___postcss_minify_params_5.0.4.tgz"; path = fetchurl { - name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz"; - sha1 = "371153ba164b9d8562842fdcd929c98abd9e5b6c"; + name = "postcss_minify_params___postcss_minify_params_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.4.tgz"; + sha1 = "230a4d04456609e614db1d48c2eebc21f6490a45"; }; } { - name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.2.tgz"; path = fetchurl { - name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz"; - sha1 = "4385c845d3979ff160291774523ffa54eafd5a54"; + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.2.tgz"; + sha1 = "bc9698f713b9dab7f44f1ec30643fcbad9a043c0"; }; } { @@ -4819,99 +4763,99 @@ }; } { - name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.2.tgz"; path = fetchurl { - name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz"; - sha1 = "121559d1bebc55ac8d24af37f67bd4da9efd91d0"; + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.2.tgz"; + sha1 = "eb6130c8a8e950ce25f9ea512de1d9d6a6f81439"; }; } { - name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.2.tgz"; path = fetchurl { - name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz"; - sha1 = "62650b965981a955dffee83363453db82f6ad1fd"; + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz"; + sha1 = "8b5273c6c7d0a445e6ef226b8a5bb3204a55fb99"; }; } { - name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz"; - sha1 = "868f6af1795fdfa86fbbe960dceb47e5f9492fe5"; + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.3.tgz"; + sha1 = "b63fcc4ff5fbf65934fafaf83270b2da214711d1"; }; } { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz"; - sha1 = "cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5"; + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.3.tgz"; + sha1 = "488c0ad8aac0fa4f66ef56cc8d604b3fd9bf705f"; }; } { - name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; + name = "postcss_normalize_string___postcss_normalize_string_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz"; - sha1 = "d9eafaa4df78c7a3b973ae346ef0e47c554985b0"; + name = "postcss_normalize_string___postcss_normalize_string_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.3.tgz"; + sha1 = "49e0a1d58a119d5435ef21893ad03136a6e8f0e6"; }; } { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.2.tgz"; path = fetchurl { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz"; - sha1 = "8ee41103b9130429c6cbba736932b75c5e2cb08c"; + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz"; + sha1 = "db4f4f49721f47667afd1fdc5edb032f8d9cdb2e"; }; } { - name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz"; - sha1 = "82d672d648a411814aa5bf3ae565379ccd9f5e37"; + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.3.tgz"; + sha1 = "10f0d30093598a58c48a616491cc7fa53256dd43"; }; } { - name = "postcss_normalize_url___postcss_normalize_url_5.0.2.tgz"; + name = "postcss_normalize_url___postcss_normalize_url_5.0.4.tgz"; path = fetchurl { - name = "postcss_normalize_url___postcss_normalize_url_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz"; - sha1 = "ddcdfb7cede1270740cf3e4dfc6008bd96abc763"; + name = "postcss_normalize_url___postcss_normalize_url_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz"; + sha1 = "3b0322c425e31dd275174d0d5db0e466f50810fb"; }; } { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.3.tgz"; path = fetchurl { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz"; - sha1 = "b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a"; + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.3.tgz"; + sha1 = "fb6bcc9ff2f834448b802657c7acd0956f4591d1"; }; } { - name = "postcss_ordered_values___postcss_ordered_values_5.0.2.tgz"; + name = "postcss_ordered_values___postcss_ordered_values_5.0.4.tgz"; path = fetchurl { - name = "postcss_ordered_values___postcss_ordered_values_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz"; - sha1 = "1f351426977be00e0f765b3164ad753dac8ed044"; + name = "postcss_ordered_values___postcss_ordered_values_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.4.tgz"; + sha1 = "f799dca87a7f17526d31a20085e61768d0b00534"; }; } { - name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.2.tgz"; path = fetchurl { - name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz"; - sha1 = "9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946"; + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz"; + sha1 = "fa424ce8aa88a89bc0b6d0f94871b24abe94c048"; }; } { - name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.3.tgz"; path = fetchurl { - name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz"; - sha1 = "93c12f6a159474aa711d5269923e2383cedcf640"; + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.3.tgz"; + sha1 = "df60fab34698a43073e8b87938c71df7a3b040ac"; }; } { @@ -4947,19 +4891,19 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.9.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; - sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; + 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"; + sha1 = "ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"; }; } { - name = "postcss_svgo___postcss_svgo_5.0.2.tgz"; + name = "postcss_svgo___postcss_svgo_5.0.3.tgz"; path = fetchurl { - name = "postcss_svgo___postcss_svgo_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz"; - sha1 = "bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f"; + name = "postcss_svgo___postcss_svgo_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.3.tgz"; + sha1 = "d945185756e5dfaae07f9edb0d3cae7ff79f9b30"; }; } { @@ -4971,11 +4915,11 @@ }; } { - name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.3.tgz"; path = fetchurl { - name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz"; - sha1 = "3be5c1d7363352eff838bd62b0b07a0abad43bfc"; + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.3.tgz"; + sha1 = "07fd116a8fbd9202e7030f7c4952e7b52c26c63d"; }; } { @@ -4987,11 +4931,11 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + 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"; + sha1 = "723c09920836ba6d3e5af019f92bc0971c02e514"; }; } { @@ -5003,11 +4947,11 @@ }; } { - name = "postcss___postcss_8.3.11.tgz"; + name = "postcss___postcss_8.4.5.tgz"; path = fetchurl { - name = "postcss___postcss_8.3.11.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz"; - sha1 = "c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858"; + name = "postcss___postcss_8.4.5.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz"; + sha1 = "bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"; }; } { @@ -5059,11 +5003,11 @@ }; } { - name = "prop_types___prop_types_15.7.2.tgz"; + name = "prop_types___prop_types_15.8.1.tgz"; path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + name = "prop_types___prop_types_15.8.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz"; + sha1 = "67d87bf1a694f48435cf332c24af10214a3140b5"; }; } { @@ -5075,11 +5019,11 @@ }; } { - name = "purgecss___purgecss_4.0.3.tgz"; + name = "purgecss___purgecss_4.1.3.tgz"; path = fetchurl { - name = "purgecss___purgecss_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz"; - sha1 = "8147b429f9c09db719e05d64908ea8b672913742"; + name = "purgecss___purgecss_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz"; + sha1 = "683f6a133c8c4de7aa82fe2746d1393b214918f7"; }; } { @@ -5291,11 +5235,11 @@ }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; - sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + 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"; + sha1 = "b3f4c0059af9e47eca9f3f660e51d81307e72307"; }; } { @@ -5403,11 +5347,11 @@ }; } { - name = "resolve___resolve_1.20.0.tgz"; + name = "resolve___resolve_1.22.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + name = "resolve___resolve_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; + sha1 = "5e0b8c67c15df57a89bdbabe603a002f21731198"; }; } { @@ -5506,6 +5450,14 @@ sha1 = "bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"; }; } + { + name = "schema_utils___schema_utils_4.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz"; + sha1 = "60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"; + }; + } { name = "semver___semver_5.7.1.tgz"; path = fetchurl { @@ -5595,11 +5547,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.5.tgz"; + name = "signal_exit___signal_exit_3.0.6.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; - sha1 = "9e3e8cc0c75a99472b44321033a7702e7738252f"; + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; }; } { @@ -5611,11 +5563,11 @@ }; } { - name = "sirv___sirv_1.0.18.tgz"; + name = "sirv___sirv_1.0.19.tgz"; path = fetchurl { - name = "sirv___sirv_1.0.18.tgz"; - url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.18.tgz"; - sha1 = "105fab52fb656ce8a2bebbf36b11052005952899"; + name = "sirv___sirv_1.0.19.tgz"; + url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz"; + sha1 = "1d73979b38c7fe91fcba49c85280daa9c2363b49"; }; } { @@ -5643,19 +5595,19 @@ }; } { - name = "source_map_js___source_map_js_0.6.2.tgz"; + name = "source_map_js___source_map_js_1.0.2.tgz"; path = fetchurl { - name = "source_map_js___source_map_js_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; - sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + 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"; + sha1 = "adbc361d9c62df380125e7f161f71c826f1e490c"; }; } { - name = "source_map_support___source_map_support_0.5.20.tgz"; + name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.20.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz"; - sha1 = "12166089f8f5e5e8c56926b377633392dd2cb6c9"; + 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"; + sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; }; } { @@ -5707,11 +5659,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha1 = "0d9becccde7003d6c658d487dd48a32f0bf3014b"; + 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"; + sha1 = "50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"; }; } { @@ -5851,11 +5803,11 @@ }; } { - name = "stylehacks___stylehacks_5.0.1.tgz"; + name = "stylehacks___stylehacks_5.0.2.tgz"; path = fetchurl { - name = "stylehacks___stylehacks_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz"; - sha1 = "323ec554198520986806388c7fdaebc38d2c06fb"; + name = "stylehacks___stylehacks_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.2.tgz"; + sha1 = "fa10e5181c6e8dc0bddb4a3fb372e9ac42bba2ad"; }; } { @@ -5922,6 +5874,14 @@ sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; }; } + { + 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"; + sha1 = "6eda4bd344a3c94aea376d4cc31bc77311039e09"; + }; + } { name = "svg_tags___svg_tags_1.0.0.tgz"; path = fetchurl { @@ -5931,19 +5891,19 @@ }; } { - name = "svgo___svgo_2.7.0.tgz"; + name = "svgo___svgo_2.8.0.tgz"; path = fetchurl { - name = "svgo___svgo_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-2.7.0.tgz"; - sha1 = "e164cded22f4408fe4978f082be80159caea1e2d"; + name = "svgo___svgo_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz"; + sha1 = "4ff80cce6710dc2795f0c7c74101e6764cfccd24"; }; } { - name = "table___table_6.7.2.tgz"; + name = "table___table_6.8.0.tgz"; path = fetchurl { - name = "table___table_6.7.2.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz"; - sha1 = "a8d39b9f5966693ca8b0feba270a78722cbaf3b0"; + name = "table___table_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz"; + sha1 = "87e28f14fa4321c3377ba286f07b79b281a3b3ca"; }; } { @@ -5963,19 +5923,19 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_5.2.4.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.0.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_5.2.4.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz"; - sha1 = "ad1be7639b1cbe3ea49fab995cbe7224b31747a1"; + name = "terser_webpack_plugin___terser_webpack_plugin_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz"; + sha1 = "21641326486ecf91d8054161c816e464435bae9f"; }; } { - name = "terser___terser_5.9.0.tgz"; + name = "terser___terser_5.10.0.tgz"; path = fetchurl { - name = "terser___terser_5.9.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz"; - sha1 = "47d6e629a522963240f2b55fcaa3c99083d2c351"; + name = "terser___terser_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz"; + sha1 = "b86390809c0389105eb0a0b62397563096ddafcc"; }; } { @@ -6075,11 +6035,11 @@ }; } { - name = "tsconfig_paths___tsconfig_paths_3.11.0.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.12.0.tgz"; path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.11.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; - sha1 = "954c1fe973da6339c78e06b03ce2e48810b65f36"; + name = "tsconfig_paths___tsconfig_paths_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz"; + sha1 = "19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"; }; } { @@ -6202,14 +6162,6 @@ sha1 = "67649a1abfc3ab85d2969502902775eb03146975"; }; } - { - 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 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; - }; - } { name = "unist_util_find_all_after___unist_util_find_all_after_3.0.2.tgz"; path = fetchurl { @@ -6290,14 +6242,6 @@ sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; }; } - { - 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"; - sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; - }; - } { name = "vfile_message___vfile_message_2.0.4.tgz"; path = fetchurl { @@ -6323,11 +6267,11 @@ }; } { - name = "watchpack___watchpack_2.2.0.tgz"; + name = "watchpack___watchpack_2.3.1.tgz"; path = fetchurl { - name = "watchpack___watchpack_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz"; - sha1 = "47d78f5415fe550ecd740f99fe2882323a58b1ce"; + name = "watchpack___watchpack_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz"; + sha1 = "4200d9447b401156eeca7767ee610f8809bc9d25"; }; } { @@ -6339,11 +6283,11 @@ }; } { - name = "webpack_cli___webpack_cli_4.9.1.tgz"; + name = "webpack_cli___webpack_cli_4.9.2.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.1.tgz"; - sha1 = "b64be825e2d1b130f285c314caa3b1ba9a4632b3"; + name = "webpack_cli___webpack_cli_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz"; + sha1 = "77c1adaea020c3f9e2db8aad8ea78d235c83659d"; }; } { @@ -6443,11 +6387,11 @@ }; } { - name = "ws___ws_7.5.5.tgz"; + name = "ws___ws_7.5.6.tgz"; path = fetchurl { - name = "ws___ws_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz"; - sha1 = "8b4bc4af518cfabd0473ae4f99144287b33eb881"; + name = "ws___ws_7.5.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz"; + sha1 = "e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"; }; } { @@ -6482,14 +6426,6 @@ sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; }; } - { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - path = fetchurl { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; - }; - } { name = "zwitch___zwitch_1.0.5.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix index 649b76f871..89398a9edb 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2021-04-25"; + version = "2022-01-20"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "0dkw8xq710q0wclyr003357gk0vgb5pmpcx75k13pv56c3mrg9vm"; + sha256 = "sha256-wQW6U24TMnRxQ9zxdq8cMzO0OGX/re065YDhl1AbwO8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix index 3b4af1b86a..8eb1a9e7a8 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.272"; + version = "2.5.274"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; - sha256 = "sha256-30thDjmjc24tChgih0FZyIUU6/aKKl4MAD5yqn0yYa4="; + sha256 = "sha256-l3mvlC/DIJ2W3xLdwSV2gCRDdNGcg6OUW4e1IOihlyQ="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index b3888b7b32..343a1c345c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.8.3"; + version = "5.9"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-1OuhoP+QRZrbdThI/npWbOchLR3MnrH7+lFRf5oVPaU="; + sha256 = "sha256-RVg45GvS0wqEka6b0lv3Acgu1p28fImAbioTCGjG/7c="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 27a4da9622..3ec0360c06 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -604,17 +604,7 @@ self: super: sed -i -e "s|#include |#include |" $i done '';} - else if (abiCompat == "1.17") then { - name = "xorg-server-1.17.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2"; - sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - meta.platforms = lib.platforms.unix; - } else if (abiCompat == "1.18") then { + else if (abiCompat == "1.18") then { name = "xorg-server-1.18.4"; builder = ./builder.sh; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index bcd877183c..7ec06e3659 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -3,14 +3,14 @@ let package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; in package.override rec { - version = "1.22.2"; + version = "1.23.0"; reconstructLock = true; src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "181al3530zdbng6fpcpz35q28cxi3p46ydxff7a2bpm9i7kxnc3i"; + sha256 = "0mf6ya5pw5gh0ld0j5dlsicx3ndhfrm3q683faqcm4ks7c5kjhax"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix index 0085292102..82b3e50e1d 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,22 +4,13 @@ let sources = { - "@babel/cli-7.16.0" = { + "@babel/cli-7.16.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.16.0"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.16.0.tgz"; - sha512 = "WLrM42vKX/4atIoQB+eb0ovUof53UUvecb4qGjU2PDDWRiZr50ZpiV8NpcLo7iSxeGYrRG0Mqembsa+UrTAV6Q=="; - }; - }; - "@babel/code-frame-7.16.0" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.16.8.tgz"; + sha512 = "FTKBbxyk5TclXOGmwYyqelqP5IF6hMxaeJskd85jbR5jBfYlwqgwAbJwnixi1ZBbTqKfFuAA95mdmUFeSRwyJA=="; }; }; "@babel/code-frame-7.16.7" = { @@ -31,76 +22,49 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.16.4" = { + "@babel/compat-data-7.16.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.4"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz"; - sha512 = "1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"; + sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; }; }; - "@babel/core-7.16.5" = { + "@babel/core-7.16.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.16.5"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz"; - sha512 = "wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; + sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; }; }; - "@babel/core-7.16.7" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz"; - sha512 = "aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA=="; - }; - }; - "@babel/generator-7.16.5" = { + "@babel/generator-7.16.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz"; - sha512 = "kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"; + sha512 = "1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw=="; }; }; - "@babel/generator-7.16.7" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz"; - sha512 = "/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg=="; - }; - }; - "@babel/helper-annotate-as-pure-7.16.0" = { + "@babel/helper-annotate-as-pure-7.16.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; - sha512 = "ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; + sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz"; - sha512 = "3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA=="; - }; - }; - "@babel/helper-compilation-targets-7.16.3" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz"; - sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; + sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; "@babel/helper-compilation-targets-7.16.7" = { @@ -112,40 +76,31 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.5" = { + "@babel/helper-create-class-features-plugin-7.16.10" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz"; - sha512 = "NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; + sha512 = "wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.16.0" = { + "@babel/helper-create-regexp-features-plugin-7.16.7" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; - sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; + sha512 = "fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g=="; }; }; - "@babel/helper-define-polyfill-provider-0.3.0" = { + "@babel/helper-define-polyfill-provider-0.3.1" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz"; - sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; - }; - }; - "@babel/helper-environment-visitor-7.16.5" = { - name = "_at_babel_slash_helper-environment-visitor"; - packageName = "@babel/helper-environment-visitor"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz"; - sha512 = "ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; + sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; }; }; "@babel/helper-environment-visitor-7.16.7" = { @@ -157,22 +112,13 @@ let sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.0" = { + "@babel/helper-explode-assignable-expression-7.16.7" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; - sha512 = "Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ=="; - }; - }; - "@babel/helper-function-name-7.16.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; - sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; + sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; }; }; "@babel/helper-function-name-7.16.7" = { @@ -184,15 +130,6 @@ let sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; }; }; - "@babel/helper-get-function-arity-7.16.0" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; - sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ=="; - }; - }; "@babel/helper-get-function-arity-7.16.7" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; @@ -202,15 +139,6 @@ let sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; }; }; - "@babel/helper-hoist-variables-7.16.0" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; - sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; - }; - }; "@babel/helper-hoist-variables-7.16.7" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; @@ -220,22 +148,13 @@ let sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; }; }; - "@babel/helper-member-expression-to-functions-7.16.5" = { + "@babel/helper-member-expression-to-functions-7.16.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz"; - sha512 = "7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw=="; - }; - }; - "@babel/helper-module-imports-7.16.0" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; - sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz"; + sha512 = "VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q=="; }; }; "@babel/helper-module-imports-7.16.7" = { @@ -247,15 +166,6 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.5" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz"; - sha512 = "CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ=="; - }; - }; "@babel/helper-module-transforms-7.16.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; @@ -265,22 +175,13 @@ let sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; }; }; - "@babel/helper-optimise-call-expression-7.16.0" = { + "@babel/helper-optimise-call-expression-7.16.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; - sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="; - }; - }; - "@babel/helper-plugin-utils-7.16.5" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz"; - sha512 = "59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; + sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; }; }; "@babel/helper-plugin-utils-7.16.7" = { @@ -292,31 +193,22 @@ let sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.5" = { + "@babel/helper-remap-async-to-generator-7.16.8" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz"; - sha512 = "X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; + sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; }; }; - "@babel/helper-replace-supers-7.16.5" = { + "@babel/helper-replace-supers-7.16.7" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz"; - sha512 = "ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ=="; - }; - }; - "@babel/helper-simple-access-7.16.0" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; - sha512 = "o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; + sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; "@babel/helper-simple-access-7.16.7" = { @@ -337,15 +229,6 @@ let sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; }; }; - "@babel/helper-split-export-declaration-7.16.0" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; - sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw=="; - }; - }; "@babel/helper-split-export-declaration-7.16.7" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; @@ -355,15 +238,6 @@ let sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; }; }; - "@babel/helper-validator-identifier-7.15.7" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; - }; - }; "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; @@ -373,15 +247,6 @@ let sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/helper-validator-option-7.14.5" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; - }; - }; "@babel/helper-validator-option-7.16.7" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; @@ -391,22 +256,13 @@ let sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; }; }; - "@babel/helper-wrap-function-7.16.5" = { + "@babel/helper-wrap-function-7.16.8" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz"; - sha512 = "2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA=="; - }; - }; - "@babel/helpers-7.16.5" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz"; - sha512 = "TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; + sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; "@babel/helpers-7.16.7" = { @@ -418,202 +274,184 @@ let sha512 = "9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw=="; }; }; - "@babel/highlight-7.16.0" = { + "@babel/highlight-7.16.10" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.0"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; - sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; }; - "@babel/highlight-7.16.7" = { - name = "_at_babel_slash_highlight"; - packageName = "@babel/highlight"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz"; - sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; - }; - }; - "@babel/parser-7.16.6" = { + "@babel/parser-7.16.12" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.6"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz"; - sha512 = "Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"; + sha512 = "VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A=="; }; }; - "@babel/parser-7.16.7" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz"; - sha512 = "sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA=="; - }; - }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { 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.16.2"; + version = "7.16.7"; 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.16.2.tgz"; - sha512 = "h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg=="; + 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.16.7.tgz"; + sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.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.16.0"; + version = "7.16.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.16.0.tgz"; - sha512 = "4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA=="; + url = "https://registry.npmjs.org/@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=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.5" = { + "@babel/plugin-proposal-async-generator-functions-7.16.8" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz"; - sha512 = "C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; + sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.5" = { + "@babel/plugin-proposal-class-properties-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz"; - sha512 = "pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; + sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.5" = { + "@babel/plugin-proposal-class-static-block-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz"; - sha512 = "EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; + sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; }; }; - "@babel/plugin-proposal-decorators-7.16.5" = { + "@babel/plugin-proposal-decorators-7.16.7" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.5.tgz"; - sha512 = "XAiZll5oCdp2Dd2RbXA3LVPlFyIRhhcQy+G34p9ePpl6mjFkbqHAYHovyw2j5mqUrlBf0/+MtOIJ3JGYtz8qaw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.7.tgz"; + sha512 = "DoEpnuXK14XV9btI1k8tzNGCutMclpj4yru8aXKoHlVmbO1s+2A+g2+h4JhcjrxkFJqzbymnLG6j/niOf3iFXQ=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.5" = { + "@babel/plugin-proposal-dynamic-import-7.16.7" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz"; - sha512 = "P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; + sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.5" = { + "@babel/plugin-proposal-export-namespace-from-7.16.7" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz"; - sha512 = "i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; + sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.5" = { + "@babel/plugin-proposal-json-strings-7.16.7" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz"; - sha512 = "QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; + sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.5" = { + "@babel/plugin-proposal-logical-assignment-operators-7.16.7" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz"; - sha512 = "xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; + sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz"; - sha512 = "YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; + sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.5" = { + "@babel/plugin-proposal-numeric-separator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz"; - sha512 = "DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; + sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.16.5" = { + "@babel/plugin-proposal-object-rest-spread-7.16.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz"; - sha512 = "UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz"; + sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.5" = { + "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz"; - sha512 = "ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; + sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.5" = { + "@babel/plugin-proposal-optional-chaining-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz"; - sha512 = "kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; + sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.5" = { + "@babel/plugin-proposal-private-methods-7.16.11" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz"; - sha512 = "+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; + sha512 = "F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.16.5" = { + "@babel/plugin-proposal-private-property-in-object-7.16.7" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz"; - sha512 = "+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; + sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.5" = { + "@babel/plugin-proposal-unicode-property-regex-7.16.7" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz"; - sha512 = "s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; + sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -652,13 +490,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.16.5" = { + "@babel/plugin-syntax-decorators-7.16.7" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.5.tgz"; - sha512 = "3CbYTXfflvyy8O819uhZcZSMedZG4J8yS/NLTc/8T24M9ke1GssTGvg8VZu3Yn2LU5IyQSv1CmPq0a9JWHXJwg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.7.tgz"; + sha512 = "vQ+PxL+srA7g6Rx6I1e15m55gftknl2X8GCUW1JTlkTaXZLJOS0UcaY0eK9jYT7IYf4awn6qwyghVHLDz1WyMw=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -769,15 +607,6 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.16.5" = { - name = "_at_babel_slash_plugin-syntax-typescript"; - packageName = "@babel/plugin-syntax-typescript"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.5.tgz"; - sha512 = "/d4//lZ1Vqb4mZ5xTep3dDK888j7BGM/iKqBmndBaoYAFPlPKrGU608VVBz5JeyAb6YQDjRu1UKqj86UhwWVgw=="; - }; - }; "@babel/plugin-syntax-typescript-7.16.7" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; @@ -787,310 +616,310 @@ let sha512 = "YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.5" = { + "@babel/plugin-transform-arrow-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz"; - sha512 = "8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; + sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.5" = { + "@babel/plugin-transform-async-to-generator-7.16.8" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz"; - sha512 = "TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; + sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.5" = { + "@babel/plugin-transform-block-scoped-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz"; - sha512 = "BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; + sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.5" = { + "@babel/plugin-transform-block-scoping-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz"; - sha512 = "JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; + sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; }; }; - "@babel/plugin-transform-classes-7.16.5" = { + "@babel/plugin-transform-classes-7.16.7" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz"; - sha512 = "DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; + sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.5" = { + "@babel/plugin-transform-computed-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz"; - sha512 = "n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; + sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; }; }; - "@babel/plugin-transform-destructuring-7.16.5" = { + "@babel/plugin-transform-destructuring-7.16.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz"; - sha512 = "GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; + sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.5" = { + "@babel/plugin-transform-dotall-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz"; - sha512 = "iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; + sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.5" = { + "@babel/plugin-transform-duplicate-keys-7.16.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz"; - sha512 = "81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; + sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.5" = { + "@babel/plugin-transform-exponentiation-operator-7.16.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz"; - sha512 = "12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; + sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; }; }; - "@babel/plugin-transform-for-of-7.16.5" = { + "@babel/plugin-transform-for-of-7.16.7" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz"; - sha512 = "+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; + sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; }; }; - "@babel/plugin-transform-function-name-7.16.5" = { + "@babel/plugin-transform-function-name-7.16.7" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz"; - sha512 = "Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; + sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; }; }; - "@babel/plugin-transform-literals-7.16.5" = { + "@babel/plugin-transform-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz"; - sha512 = "B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; + sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.5" = { + "@babel/plugin-transform-member-expression-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz"; - sha512 = "d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; + sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.5" = { + "@babel/plugin-transform-modules-amd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz"; - sha512 = "oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; + sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.16.5" = { + "@babel/plugin-transform-modules-commonjs-7.16.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz"; - sha512 = "ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz"; + sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.16.5" = { + "@babel/plugin-transform-modules-systemjs-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz"; - sha512 = "53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; + sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.5" = { + "@babel/plugin-transform-modules-umd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz"; - sha512 = "qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; + sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.16.8" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz"; - sha512 = "/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA=="; + url = "https://registry.npmjs.org/@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=="; }; }; - "@babel/plugin-transform-new-target-7.16.5" = { + "@babel/plugin-transform-new-target-7.16.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz"; - sha512 = "ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; + sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; }; }; - "@babel/plugin-transform-object-super-7.16.5" = { + "@babel/plugin-transform-object-super-7.16.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz"; - sha512 = "tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; + sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; }; }; - "@babel/plugin-transform-parameters-7.16.5" = { + "@babel/plugin-transform-parameters-7.16.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz"; - sha512 = "B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; + sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; }; }; - "@babel/plugin-transform-property-literals-7.16.5" = { + "@babel/plugin-transform-property-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz"; - sha512 = "+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; + sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.16.5" = { + "@babel/plugin-transform-regenerator-7.16.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz"; - sha512 = "2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; + sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.5" = { + "@babel/plugin-transform-reserved-words-7.16.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz"; - sha512 = "aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; + sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.5" = { + "@babel/plugin-transform-shorthand-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz"; - sha512 = "ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; + sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; }; }; - "@babel/plugin-transform-spread-7.16.5" = { + "@babel/plugin-transform-spread-7.16.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz"; - sha512 = "5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; + sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.5" = { + "@babel/plugin-transform-sticky-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz"; - sha512 = "usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; + sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; }; }; - "@babel/plugin-transform-template-literals-7.16.5" = { + "@babel/plugin-transform-template-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz"; - sha512 = "gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; + sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.5" = { + "@babel/plugin-transform-typeof-symbol-7.16.7" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz"; - sha512 = "ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; + sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; }; }; - "@babel/plugin-transform-typescript-7.16.1" = { + "@babel/plugin-transform-typescript-7.16.8" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.16.1"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz"; - sha512 = "NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz"; + sha512 = "bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.5" = { + "@babel/plugin-transform-unicode-escapes-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz"; - sha512 = "shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; + sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.5" = { + "@babel/plugin-transform-unicode-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz"; - sha512 = "GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; + sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; }; }; - "@babel/preset-env-7.16.5" = { + "@babel/preset-env-7.16.11" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.5.tgz"; - sha512 = "MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz"; + sha512 = "qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -1102,31 +931,22 @@ let sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; }; }; - "@babel/preset-typescript-7.16.5" = { + "@babel/preset-typescript-7.16.7" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.5.tgz"; - sha512 = "lmAWRoJ9iOSvs3DqOndQpj8XqXkzaiQs50VG/zESiI9D3eoZhGriU675xNCr0UwvsuXrhMAGvyk1w+EVWF3u8Q=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz"; + sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; }; }; - "@babel/runtime-7.16.5" = { + "@babel/runtime-7.16.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.5.tgz"; - sha512 = "TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA=="; - }; - }; - "@babel/template-7.16.0" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz"; - sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; + sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; }; }; "@babel/template-7.16.7" = { @@ -1138,40 +958,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.16.5" = { + "@babel/traverse-7.16.10" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz"; - sha512 = "FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"; + sha512 = "yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw=="; }; }; - "@babel/traverse-7.16.7" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz"; - sha512 = "8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ=="; - }; - }; - "@babel/types-7.16.0" = { + "@babel/types-7.16.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.0"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"; - sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; - }; - }; - "@babel/types-7.16.7" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz"; - sha512 = "E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"; + sha512 = "smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -1201,13 +1003,13 @@ let sha512 = "BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ=="; }; }; - "@humanwhocodes/config-array-0.9.2" = { + "@humanwhocodes/config-array-0.9.3" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz"; - sha512 = "UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz"; + sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; }; }; "@humanwhocodes/object-schema-1.2.1" = { @@ -1237,58 +1039,58 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jest/console-27.4.2" = { + "@jest/console-27.4.6" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz"; - sha512 = "xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg=="; + url = "https://registry.npmjs.org/@jest/console/-/console-27.4.6.tgz"; + sha512 = "jauXyacQD33n47A44KrlOVeiXHEXDqapSdfb9kTekOchH/Pd18kBIO1+xxJQRLuG+LUuljFCwTG92ra4NW7SpA=="; }; }; - "@jest/core-27.4.5" = { + "@jest/core-27.4.7" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz"; - sha512 = "3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ=="; + url = "https://registry.npmjs.org/@jest/core/-/core-27.4.7.tgz"; + sha512 = "n181PurSJkVMS+kClIFSX/LLvw9ExSb+4IMtD6YnfxZVerw9ANYtW0bPrm0MJu2pfe9SY9FJ9FtQ+MdZkrZwjg=="; }; }; - "@jest/environment-27.4.4" = { + "@jest/environment-27.4.6" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz"; - sha512 = "q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-27.4.6.tgz"; + sha512 = "E6t+RXPfATEEGVidr84WngLNWZ8ffCPky8RqqRK6u1Bn0LK92INe0MDttyPl/JOzaq92BmDzOeuqk09TvM22Sg=="; }; }; - "@jest/fake-timers-27.4.2" = { + "@jest/fake-timers-27.4.6" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz"; - sha512 = "f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.6.tgz"; + sha512 = "mfaethuYF8scV8ntPpiVGIHQgS0XIALbpY2jt2l7wb/bvq4Q5pDLk4EP4D7SAvYT1QrPOPVZAtbdGAOOyIgs7A=="; }; }; - "@jest/globals-27.4.4" = { + "@jest/globals-27.4.6" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz"; - sha512 = "bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-27.4.6.tgz"; + sha512 = "kAiwMGZ7UxrgPzu8Yv9uvWmXXxsy0GciNejlHvfPIfWkSxChzv6bgTS3YqBkGuHcis+ouMFI2696n2t+XYIeFw=="; }; }; - "@jest/reporters-27.4.5" = { + "@jest/reporters-27.4.6" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz"; - sha512 = "3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.6.tgz"; + sha512 = "+Zo9gV81R14+PSq4wzee4GC2mhAN9i9a7qgJWL90Gpx7fHYkWpTBvwWNZUXvJByYR9tAVBdc8VxDWqfJyIUrIQ=="; }; }; "@jest/source-map-27.4.0" = { @@ -1300,31 +1102,31 @@ let sha512 = "Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ=="; }; }; - "@jest/test-result-27.4.2" = { + "@jest/test-result-27.4.6" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz"; - sha512 = "kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.6.tgz"; + sha512 = "fi9IGj3fkOrlMmhQqa/t9xum8jaJOOAi/lZlm6JXSc55rJMXKHxNDN1oCP39B0/DhNOa2OMupF9BcKZnNtXMOQ=="; }; }; - "@jest/test-sequencer-27.4.5" = { + "@jest/test-sequencer-27.4.6" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz"; - sha512 = "n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.6.tgz"; + sha512 = "3GL+nsf6E1PsyNsJuvPyIz+DwFuCtBdtvPpm/LMXVkBJbdFvQYCDpccYT56qq5BGniXWlE81n2qk1sdXfZebnw=="; }; }; - "@jest/transform-27.4.5" = { + "@jest/transform-27.4.6" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz"; - sha512 = "PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-27.4.6.tgz"; + sha512 = "9MsufmJC8t5JTpWEQJ0OcOOAXaH5ioaIX6uHVBLBMoCZPfKKQF+EqP8kACAvCZ0Y1h2Zr3uOccg8re+Dr5jxyw=="; }; }; "@jest/types-27.4.2" = { @@ -1498,15 +1300,6 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/babel__core-7.1.17" = { - name = "_at_types_slash_babel__core"; - packageName = "@types/babel__core"; - version = "7.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz"; - sha512 = "6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A=="; - }; - }; "@types/babel__core-7.1.18" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; @@ -1624,13 +1417,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jest-27.0.3" = { + "@types/jest-27.4.0" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "27.0.3"; + version = "27.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-27.0.3.tgz"; - sha512 = "cmmwv9t7gBYt7hNKH5Spu7Kuu/DotGa+Ff+JGRKZ4db5eh8PnKS4LuebJ3YLUoyOyIHraTGyULn23YtEAm0VSg=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz"; + sha512 = "gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ=="; }; }; "@types/js-yaml-4.0.5" = { @@ -1687,22 +1480,22 @@ let sha512 = "ICDoQMORMjOSqfNFXT4ENXfwwCir1BPblXNm0SPH7C4Q10ou+pvVagcFAJ+rrzf3A47tGU4K/KbzKu7wO9j45Q=="; }; }; - "@types/node-17.0.4" = { + "@types/node-17.0.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.4"; + version = "17.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.4.tgz"; - sha512 = "6xwbrW4JJiJLgF+zNypN5wr2ykM9/jHcL7rQ8fZe2vuftggjzZeRSM4OwRc6Xk8qWjwJ99qVHo/JgOGmomWRog=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz"; + sha512 = "Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw=="; }; }; - "@types/node-17.0.5" = { + "@types/node-17.0.14" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.5"; + version = "17.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz"; - sha512 = "w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz"; + sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng=="; }; }; "@types/object-assign-deep-0.4.0" = { @@ -1714,13 +1507,13 @@ let sha512 = "3D0F3rHRNDc8cQSXNzwF1jBrJi28Mdrhc10ZLlqbJWDPYRWTTWB9Tc8JoKrgBvLKioXoPoHT6Uzf3s2F7akCUg=="; }; }; - "@types/prettier-2.4.2" = { + "@types/prettier-2.4.3" = { name = "_at_types_slash_prettier"; packageName = "@types/prettier"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz"; - sha512 = "ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA=="; + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.3.tgz"; + sha512 = "QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w=="; }; }; "@types/rimraf-3.0.2" = { @@ -1777,112 +1570,121 @@ let sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; - "@typescript-eslint/eslint-plugin-5.8.0" = { + "@typescript-eslint/eslint-plugin-5.10.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.0.tgz"; - sha512 = "spu1UW7QuBn0nJ6+psnfCc3iVoQAifjKORgBngKOmC8U/1tbe2YJMzYQqDGYB4JCss7L8+RM2kKLb1B1Aw9BNA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.1.tgz"; + sha512 = "xN3CYqFlyE/qOcy978/L0xLR2HlcAGIyIK5sMOasxaaAPfQRj/MmMV6OC3I7NZO84oEUdWCOju34Z9W8E0pFDQ=="; }; }; - "@typescript-eslint/experimental-utils-5.8.0" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "5.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.0.tgz"; - sha512 = "KN5FvNH71bhZ8fKtL+lhW7bjm7cxs1nt+hrDZWIqb6ViCffQcWyLunGrgvISgkRojIDcXIsH+xlFfI4RCDA0xA=="; - }; - }; - "@typescript-eslint/experimental-utils-5.8.1" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "5.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz"; - sha512 = "fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww=="; - }; - }; - "@typescript-eslint/parser-5.8.0" = { + "@typescript-eslint/parser-5.10.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.0.tgz"; - sha512 = "Gleacp/ZhRtJRYs5/T8KQR3pAQjQI89Dn/k+OzyCKOsLiZH2/Vh60cFBTnFsHNI6WAD+lNUo/xGZ4NeA5u0Ipw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.1.tgz"; + sha512 = "GReo3tjNBwR5RnRO0K2wDIDN31cM3MmDtgyQ85oAxAmC5K3j/g85IjP+cDfcqDsDDBf1HNKQAD0WqOYL8jXqUA=="; }; }; - "@typescript-eslint/scope-manager-5.8.0" = { + "@typescript-eslint/scope-manager-5.10.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.0.tgz"; - sha512 = "x82CYJsLOjPCDuFFEbS6e7K1QEWj7u5Wk1alw8A+gnJiYwNnDJk0ib6PCegbaPMjrfBvFKa7SxE3EOnnIQz2Gg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.1.tgz"; + sha512 = "Lyvi559Gvpn94k7+ElXNMEnXu/iundV5uFmCUNnftbFrUbAJ1WBoaGgkbOBm07jVZa682oaBU37ao/NGGX4ZDg=="; }; }; - "@typescript-eslint/scope-manager-5.8.1" = { + "@typescript-eslint/scope-manager-5.10.2" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.8.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz"; - sha512 = "DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.2.tgz"; + sha512 = "39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw=="; }; }; - "@typescript-eslint/types-5.8.0" = { + "@typescript-eslint/type-utils-5.10.1" = { + name = "_at_typescript-eslint_slash_type-utils"; + packageName = "@typescript-eslint/type-utils"; + version = "5.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.1.tgz"; + sha512 = "AfVJkV8uck/UIoDqhu+ptEdBoQATON9GXnhOpPLzkQRJcSChkvD//qsz9JVffl2goxX+ybs5klvacE9vmrQyCw=="; + }; + }; + "@typescript-eslint/types-5.10.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.0.tgz"; - sha512 = "LdCYOqeqZWqCMOmwFnum6YfW9F3nKuxJiR84CdIRN5nfHJ7gyvGpXWqL/AaW0k3Po0+wm93ARAsOdzlZDPCcXg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.1.tgz"; + sha512 = "ZvxQ2QMy49bIIBpTqFiOenucqUyjTQ0WNLhBM6X1fh1NNlYAC6Kxsx8bRTY3jdYsYg44a0Z/uEgQkohbR0H87Q=="; }; }; - "@typescript-eslint/types-5.8.1" = { + "@typescript-eslint/types-5.10.2" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.8.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz"; - sha512 = "L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.2.tgz"; + sha512 = "Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w=="; }; }; - "@typescript-eslint/typescript-estree-5.8.0" = { + "@typescript-eslint/typescript-estree-5.10.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.0.tgz"; - sha512 = "srfeZ3URdEcUsSLbkOFqS7WoxOqn8JNil2NSLO9O+I2/Uyc85+UlfpEvQHIpj5dVts7KKOZnftoJD/Fdv0L7nQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.1.tgz"; + sha512 = "PwIGnH7jIueXv4opcwEbVGDATjGPO1dx9RkUl5LlHDSe+FXxPwFL5W/qYd5/NHr7f6lo/vvTrAzd0KlQtRusJQ=="; }; }; - "@typescript-eslint/typescript-estree-5.8.1" = { + "@typescript-eslint/typescript-estree-5.10.2" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.8.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz"; - sha512 = "26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.2.tgz"; + sha512 = "WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ=="; }; }; - "@typescript-eslint/visitor-keys-5.8.0" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.8.0"; + "@typescript-eslint/utils-5.10.1" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.0.tgz"; - sha512 = "+HDIGOEMnqbxdAHegxvnOqESUH6RWFRR2b8qxP1W9CZnnYh4Usz6MBL+2KMAgPk/P0o9c1HqnYtwzVH6GTIqug=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.1.tgz"; + sha512 = "RRmlITiUbLuTRtn/gcPRi4202niF+q7ylFLCKu4c+O/PcpRvZ/nAUwQ2G00bZgpWkhrNLNnvhZLbDn8Ml0qsQw=="; }; }; - "@typescript-eslint/visitor-keys-5.8.1" = { + "@typescript-eslint/utils-5.10.2" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "5.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.2.tgz"; + sha512 = "vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg=="; + }; + }; + "@typescript-eslint/visitor-keys-5.10.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.8.1"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz"; - sha512 = "SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.1.tgz"; + sha512 = "NjQ0Xinhy9IL979tpoTRuLKxMc0zJC7QVSdeerXs2/QvOy2yRkzX5dRb10X5woNUdJgU8G3nYRDlI33sq1K4YQ=="; + }; + }; + "@typescript-eslint/visitor-keys-5.10.2" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "5.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.2.tgz"; + sha512 = "zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q=="; }; }; "abab-2.0.5" = { @@ -1903,15 +1705,6 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.6.0" = { - name = "acorn"; - packageName = "acorn"; - version = "8.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz"; - sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; - }; - }; "acorn-8.7.0" = { name = "acorn"; packageName = "acorn"; @@ -1966,22 +1759,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.8.2" = { + "ajv-8.9.0" = { name = "ajv"; packageName = "ajv"; - version = "8.8.2"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz"; - sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; - }; - }; - "ansi-colors-4.1.1" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; }; }; "ansi-escapes-4.3.2" = { @@ -2101,13 +1885,13 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "async-3.2.2" = { + "async-3.2.3" = { name = "async"; packageName = "async"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.2.tgz"; - sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="; + url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; "asynckit-0.4.0" = { @@ -2119,22 +1903,22 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.24.0" = { + "axios-0.25.0" = { name = "axios"; packageName = "axios"; - version = "0.24.0"; + version = "0.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"; + sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; }; }; - "babel-jest-27.4.5" = { + "babel-jest-27.4.6" = { name = "babel-jest"; packageName = "babel-jest"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz"; - sha512 = "3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.6.tgz"; + sha512 = "qZL0JT0HS1L+lOuH+xC2DVASR3nunZi/ozGhpgauJHgmI7f8rudxf6hUjEHympdQ/J64CdKmPkgfJ+A3U6QCrg=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -2164,31 +1948,31 @@ let sha512 = "Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw=="; }; }; - "babel-plugin-polyfill-corejs2-0.3.0" = { + "babel-plugin-polyfill-corejs2-0.3.1" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz"; - sha512 = "wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; + sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; }; }; - "babel-plugin-polyfill-corejs3-0.4.0" = { + "babel-plugin-polyfill-corejs3-0.5.1" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz"; - sha512 = "YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz"; + sha512 = "TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A=="; }; }; - "babel-plugin-polyfill-regenerator-0.3.0" = { + "babel-plugin-polyfill-regenerator-0.3.1" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz"; - sha512 = "dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; + sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; }; }; "babel-preset-current-node-syntax-1.0.1" = { @@ -2362,31 +2146,22 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.2.1" = { + "camelcase-6.3.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; - sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001292" = { + "caniuse-lite-1.0.30001304" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001292"; + version = "1.0.30001304"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz"; - sha512 = "jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw=="; - }; - }; - "caniuse-lite-1.0.30001294" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001294"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz"; - sha512 = "LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz"; + sha512 = "bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ=="; }; }; "chalk-2.4.2" = { @@ -2416,13 +2191,13 @@ let sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; }; - "chokidar-3.5.2" = { + "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; - sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; "chownr-1.1.4" = { @@ -2488,15 +2263,6 @@ let sha512 = "iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="; }; }; - "collections-5.1.12" = { - name = "collections"; - packageName = "collections"; - version = "5.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/collections/-/collections-5.1.12.tgz"; - sha512 = "7WV0gdGlQFHjB//+/5JW4CdMnOlf7fWMMeM3EWvuao7RbK0MeFS01bZOgWmIH5DHDejSutf455QUZ56ZjjROXw=="; - }; - }; "color-3.2.1" = { name = "color"; packageName = "color"; @@ -2641,22 +2407,22 @@ let sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; - "core-js-3.20.1" = { + "core-js-3.20.3" = { name = "core-js"; packageName = "core-js"; - version = "3.20.1"; + version = "3.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.1.tgz"; - sha512 = "btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; + sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; }; }; - "core-js-compat-3.20.1" = { + "core-js-compat-3.20.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.20.1"; + version = "3.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.1.tgz"; - sha512 = "AVhKZNpqMV3Jz8hU0YEXXE06qoxtQGsAqU0u1neUngz5IusDJRX/ZJ6t3i7mS7QxNyEONbCo14GprkBrxPlTZA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.3.tgz"; + sha512 = "c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw=="; }; }; "core-util-is-1.0.3" = { @@ -2785,13 +2551,13 @@ let sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; - "deep-object-diff-1.1.0" = { + "deep-object-diff-1.1.7" = { name = "deep-object-diff"; packageName = "deep-object-diff"; - version = "1.1.0"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.0.tgz"; - sha512 = "b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw=="; + url = "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.7.tgz"; + sha512 = "QkgBca0mL08P6HiOjoqvmm6xOAl2W6CT2+34Ljhg0OeFan8cwlcdq8jrLKsBBuUFAZLsN5b6y491KdKEoSo9lg=="; }; }; "deepmerge-4.2.2" = { @@ -2848,13 +2614,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "detect-libc-1.0.3" = { + "detect-libc-2.0.0" = { name = "detect-libc"; packageName = "detect-libc"; - version = "1.0.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.0.tgz"; + sha512 = "S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw=="; }; }; "detect-newline-3.1.0" = { @@ -2920,22 +2686,22 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.28" = { + "electron-to-chromium-1.4.57" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.28"; + version = "1.4.57"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.28.tgz"; - sha512 = "Gzbf0wUtKfyPaqf0Plz+Ctinf9eQIzxEqBHwSvbGfeOm9GMNdLxyu1dNiCUfM+x6r4BE0xUJNh3Nmg9gfAtTmg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz"; + sha512 = "FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw=="; }; }; - "electron-to-chromium-1.4.31" = { + "electron-to-chromium-1.4.59" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.31"; + version = "1.4.59"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz"; - sha512 = "t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.59.tgz"; + sha512 = "AOJ3cAE0TWxz4fQ9zkND5hWrQg16nsZKVz9INOot1oV//u4wWu5xrj9CQMmPTYskkZRunSRc9sAnr4EkexXokg=="; }; }; "emittery-0.8.1" = { @@ -2983,15 +2749,6 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "enquirer-2.3.6" = { - name = "enquirer"; - packageName = "enquirer"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; - sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; - }; - }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -3046,22 +2803,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-8.5.0" = { + "eslint-8.8.0" = { name = "eslint"; packageName = "eslint"; - version = "8.5.0"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz"; - sha512 = "tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg=="; - }; - }; - "eslint-8.6.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz"; - sha512 = "UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz"; + sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; }; }; "eslint-config-google-0.14.0" = { @@ -3073,22 +2821,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-25.3.0" = { + "eslint-plugin-jest-26.0.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "25.3.0"; + version = "26.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.3.0.tgz"; - sha512 = "79WQtuBsTN1S8Y9+7euBYwxIOia/k7ykkl9OCBHL3xuww5ecursHy/D8GCIlvzHVWv85gOkS5Kv6Sh7RxOgK1Q=="; - }; - }; - "eslint-plugin-jest-25.3.3" = { - name = "eslint-plugin-jest"; - packageName = "eslint-plugin-jest"; - version = "25.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.3.3.tgz"; - sha512 = "qi7aduaU4/oWegWo0zH4kbJbx8+Be+ABTr72OnO68zTMcJeeSuyH1CduTGF4ATyNFgpE1zp0u10/gIhe+QDSfg=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.0.0.tgz"; + sha512 = "Fvs0YgJ/nw9FTrnqTuMGVrkozkd07jkQzWm0ajqyHlfcsdkxGfAuv30fgfWHOnHiCr9+1YQ365CcDX7vrNhqQg=="; }; }; "eslint-scope-5.1.1" = { @@ -3127,22 +2866,13 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; - "eslint-visitor-keys-3.1.0" = { + "eslint-visitor-keys-3.2.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz"; - sha512 = "yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="; - }; - }; - "espree-9.2.0" = { - name = "espree"; - packageName = "espree"; - version = "9.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz"; - sha512 = "oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; + sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; }; }; "espree-9.3.0" = { @@ -3244,13 +2974,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-27.4.2" = { + "expect-27.4.6" = { name = "expect"; packageName = "expect"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz"; - sha512 = "BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg=="; + url = "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz"; + sha512 = "1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag=="; }; }; "fast-deep-equal-3.1.3" = { @@ -3262,13 +2992,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.7" = { + "fast-glob-3.2.11" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.7"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; - sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -3379,13 +3109,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.2.4" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "fn.name-1.1.0" = { @@ -3397,13 +3127,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.6" = { + "follow-redirects-1.14.7" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz"; - sha512 = "fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; }; "form-data-3.0.1" = { @@ -3595,13 +3325,13 @@ let sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; }; }; - "globby-11.0.4" = { + "globby-11.1.0" = { name = "globby"; packageName = "globby"; - version = "11.0.4"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; - sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; "glossy-0.1.7" = { @@ -3613,13 +3343,13 @@ let sha1 = "769b5984a96f6066ab9ea758224825ee6c210f0b"; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "handlebars-4.7.7" = { @@ -3793,13 +3523,13 @@ let sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; - "import-local-3.0.3" = { + "import-local-3.1.0" = { name = "import-local"; packageName = "import-local"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz"; - sha512 = "bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA=="; + url = "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"; + sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; }; }; "imurmurhash-0.1.4" = { @@ -3856,13 +3586,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.8.0" = { + "is-core-module-2.8.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; }; "is-extglob-2.1.1" = { @@ -3973,15 +3703,6 @@ let sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; }; }; - "istanbul-lib-instrument-4.0.3" = { - name = "istanbul-lib-instrument"; - packageName = "istanbul-lib-instrument"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; - sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; - }; - }; "istanbul-lib-instrument-5.1.0" = { name = "istanbul-lib-instrument"; packageName = "istanbul-lib-instrument"; @@ -4009,15 +3730,6 @@ let sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; }; - "istanbul-reports-3.1.2" = { - name = "istanbul-reports"; - packageName = "istanbul-reports"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.2.tgz"; - sha512 = "0gHxuT1NNC0aEIL1zbJ+MTgPbbHhU77eJPuU35WKA7TgXiSNlCAx4PENoMrH0Or6M2H80TaZcWKhM0IK6V8gRw=="; - }; - }; "istanbul-reports-3.1.3" = { name = "istanbul-reports"; packageName = "istanbul-reports"; @@ -4027,13 +3739,13 @@ let sha512 = "x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg=="; }; }; - "jest-27.4.5" = { + "jest-27.4.7" = { name = "jest"; packageName = "jest"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz"; - sha512 = "uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg=="; + url = "https://registry.npmjs.org/jest/-/jest-27.4.7.tgz"; + sha512 = "8heYvsx7nV/m8m24Vk26Y87g73Ba6ueUd0MWed/NXMhSZIm62U/llVbS0PJe1SHunbyXjJ/BqG1z9bFjGUIvTg=="; }; }; "jest-changed-files-27.4.2" = { @@ -4045,40 +3757,40 @@ let sha512 = "/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A=="; }; }; - "jest-circus-27.4.5" = { + "jest-circus-27.4.6" = { name = "jest-circus"; packageName = "jest-circus"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz"; - sha512 = "eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw=="; + url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.6.tgz"; + sha512 = "UA7AI5HZrW4wRM72Ro80uRR2Fg+7nR0GESbSI/2M+ambbzVuA63mn5T1p3Z/wlhntzGpIG1xx78GP2YIkf6PhQ=="; }; }; - "jest-cli-27.4.5" = { + "jest-cli-27.4.7" = { name = "jest-cli"; packageName = "jest-cli"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz"; - sha512 = "hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.7.tgz"; + sha512 = "zREYhvjjqe1KsGV15mdnxjThKNDgza1fhDT+iUsXWLCq3sxe9w5xnvyctcYVT5PcdLSjv7Y5dCwTS3FCF1tiuw=="; }; }; - "jest-config-27.4.5" = { + "jest-config-27.4.7" = { name = "jest-config"; packageName = "jest-config"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz"; - sha512 = "t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-27.4.7.tgz"; + sha512 = "xz/o/KJJEedHMrIY9v2ParIoYSrSVY6IVeE4z5Z3i101GoA5XgfbJz+1C8EYPsv7u7f39dS8F9v46BHDhn0vlw=="; }; }; - "jest-diff-27.4.2" = { + "jest-diff-27.4.6" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz"; - sha512 = "ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz"; + sha512 = "zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w=="; }; }; "jest-docblock-27.4.0" = { @@ -4090,31 +3802,31 @@ let sha512 = "7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg=="; }; }; - "jest-each-27.4.2" = { + "jest-each-27.4.6" = { name = "jest-each"; packageName = "jest-each"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz"; - sha512 = "53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-27.4.6.tgz"; + sha512 = "n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA=="; }; }; - "jest-environment-jsdom-27.4.4" = { + "jest-environment-jsdom-27.4.6" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz"; - sha512 = "cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz"; + sha512 = "o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA=="; }; }; - "jest-environment-node-27.4.4" = { + "jest-environment-node-27.4.6" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz"; - sha512 = "D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.6.tgz"; + sha512 = "yfHlZ9m+kzTKZV0hVfhVu6GuDxKAYeFHrfulmy7Jxwsq4V7+ZK7f+c0XP/tbVDMQW7E4neG2u147hFkuVz0MlQ=="; }; }; "jest-get-type-27.4.0" = { @@ -4126,58 +3838,58 @@ let sha512 = "tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="; }; }; - "jest-haste-map-27.4.5" = { + "jest-haste-map-27.4.6" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz"; - sha512 = "oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.6.tgz"; + sha512 = "0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ=="; }; }; - "jest-jasmine2-27.4.5" = { + "jest-jasmine2-27.4.6" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz"; - sha512 = "oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.6.tgz"; + sha512 = "uAGNXF644I/whzhsf7/qf74gqy9OuhvJ0XYp8SDecX2ooGeaPnmJMjXjKt0mqh1Rl5dtRGxJgNrHlBQIBfS5Nw=="; }; }; - "jest-leak-detector-27.4.2" = { + "jest-leak-detector-27.4.6" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz"; - sha512 = "ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.6.tgz"; + sha512 = "kkaGixDf9R7CjHm2pOzfTxZTQQQ2gHTIWKY/JZSiYTc90bZp8kSZnUMS3uLAfwTZwc0tcMRoEX74e14LG1WapA=="; }; }; - "jest-matcher-utils-27.4.2" = { + "jest-matcher-utils-27.4.6" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz"; - sha512 = "jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz"; + sha512 = "XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA=="; }; }; - "jest-message-util-27.4.2" = { + "jest-message-util-27.4.6" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz"; - sha512 = "OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz"; + sha512 = "0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA=="; }; }; - "jest-mock-27.4.2" = { + "jest-mock-27.4.6" = { name = "jest-mock"; packageName = "jest-mock"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz"; - sha512 = "PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.6.tgz"; + sha512 = "kvojdYRkst8iVSZ1EJ+vc1RRD9llueBjKzXzeCytH3dMM7zvPV/ULcfI2nr0v0VUgm3Bjt3hBCQvOeaBz+ZTHw=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -4198,40 +3910,40 @@ let sha512 = "WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg=="; }; }; - "jest-resolve-27.4.5" = { + "jest-resolve-27.4.6" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz"; - sha512 = "xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.6.tgz"; + sha512 = "SFfITVApqtirbITKFAO7jOVN45UgFzcRdQanOFzjnbd+CACDoyeX7206JyU92l4cRr73+Qy/TlW51+4vHGt+zw=="; }; }; - "jest-resolve-dependencies-27.4.5" = { + "jest-resolve-dependencies-27.4.6" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz"; - sha512 = "elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.6.tgz"; + sha512 = "W85uJZcFXEVZ7+MZqIPCscdjuctruNGXUZ3OHSXOfXR9ITgbUKeHj+uGcies+0SsvI5GtUfTw4dY7u9qjTvQOw=="; }; }; - "jest-runner-27.4.5" = { + "jest-runner-27.4.6" = { name = "jest-runner"; packageName = "jest-runner"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz"; - sha512 = "/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.6.tgz"; + sha512 = "IDeFt2SG4DzqalYBZRgbbPmpwV3X0DcntjezPBERvnhwKGWTW7C5pbbA5lVkmvgteeNfdd/23gwqv3aiilpYPg=="; }; }; - "jest-runtime-27.4.5" = { + "jest-runtime-27.4.6" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz"; - sha512 = "CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.6.tgz"; + sha512 = "eXYeoR/MbIpVDrjqy5d6cGCFOYBFFDeKaNWqTp0h6E74dK0zLHzASQXJpl5a2/40euBmKnprNLJ0Kh0LCndnWQ=="; }; }; "jest-serializer-27.4.0" = { @@ -4243,13 +3955,13 @@ let sha512 = "RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ=="; }; }; - "jest-snapshot-27.4.5" = { + "jest-snapshot-27.4.6" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz"; - sha512 = "eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.6.tgz"; + sha512 = "fafUCDLQfzuNP9IRcEqaFAMzEe7u5BF7mude51wyWv7VRex60WznZIC7DfKTgSIlJa8aFzYmXclmN328aqSDmQ=="; }; }; "jest-util-27.4.2" = { @@ -4261,31 +3973,40 @@ let sha512 = "YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA=="; }; }; - "jest-validate-27.4.2" = { + "jest-validate-27.4.6" = { name = "jest-validate"; packageName = "jest-validate"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz"; - sha512 = "hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.6.tgz"; + sha512 = "872mEmCPVlBqbA5dToC57vA3yJaMRfIdpCoD3cyHWJOMx+SJwLNw0I71EkWs41oza/Er9Zno9XuTkRYCPDUJXQ=="; }; }; - "jest-watcher-27.4.2" = { + "jest-watcher-27.4.6" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz"; - sha512 = "NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.6.tgz"; + sha512 = "yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw=="; }; }; - "jest-worker-27.4.5" = { + "jest-worker-27.4.6" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz"; - sha512 = "f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz"; + sha512 = "gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw=="; + }; + }; + "js-sdsl-2.1.4" = { + name = "js-sdsl"; + packageName = "js-sdsl"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-2.1.4.tgz"; + sha512 = "/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A=="; }; }; "js-tokens-4.0.0" = { @@ -4477,13 +4198,13 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; - "logform-2.3.0" = { + "logform-2.3.2" = { name = "logform"; packageName = "logform"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz"; - sha512 = "graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ=="; + url = "https://registry.npmjs.org/logform/-/logform-2.3.2.tgz"; + sha512 = "V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA=="; }; }; "lru-cache-6.0.0" = { @@ -4531,13 +4252,13 @@ let sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; }; }; - "marked-3.0.8" = { + "marked-4.0.12" = { name = "marked"; packageName = "marked"; - version = "3.0.8"; + version = "4.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz"; - sha512 = "0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw=="; + url = "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz"; + sha512 = "hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ=="; }; }; "merge-stream-2.0.0" = { @@ -4666,13 +4387,13 @@ let sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "mqtt-4.3.1" = { + "mqtt-4.3.4" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.1"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.1.tgz"; - sha512 = "262jQ0K3CHnG8WxDvWTqQ99gSI26+gGKax4xoTizkLQZInX8jhwqS9YCCO5F8kCdqpKnEkNdlMva6n7PFbxDfw=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.4.tgz"; + sha512 = "yAVDfVHz3Cjn6K68z54mf7fTni/AWsPhiEsRwZSvet2wO47R6NFUn2psWxYIph2JxWtL3ZKa/da8pjJKSaXPdQ=="; }; }; "mqtt-packet-6.10.0" = { @@ -4810,13 +4531,13 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; - "number-allocator-1.0.7" = { + "number-allocator-1.0.9" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.7.tgz"; - sha512 = "l8nkXEe+uaRWbP3qqPKRphy5BpYOYKOhrY0vE7NVQvNpVto+zSNsEMiQ4UHbGP1LrVeDTFFBVBoGaSoi9OWMqQ=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz"; + sha512 = "sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw=="; }; }; "number-is-nan-1.0.1" = { @@ -5035,13 +4756,13 @@ let sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; }; }; - "picomatch-2.3.0" = { + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; - sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "pify-4.0.1" = { @@ -5053,13 +4774,13 @@ let sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; }; }; - "pirates-4.0.4" = { + "pirates-4.0.5" = { name = "pirates"; packageName = "pirates"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz"; - sha512 = "ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw=="; + url = "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"; + sha512 = "8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="; }; }; "pkg-dir-4.2.0" = { @@ -5071,13 +4792,13 @@ let sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; }; - "prebuild-install-7.0.0" = { + "prebuild-install-7.0.1" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.0.tgz"; - sha512 = "IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; }; }; "prelude-ls-1.1.2" = { @@ -5098,13 +4819,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-27.4.2" = { + "pretty-format-27.4.6" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz"; - sha512 = "p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz"; + sha512 = "NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g=="; }; }; "process-nextick-args-2.0.1" = { @@ -5116,15 +4837,6 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "progress-2.0.3" = { - name = "progress"; - packageName = "progress"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; - }; - }; "prompts-2.4.2" = { name = "prompts"; packageName = "prompts"; @@ -5323,13 +5035,13 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "resolve-1.20.0" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "resolve-cwd-3.0.0" = { @@ -5431,6 +5143,15 @@ let sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; }; }; + "safe-stable-stringify-2.3.1" = { + name = "safe-stable-stringify"; + packageName = "safe-stable-stringify"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -5548,13 +5269,13 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shiki-0.9.15" = { + "shiki-0.10.0" = { name = "shiki"; packageName = "shiki"; - version = "0.9.15"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/shiki/-/shiki-0.9.15.tgz"; - sha512 = "/Y0z9IzhJ8nD9nbceORCqu6NgT9X6I8Fk8c3SICHI5NbZRLdZYFaB233gwct9sU0vvSypyaL/qaKvzyQGJBZSw=="; + url = "https://registry.npmjs.org/shiki/-/shiki-0.10.0.tgz"; + sha512 = "iczxaIYeBFHTFrQPb9DVy2SKgYxC4Wo7Iucm7C17cCh2Ge/refnvHscUOxM85u57MfLoNOtjoEFUWt9gBexblA=="; }; }; "signal-exit-3.0.6" = { @@ -5575,13 +5296,13 @@ let sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; - "simple-get-4.0.0" = { + "simple-get-4.0.1" = { name = "simple-get"; packageName = "simple-get"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz"; - sha512 = "ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; "simple-swizzle-0.2.2" = { @@ -5854,6 +5575,15 @@ let sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; }; }; + "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=="; + }; + }; "symbol-tree-3.2.4" = { name = "symbol-tree"; packageName = "symbol-tree"; @@ -6115,22 +5845,22 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typedoc-0.22.10" = { + "typedoc-0.22.11" = { name = "typedoc"; packageName = "typedoc"; - version = "0.22.10"; + version = "0.22.11"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc/-/typedoc-0.22.10.tgz"; - sha512 = "hQYZ4WtoMZ61wDC6w10kxA42+jclWngdmztNZsDvIz7BMJg7F2xnT+uYsUa7OluyKossdFj9E9Ye4QOZKTy8SA=="; + url = "https://registry.npmjs.org/typedoc/-/typedoc-0.22.11.tgz"; + sha512 = "pVr3hh6dkS3lPPaZz1fNpvcrqLdtEvXmXayN55czlamSgvEjh+57GUqfhAI1Xsuu/hNHUT1KNSx8LH2wBP/7SA=="; }; }; - "typedoc-plugin-markdown-3.11.8" = { + "typedoc-plugin-markdown-3.11.12" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "3.11.8"; + version = "3.11.12"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.8.tgz"; - sha512 = "j2Kwi/RnwDwiNr9CMy4lrwB9+1alwjrMakb9+7S0Bz9gnDsdqamOguZ6e27iB97U18nK6GBeR8qDarIyoJYDCg=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.12.tgz"; + sha512 = "gb/RuzgZ1zCnRUOqUg6firIqU7xDs9s7hq0vlU/gAsFfVCnpl3NTM9vPyPON75nnpfVFCxr/hmKQ01k1CYY/Qg=="; }; }; "typedoc-plugin-no-inherit-1.3.1" = { @@ -6151,22 +5881,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-4.5.4" = { + "typescript-4.5.5" = { name = "typescript"; packageName = "typescript"; - version = "4.5.4"; + version = "4.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz"; - sha512 = "VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; + sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; - "uglify-js-3.14.5" = { + "uglify-js-3.15.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.5"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz"; - sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz"; + sha512 = "x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg=="; }; }; "unicode-canonical-property-names-ecmascript-2.0.0" = { @@ -6259,13 +5989,13 @@ let sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; - "v8-to-istanbul-8.1.0" = { + "v8-to-istanbul-8.1.1" = { name = "v8-to-istanbul"; packageName = "v8-to-istanbul"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz"; - sha512 = "/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA=="; + url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz"; + sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; }; }; "vscode-oniguruma-1.6.1" = { @@ -6313,15 +6043,6 @@ let sha512 = "ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="; }; }; - "weak-map-1.0.5" = { - name = "weak-map"; - packageName = "weak-map"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; - sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; - }; - }; "webidl-conversions-5.0.0" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -6385,13 +6106,13 @@ let sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; - "winston-3.3.3" = { + "winston-3.5.0" = { name = "winston"; packageName = "winston"; - version = "3.3.3"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; - sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.5.0.tgz"; + sha512 = "OQMbmLsIdVHvm2hSurrYZs+iZNIImXneYJ6pX7LseSMEq20HdTETXiNnNX3FDwN4LB/xDRZLF6JYOY+AI112Kw=="; }; }; "winston-syslog-2.4.4" = { @@ -6403,13 +6124,13 @@ let sha512 = "zDjoKO932Yszvzq8WtbIFMXHwAT2MOxpWC9s6djw2tvjdRESWw3au6l+0xDMatMhNWVoVaVNkDXF+r/eyoBUVA=="; }; }; - "winston-transport-4.4.1" = { + "winston-transport-4.4.2" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.1.tgz"; - sha512 = "ciZRlU4CSjHqHe8RQG1iPxKMRVwv6ZJ0RC7DxStKWd0KjpAhPDy5gVYSCpIUq+5CUsP+IyNOTZy1X0tO2QZqjg=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; + sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; }; }; "word-wrap-1.2.3" = { @@ -6466,13 +6187,13 @@ let sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; }; }; - "ws-8.4.0" = { + "ws-8.4.2" = { name = "ws"; packageName = "ws"; - version = "8.4.0"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz"; - sha512 = "IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ=="; + url = "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz"; + sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA=="; }; }; "xml-name-validator-3.0.0" = { @@ -6538,43 +6259,43 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "zigbee-herdsman-0.13.188" = { + "zigbee-herdsman-0.14.10" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.13.188"; + version = "0.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.188.tgz"; - sha512 = "eaI91kwl46TgumM7v9WtpEIfwblHlLjpLOM51DqWlnIqq3ehTwu2wTMQcTsxqxcNKzx4CpCmkBAbdaKc1ZlRVQ=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.10.tgz"; + sha512 = "exPtxyJij2fByFhrJpVro9DeL11D1OpjfvEPkEMaPF12C3/fMDdEjZZX66a2mU07KvhlTqynQ+wZFwsighrimg=="; }; }; - "zigbee-herdsman-converters-14.0.366" = { + "zigbee-herdsman-converters-14.0.406" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "14.0.366"; + version = "14.0.406"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.366.tgz"; - sha512 = "GGxWDhU1aBYwWJaM9SkX9nVVTORc5wumy9D9Z5TDJBSKkVrobAFYBDXB9GTvk+ZMrqVXgIdKgwalgoJjQg5qag=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.406.tgz"; + sha512 = "vc5xBAI4rfv4jWBQi0Gj4gFK4LftS9J/T/mytgfh73e4N+U3rmNaiA+3syovydsDB1G0PLphIWy5CLrMKLM6UA=="; }; }; - "zigbee2mqtt-frontend-0.6.67" = { + "zigbee2mqtt-frontend-0.6.71" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.6.67"; + version = "0.6.71"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.67.tgz"; - sha512 = "yILqMfe5UsT4Z/AccR/N8jQ40qs9u/3ObVJPtc7iLhYSKIPAl9dPrK0k5vsI7i8oVCVC2h1dqOpKfnXarmmc/Q=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.71.tgz"; + sha512 = "+7cbMrbxhR5sPY7/trBoY6vzjFfNL4zlgfoOvE5pDmg4t5ZcJpf5VoCnK7c9ALEMQnBCPxTFfXjkivarQktrpA=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.22.2"; + version = "1.23.0"; src = ./.; dependencies = [ - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6582,71 +6303,71 @@ let sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.5" // { + (sources."@babel/generator-7.16.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + sources."@babel/helper-annotate-as-pure-7.16.7" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" + (sources."@babel/helper-compilation-targets-7.16.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.3.0" // { + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.16.5" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.5" - sources."@babel/plugin-proposal-class-properties-7.16.5" - sources."@babel/plugin-proposal-class-static-block-7.16.5" - sources."@babel/plugin-proposal-decorators-7.16.5" - sources."@babel/plugin-proposal-dynamic-import-7.16.5" - sources."@babel/plugin-proposal-export-namespace-from-7.16.5" - sources."@babel/plugin-proposal-json-strings-7.16.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" - sources."@babel/plugin-proposal-numeric-separator-7.16.5" - sources."@babel/plugin-proposal-object-rest-spread-7.16.5" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" - sources."@babel/plugin-proposal-optional-chaining-7.16.5" - sources."@babel/plugin-proposal-private-methods-7.16.5" - sources."@babel/plugin-proposal-private-property-in-object-7.16.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" + sources."@babel/helper-split-export-declaration-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/helper-validator-option-7.16.7" + sources."@babel/helper-wrap-function-7.16.8" + sources."@babel/helpers-7.16.7" + sources."@babel/highlight-7.16.10" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-decorators-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" 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.16.5" + sources."@babel/plugin-syntax-decorators-7.16.7" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -6659,56 +6380,56 @@ let 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.16.5" - sources."@babel/plugin-transform-arrow-functions-7.16.5" - sources."@babel/plugin-transform-async-to-generator-7.16.5" - sources."@babel/plugin-transform-block-scoped-functions-7.16.5" - sources."@babel/plugin-transform-block-scoping-7.16.5" - sources."@babel/plugin-transform-classes-7.16.5" - sources."@babel/plugin-transform-computed-properties-7.16.5" - sources."@babel/plugin-transform-destructuring-7.16.5" - sources."@babel/plugin-transform-dotall-regex-7.16.5" - sources."@babel/plugin-transform-duplicate-keys-7.16.5" - sources."@babel/plugin-transform-exponentiation-operator-7.16.5" - sources."@babel/plugin-transform-for-of-7.16.5" - sources."@babel/plugin-transform-function-name-7.16.5" - sources."@babel/plugin-transform-literals-7.16.5" - sources."@babel/plugin-transform-member-expression-literals-7.16.5" - sources."@babel/plugin-transform-modules-amd-7.16.5" - sources."@babel/plugin-transform-modules-commonjs-7.16.5" - sources."@babel/plugin-transform-modules-systemjs-7.16.5" - sources."@babel/plugin-transform-modules-umd-7.16.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - sources."@babel/plugin-transform-new-target-7.16.5" - sources."@babel/plugin-transform-object-super-7.16.5" - sources."@babel/plugin-transform-parameters-7.16.5" - sources."@babel/plugin-transform-property-literals-7.16.5" - sources."@babel/plugin-transform-regenerator-7.16.5" - sources."@babel/plugin-transform-reserved-words-7.16.5" - sources."@babel/plugin-transform-shorthand-properties-7.16.5" - sources."@babel/plugin-transform-spread-7.16.5" - sources."@babel/plugin-transform-sticky-regex-7.16.5" - sources."@babel/plugin-transform-template-literals-7.16.5" - sources."@babel/plugin-transform-typeof-symbol-7.16.5" - sources."@babel/plugin-transform-typescript-7.16.1" - sources."@babel/plugin-transform-unicode-escapes-7.16.5" - sources."@babel/plugin-transform-unicode-regex-7.16.5" - (sources."@babel/preset-env-7.16.5" // { + sources."@babel/plugin-syntax-typescript-7.16.7" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-typescript-7.16.8" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.16.5" - sources."@babel/runtime-7.16.5" - sources."@babel/template-7.16.0" - (sources."@babel/traverse-7.16.5" // { + sources."@babel/preset-typescript-7.16.7" + sources."@babel/runtime-7.16.7" + sources."@babel/template-7.16.7" + (sources."@babel/traverse-7.16.10" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.16.0" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" sources."@dabh/diagnostics-2.0.2" (sources."@eslint/eslintrc-1.0.5" // { @@ -6721,7 +6442,7 @@ let sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.9.2" // { + (sources."@humanwhocodes/config-array-0.9.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6735,7 +6456,7 @@ let ]; }) sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.2" // { + (sources."@jest/console-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6745,7 +6466,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.5" // { + (sources."@jest/core-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6755,25 +6476,23 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - (sources."@jest/reporters-27.4.5" // { + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + (sources."@jest/reporters-27.4.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."istanbul-lib-instrument-4.0.3" - sources."semver-6.3.0" sources."supports-color-7.2.0" ]; }) sources."@jest/source-map-27.4.0" - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - (sources."@jest/transform-27.4.5" // { + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + (sources."@jest/transform-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6799,7 +6518,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.17" + sources."@types/babel__core-7.1.18" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" @@ -6811,42 +6530,48 @@ let 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/jest-27.0.3" + sources."@types/jest-27.4.0" sources."@types/js-yaml-4.0.5" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.4" + sources."@types/node-17.0.13" sources."@types/object-assign-deep-0.4.0" - sources."@types/prettier-2.4.2" + sources."@types/prettier-2.4.3" sources."@types/rimraf-3.0.2" sources."@types/stack-utils-2.0.1" sources."@types/ws-8.2.2" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - (sources."@typescript-eslint/eslint-plugin-5.8.0" // { + (sources."@typescript-eslint/eslint-plugin-5.10.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/experimental-utils-5.8.0" - (sources."@typescript-eslint/parser-5.8.0" // { + (sources."@typescript-eslint/parser-5.10.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/scope-manager-5.8.0" - sources."@typescript-eslint/types-5.8.0" - (sources."@typescript-eslint/typescript-estree-5.8.0" // { + sources."@typescript-eslint/scope-manager-5.10.1" + (sources."@typescript-eslint/type-utils-5.10.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/visitor-keys-5.8.0" + sources."@typescript-eslint/types-5.10.1" + (sources."@typescript-eslint/typescript-estree-5.10.1" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/utils-5.10.1" + sources."@typescript-eslint/visitor-keys-5.10.1" sources."abab-2.0.5" - sources."acorn-8.6.0" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -6860,8 +6585,7 @@ let sources."ms-2.1.2" ]; }) - sources."ajv-8.8.2" - sources."ansi-colors-4.1.1" + sources."ajv-8.9.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -6872,9 +6596,9 @@ let sources."anymatch-3.1.2" sources."argparse-2.0.1" sources."array-union-2.1.0" - sources."async-3.2.2" + sources."async-3.2.3" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.5" // { + (sources."babel-jest-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6887,13 +6611,13 @@ let sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" - (sources."babel-plugin-polyfill-corejs2-0.3.0" // { + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" - sources."babel-plugin-polyfill-regenerator-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" sources."balanced-match-1.0.2" @@ -6911,7 +6635,7 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001292" + sources."caniuse-lite-1.0.30001304" sources."chalk-2.4.2" sources."char-regex-1.0.2" sources."ci-info-3.3.0" @@ -6919,7 +6643,6 @@ let sources."cliui-7.0.4" sources."co-4.6.0" sources."collect-v8-coverage-1.0.1" - sources."collections-5.1.12" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -6936,8 +6659,8 @@ let sources."safe-buffer-5.1.2" ]; }) - sources."core-js-3.20.1" - (sources."core-js-compat-3.20.1" // { + sources."core-js-3.20.3" + (sources."core-js-compat-3.20.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -6955,7 +6678,7 @@ let sources."decimal.js-10.3.1" sources."dedent-0.7.0" sources."deep-is-0.1.4" - sources."deep-object-diff-1.1.0" + sources."deep-object-diff-1.1.7" sources."deepmerge-4.2.2" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" @@ -6972,13 +6695,12 @@ let }) sources."duplexify-4.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.28" + sources."electron-to-chromium-1.4.57" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -6991,7 +6713,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.5.0" // { + (sources."eslint-8.8.0" // { dependencies = [ sources."ajv-6.12.6" sources."ansi-styles-4.3.0" @@ -7005,22 +6727,21 @@ let sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."json-schema-traverse-0.4.1" sources."ms-2.1.2" sources."supports-color-7.2.0" ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-25.3.0" + sources."eslint-plugin-jest-26.0.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.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -7037,13 +6758,9 @@ let sources."etag-1.8.1" sources."execa-5.1.1" sources."exit-0.1.2" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" @@ -7056,7 +6773,7 @@ let sources."find-0.3.0" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fn.name-1.1.0" sources."form-data-3.0.1" sources."fresh-0.5.2" @@ -7073,9 +6790,9 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" - sources."globby-11.0.4" + sources."globby-11.1.0" sources."glossy-0.1.7" - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" @@ -7105,12 +6822,12 @@ let sources."resolve-from-4.0.0" ]; }) - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-fn-2.1.0" @@ -7138,20 +6855,20 @@ let sources."ms-2.1.2" ]; }) - sources."istanbul-reports-3.1.2" - (sources."jest-27.4.5" // { + sources."istanbul-reports-3.1.3" + (sources."jest-27.4.7" // { 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."jest-cli-27.4.5" + sources."jest-cli-27.4.7" sources."supports-color-7.2.0" ]; }) sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.5" // { + (sources."jest-circus-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7161,7 +6878,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.5" // { + (sources."jest-config-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7171,7 +6888,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.2" // { + (sources."jest-diff-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7182,7 +6899,7 @@ let ]; }) sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.2" // { + (sources."jest-each-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7192,11 +6909,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - (sources."jest-jasmine2-27.4.5" // { + sources."jest-haste-map-27.4.6" + (sources."jest-jasmine2-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7206,8 +6923,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.2" - (sources."jest-matcher-utils-27.4.2" // { + sources."jest-leak-detector-27.4.6" + (sources."jest-matcher-utils-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7217,7 +6934,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.2" // { + (sources."jest-message-util-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7227,10 +6944,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.2" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.5" // { + (sources."jest-resolve-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7240,8 +6957,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.5" - (sources."jest-runner-27.4.5" // { + sources."jest-resolve-dependencies-27.4.6" + (sources."jest-runner-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7251,7 +6968,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.5" // { + (sources."jest-runtime-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7262,7 +6979,7 @@ let ]; }) sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.5" // { + (sources."jest-snapshot-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7282,10 +6999,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -7294,7 +7011,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.2" // { + (sources."jest-watcher-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7304,12 +7021,13 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.5" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) + sources."js-sdsl-2.1.4" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" (sources."jsdom-16.7.0" // { @@ -7329,9 +7047,10 @@ let sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.merge-4.6.2" - (sources."logform-2.3.0" // { + (sources."logform-2.3.2" // { dependencies = [ sources."ms-2.1.3" + sources."safe-stable-stringify-1.1.1" ]; }) sources."lru-cache-6.0.0" @@ -7352,7 +7071,7 @@ let sources."minimist-1.2.5" sources."mkdir-recursive-0.4.0" sources."moment-2.29.1" - (sources."mqtt-4.3.1" // { + (sources."mqtt-4.3.4" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -7372,7 +7091,7 @@ let sources."node-releases-2.0.1" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - (sources."number-allocator-1.0.7" // { + (sources."number-allocator-1.0.9" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -7399,17 +7118,16 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" - sources."pirates-4.0.4" + sources."picomatch-2.3.1" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-styles-5.2.0" ]; }) sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -7433,7 +7151,7 @@ let sources."reinterval-1.1.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve.exports-1.1.0" @@ -7442,7 +7160,7 @@ let sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."semver-7.3.5" @@ -7485,6 +7203,7 @@ let sources."supports-color-7.2.0" ]; }) + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."terminal-link-2.1.1" sources."test-exclude-6.0.0" @@ -7507,7 +7226,7 @@ let sources."type-fest-0.20.2" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.5.4" + sources."typescript-4.5.5" 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" @@ -7518,7 +7237,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -7526,15 +7245,14 @@ let sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" sources."walker-1.0.8" - sources."weak-map-1.0.5" 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."which-2.0.2" - sources."winston-3.3.3" + sources."winston-3.5.0" sources."winston-syslog-2.4.4" - sources."winston-transport-4.4.1" + sources."winston-transport-4.4.2" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -7545,7 +7263,7 @@ let }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.4.0" + sources."ws-8.4.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -7553,69 +7271,69 @@ let sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.13.188" // { + (sources."zigbee-herdsman-0.14.10" // { dependencies = [ - sources."@babel/cli-7.16.0" - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/cli-7.16.8" + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.5" - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + sources."@babel/generator-7.16.8" + sources."@babel/helper-annotate-as-pure-7.16.7" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" + (sources."@babel/helper-compilation-targets-7.16.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.3.0" // { + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.16.5" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.5" - sources."@babel/plugin-proposal-class-properties-7.16.5" - sources."@babel/plugin-proposal-class-static-block-7.16.5" - sources."@babel/plugin-proposal-dynamic-import-7.16.5" - sources."@babel/plugin-proposal-export-namespace-from-7.16.5" - sources."@babel/plugin-proposal-json-strings-7.16.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" - sources."@babel/plugin-proposal-numeric-separator-7.16.5" - sources."@babel/plugin-proposal-object-rest-spread-7.16.5" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" - sources."@babel/plugin-proposal-optional-chaining-7.16.5" - sources."@babel/plugin-proposal-private-methods-7.16.5" - sources."@babel/plugin-proposal-private-property-in-object-7.16.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" + sources."@babel/helper-split-export-declaration-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/helper-validator-option-7.16.7" + sources."@babel/helper-wrap-function-7.16.8" + sources."@babel/helpers-7.16.7" + sources."@babel/highlight-7.16.10" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" 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" @@ -7632,51 +7350,51 @@ let 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.16.5" - sources."@babel/plugin-transform-arrow-functions-7.16.5" - sources."@babel/plugin-transform-async-to-generator-7.16.5" - sources."@babel/plugin-transform-block-scoped-functions-7.16.5" - sources."@babel/plugin-transform-block-scoping-7.16.5" - sources."@babel/plugin-transform-classes-7.16.5" - sources."@babel/plugin-transform-computed-properties-7.16.5" - sources."@babel/plugin-transform-destructuring-7.16.5" - sources."@babel/plugin-transform-dotall-regex-7.16.5" - sources."@babel/plugin-transform-duplicate-keys-7.16.5" - sources."@babel/plugin-transform-exponentiation-operator-7.16.5" - sources."@babel/plugin-transform-for-of-7.16.5" - sources."@babel/plugin-transform-function-name-7.16.5" - sources."@babel/plugin-transform-literals-7.16.5" - sources."@babel/plugin-transform-member-expression-literals-7.16.5" - sources."@babel/plugin-transform-modules-amd-7.16.5" - sources."@babel/plugin-transform-modules-commonjs-7.16.5" - sources."@babel/plugin-transform-modules-systemjs-7.16.5" - sources."@babel/plugin-transform-modules-umd-7.16.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - sources."@babel/plugin-transform-new-target-7.16.5" - sources."@babel/plugin-transform-object-super-7.16.5" - sources."@babel/plugin-transform-parameters-7.16.5" - sources."@babel/plugin-transform-property-literals-7.16.5" - sources."@babel/plugin-transform-regenerator-7.16.5" - sources."@babel/plugin-transform-reserved-words-7.16.5" - sources."@babel/plugin-transform-shorthand-properties-7.16.5" - sources."@babel/plugin-transform-spread-7.16.5" - sources."@babel/plugin-transform-sticky-regex-7.16.5" - sources."@babel/plugin-transform-template-literals-7.16.5" - sources."@babel/plugin-transform-typeof-symbol-7.16.5" - sources."@babel/plugin-transform-typescript-7.16.1" - sources."@babel/plugin-transform-unicode-escapes-7.16.5" - sources."@babel/plugin-transform-unicode-regex-7.16.5" - (sources."@babel/preset-env-7.16.5" // { + sources."@babel/plugin-syntax-typescript-7.16.7" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-typescript-7.16.8" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.16.5" - sources."@babel/runtime-7.16.5" - sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.5" - sources."@babel/types-7.16.0" + sources."@babel/preset-typescript-7.16.7" + sources."@babel/runtime-7.16.7" + sources."@babel/template-7.16.7" + sources."@babel/traverse-7.16.10" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ @@ -7687,11 +7405,11 @@ let sources."strip-json-comments-3.1.1" ]; }) - sources."@humanwhocodes/config-array-0.9.2" + sources."@humanwhocodes/config-array-0.9.3" sources."@humanwhocodes/object-schema-1.2.1" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.2" // { + (sources."@jest/console-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7702,7 +7420,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.5" // { + (sources."@jest/core-27.4.7" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -7715,18 +7433,16 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - (sources."@jest/reporters-27.4.5" // { + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + (sources."@jest/reporters-27.4.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."istanbul-lib-instrument-4.0.3" - sources."semver-6.3.0" sources."slash-3.0.0" sources."source-map-0.6.1" sources."supports-color-7.2.0" @@ -7737,9 +7453,9 @@ let sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - (sources."@jest/transform-27.4.5" // { + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + (sources."@jest/transform-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7779,7 +7495,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.17" + sources."@types/babel__core-7.1.18" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" @@ -7789,26 +7505,27 @@ let 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/jest-27.0.3" + sources."@types/jest-27.4.0" sources."@types/json-schema-7.0.9" sources."@types/ms-0.7.31" sources."@types/mz-2.7.4" sources."@types/nedb-1.8.12" - sources."@types/node-17.0.4" - sources."@types/prettier-2.4.2" + sources."@types/node-17.0.13" + sources."@types/prettier-2.4.3" sources."@types/serialport-8.0.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/eslint-plugin-5.8.0" - sources."@typescript-eslint/experimental-utils-5.8.0" - sources."@typescript-eslint/parser-5.8.0" - sources."@typescript-eslint/scope-manager-5.8.0" - sources."@typescript-eslint/types-5.8.0" - sources."@typescript-eslint/typescript-estree-5.8.0" - sources."@typescript-eslint/visitor-keys-5.8.0" + sources."@typescript-eslint/eslint-plugin-5.10.1" + sources."@typescript-eslint/parser-5.10.1" + sources."@typescript-eslint/scope-manager-5.10.1" + sources."@typescript-eslint/type-utils-5.10.1" + sources."@typescript-eslint/types-5.10.1" + sources."@typescript-eslint/typescript-estree-5.10.1" + sources."@typescript-eslint/utils-5.10.1" + sources."@typescript-eslint/visitor-keys-5.10.1" sources."abab-2.0.5" - sources."acorn-8.6.0" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -7818,7 +7535,6 @@ let sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -7833,7 +7549,7 @@ let sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.5" // { + (sources."babel-jest-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7847,13 +7563,13 @@ let sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" - (sources."babel-plugin-polyfill-corejs2-0.3.0" // { + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" - sources."babel-plugin-polyfill-regenerator-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" sources."balanced-match-1.0.2" @@ -7875,10 +7591,10 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001292" + sources."caniuse-lite-1.0.30001304" sources."chalk-2.4.2" sources."char-regex-1.0.2" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chownr-1.1.4" sources."ci-info-3.3.0" sources."cjs-module-lexer-1.2.2" @@ -7900,7 +7616,7 @@ let sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" - (sources."core-js-compat-3.20.1" // { + (sources."core-js-compat-3.20.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -7925,7 +7641,7 @@ let sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.0" sources."detect-newline-3.1.0" sources."diff-sequences-27.4.0" sources."dir-glob-3.0.1" @@ -7935,11 +7651,10 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.28" + sources."electron-to-chromium-1.4.57" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."escodegen-2.0.0" // { @@ -7952,7 +7667,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.5.0" // { + (sources."eslint-8.8.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -7966,7 +7681,6 @@ let sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."js-yaml-4.1.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" @@ -7979,8 +7693,8 @@ let sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -7997,13 +7711,9 @@ let sources."execa-5.1.1" sources."exit-0.1.2" sources."expand-template-2.0.3" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" @@ -8013,7 +7723,7 @@ let sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs-readdir-recursive-1.1.0" @@ -8031,12 +7741,12 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" - (sources."globby-11.0.4" // { + (sources."globby-11.1.0" // { dependencies = [ sources."slash-3.0.0" ]; }) - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" (sources."handlebars-4.7.7" // { dependencies = [ sources."source-map-0.6.1" @@ -8059,13 +7769,13 @@ let sources."resolve-from-4.0.0" ]; }) - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-binary-path-2.1.0" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-generator-fn-2.1.0" @@ -8095,20 +7805,20 @@ let sources."source-map-0.6.1" ]; }) - sources."istanbul-reports-3.1.2" - (sources."jest-27.4.5" // { + sources."istanbul-reports-3.1.3" + (sources."jest-27.4.7" // { 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."jest-cli-27.4.5" + sources."jest-cli-27.4.7" sources."supports-color-7.2.0" ]; }) sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.5" // { + (sources."jest-circus-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8119,7 +7829,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.5" // { + (sources."jest-config-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8130,7 +7840,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.2" // { + (sources."jest-diff-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8141,7 +7851,7 @@ let ]; }) sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.2" // { + (sources."jest-each-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8151,11 +7861,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - (sources."jest-jasmine2-27.4.5" // { + sources."jest-haste-map-27.4.6" + (sources."jest-jasmine2-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8165,8 +7875,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.2" - (sources."jest-matcher-utils-27.4.2" // { + sources."jest-leak-detector-27.4.6" + (sources."jest-matcher-utils-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8176,7 +7886,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.2" // { + (sources."jest-message-util-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8187,10 +7897,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.2" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.5" // { + (sources."jest-resolve-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8201,8 +7911,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.5" - (sources."jest-runner-27.4.5" // { + sources."jest-resolve-dependencies-27.4.6" + (sources."jest-runner-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8212,7 +7922,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.5" // { + (sources."jest-runtime-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8224,7 +7934,7 @@ let ]; }) sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.5" // { + (sources."jest-snapshot-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8244,10 +7954,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8255,7 +7965,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.2" // { + (sources."jest-watcher-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8265,7 +7975,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.5" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -8294,7 +8004,7 @@ let ]; }) sources."makeerror-1.0.12" - sources."marked-3.0.8" + sources."marked-4.0.12" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" @@ -8337,20 +8047,19 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" + sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" - sources."prebuild-install-7.0.0" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" ]; }) sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -8373,7 +8082,7 @@ let ]; }) sources."require-directory-2.1.1" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve.exports-1.1.0" @@ -8388,10 +8097,10 @@ let sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shiki-0.9.15" + sources."shiki-0.10.0" sources."signal-exit-3.0.6" sources."simple-concat-1.0.1" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" sources."sisteransi-1.0.5" sources."slash-2.0.0" sources."slip-1.0.2" @@ -8426,6 +8135,7 @@ let sources."supports-color-7.2.0" ]; }) + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { @@ -8451,12 +8161,12 @@ let sources."type-detect-4.0.8" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.22.10" - sources."typedoc-plugin-markdown-3.11.8" + sources."typedoc-0.22.11" + sources."typedoc-plugin-markdown-3.11.12" sources."typedoc-plugin-no-inherit-1.3.1" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-4.5.4" - sources."uglify-js-3.14.5" + sources."typescript-4.5.5" + sources."uglify-js-3.15.0" 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" @@ -8465,7 +8175,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -8512,17 +8222,17 @@ let sources."yargs-parser-20.2.9" ]; }) - (sources."zigbee-herdsman-converters-14.0.366" // { + (sources."zigbee-herdsman-converters-14.0.406" // { dependencies = [ sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.7" // { + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.7" // { + (sources."@babel/generator-7.16.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -8544,7 +8254,7 @@ let sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helpers-7.16.7" - (sources."@babel/highlight-7.16.7" // { + (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -8555,7 +8265,7 @@ let sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.16.7" + sources."@babel/parser-7.16.12" 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" @@ -8570,15 +8280,19 @@ let sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.16.7" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.16.7" // { + (sources."@babel/traverse-7.16.10" // { dependencies = [ sources."globals-11.12.0" ]; }) - sources."@babel/types-7.16.7" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" - sources."@eslint/eslintrc-1.0.5" - sources."@humanwhocodes/config-array-0.9.2" + (sources."@eslint/eslintrc-1.0.5" // { + dependencies = [ + sources."ignore-4.0.6" + ]; + }) + sources."@humanwhocodes/config-array-0.9.3" sources."@humanwhocodes/object-schema-1.2.1" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ @@ -8588,16 +8302,16 @@ let ]; }) sources."@istanbuljs/schema-0.1.3" - sources."@jest/console-27.4.2" - sources."@jest/core-27.4.5" - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - sources."@jest/reporters-27.4.5" + sources."@jest/console-27.4.6" + sources."@jest/core-27.4.7" + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + sources."@jest/reporters-27.4.6" sources."@jest/source-map-27.4.0" - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - sources."@jest/transform-27.4.5" + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + sources."@jest/transform-27.4.6" sources."@jest/types-27.4.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -8614,21 +8328,21 @@ let sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.5" - sources."@types/prettier-2.4.2" + sources."@types/node-17.0.14" + sources."@types/prettier-2.4.3" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - (sources."@typescript-eslint/experimental-utils-5.8.1" // { + sources."@typescript-eslint/scope-manager-5.10.2" + sources."@typescript-eslint/types-5.10.2" + sources."@typescript-eslint/typescript-estree-5.10.2" + (sources."@typescript-eslint/utils-5.10.2" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" ]; }) - sources."@typescript-eslint/scope-manager-5.8.1" - sources."@typescript-eslint/types-5.8.1" - sources."@typescript-eslint/typescript-estree-5.8.1" - sources."@typescript-eslint/visitor-keys-5.8.1" + sources."@typescript-eslint/visitor-keys-5.10.2" sources."abab-2.0.5" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { @@ -8640,7 +8354,6 @@ let sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -8652,14 +8365,9 @@ let sources."argparse-2.0.1" sources."array-union-2.1.0" sources."asynckit-0.4.0" - sources."axios-0.24.0" - sources."babel-jest-27.4.5" - (sources."babel-plugin-istanbul-6.1.1" // { - dependencies = [ - sources."istanbul-lib-instrument-5.1.0" - sources."semver-6.3.0" - ]; - }) + sources."axios-0.25.0" + sources."babel-jest-27.4.6" + sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" @@ -8676,7 +8384,7 @@ let sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001294" + sources."caniuse-lite-1.0.30001304" sources."chalk-4.1.2" sources."char-regex-1.0.2" sources."ci-info-3.3.0" @@ -8716,11 +8424,10 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.31" + sources."electron-to-chromium-1.4.59" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" (sources."escodegen-2.0.0" // { @@ -8731,16 +8438,16 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-8.6.0" + sources."eslint-8.8.0" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-25.3.3" + sources."eslint-plugin-jest-26.0.0" sources."eslint-scope-7.1.0" (sources."eslint-utils-3.0.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" + sources."eslint-visitor-keys-3.2.0" sources."espree-9.3.0" sources."esprima-4.0.1" sources."esquery-1.4.0" @@ -8749,13 +8456,9 @@ let sources."esutils-2.0.3" sources."execa-5.1.1" sources."exit-0.1.2" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.2.7" // { + (sources."fast-glob-3.2.11" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -8768,8 +8471,8 @@ let sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" - sources."follow-redirects-1.14.6" + sources."flatted-3.2.5" + sources."follow-redirects-1.14.7" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" @@ -8783,12 +8486,8 @@ let sources."glob-7.2.0" sources."glob-parent-6.0.2" sources."globals-13.12.0" - (sources."globby-11.0.4" // { - dependencies = [ - sources."ignore-5.2.0" - ]; - }) - sources."graceful-fs-4.2.8" + sources."globby-11.1.0" + sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" sources."html-encoding-sniffer-2.0.1" @@ -8798,13 +8497,13 @@ let sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-4.0.6" + sources."ignore-5.2.0" sources."import-fresh-3.3.0" - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-fn-2.1.0" @@ -8815,7 +8514,7 @@ let sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-4.0.3" // { + (sources."istanbul-lib-instrument-5.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -8823,42 +8522,42 @@ let sources."istanbul-lib-report-3.0.0" sources."istanbul-lib-source-maps-4.0.1" sources."istanbul-reports-3.1.3" - (sources."jest-27.4.5" // { + (sources."jest-27.4.7" // { dependencies = [ - sources."jest-cli-27.4.5" + sources."jest-cli-27.4.7" ]; }) sources."jest-changed-files-27.4.2" - sources."jest-circus-27.4.5" - sources."jest-config-27.4.5" - sources."jest-diff-27.4.2" + sources."jest-circus-27.4.6" + sources."jest-config-27.4.7" + sources."jest-diff-27.4.6" sources."jest-docblock-27.4.0" - sources."jest-each-27.4.2" - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-each-27.4.6" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - sources."jest-jasmine2-27.4.5" - sources."jest-leak-detector-27.4.2" - sources."jest-matcher-utils-27.4.2" - sources."jest-message-util-27.4.2" - sources."jest-mock-27.4.2" + sources."jest-haste-map-27.4.6" + sources."jest-jasmine2-27.4.6" + sources."jest-leak-detector-27.4.6" + sources."jest-matcher-utils-27.4.6" + sources."jest-message-util-27.4.6" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - sources."jest-resolve-27.4.5" - sources."jest-resolve-dependencies-27.4.5" - sources."jest-runner-27.4.5" - sources."jest-runtime-27.4.5" + sources."jest-resolve-27.4.6" + sources."jest-resolve-dependencies-27.4.6" + sources."jest-runner-27.4.6" + sources."jest-runtime-27.4.6" sources."jest-serializer-27.4.0" - sources."jest-snapshot-27.4.5" + sources."jest-snapshot-27.4.6" sources."jest-util-27.4.2" - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" ]; }) - sources."jest-watcher-27.4.2" - (sources."jest-worker-27.4.5" // { + sources."jest-watcher-27.4.6" + (sources."jest-worker-27.4.6" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -8912,16 +8611,15 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" - sources."pirates-4.0.4" + sources."picomatch-2.3.1" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-styles-5.2.0" ]; }) - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -8930,7 +8628,7 @@ let sources."readable-stream-3.6.0" sources."regexpp-3.2.0" sources."require-directory-2.1.1" - sources."resolve-1.20.0" + sources."resolve-1.22.0" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -8967,6 +8665,7 @@ let sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."tar-stream-2.2.0" sources."terminal-link-2.1.1" @@ -8988,7 +8687,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9012,69 +8711,69 @@ let sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.13.188" // { + (sources."zigbee-herdsman-0.14.10" // { dependencies = [ - sources."@babel/cli-7.16.0" - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/cli-7.16.8" + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.5" - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + sources."@babel/generator-7.16.8" + sources."@babel/helper-annotate-as-pure-7.16.7" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" + (sources."@babel/helper-compilation-targets-7.16.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.3.0" // { + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.16.5" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.5" - sources."@babel/plugin-proposal-class-properties-7.16.5" - sources."@babel/plugin-proposal-class-static-block-7.16.5" - sources."@babel/plugin-proposal-dynamic-import-7.16.5" - sources."@babel/plugin-proposal-export-namespace-from-7.16.5" - sources."@babel/plugin-proposal-json-strings-7.16.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" - sources."@babel/plugin-proposal-numeric-separator-7.16.5" - sources."@babel/plugin-proposal-object-rest-spread-7.16.5" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" - sources."@babel/plugin-proposal-optional-chaining-7.16.5" - sources."@babel/plugin-proposal-private-methods-7.16.5" - sources."@babel/plugin-proposal-private-property-in-object-7.16.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" + sources."@babel/helper-split-export-declaration-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/helper-validator-option-7.16.7" + sources."@babel/helper-wrap-function-7.16.8" + sources."@babel/helpers-7.16.7" + sources."@babel/highlight-7.16.10" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" 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" @@ -9091,51 +8790,51 @@ let 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.16.5" - sources."@babel/plugin-transform-arrow-functions-7.16.5" - sources."@babel/plugin-transform-async-to-generator-7.16.5" - sources."@babel/plugin-transform-block-scoped-functions-7.16.5" - sources."@babel/plugin-transform-block-scoping-7.16.5" - sources."@babel/plugin-transform-classes-7.16.5" - sources."@babel/plugin-transform-computed-properties-7.16.5" - sources."@babel/plugin-transform-destructuring-7.16.5" - sources."@babel/plugin-transform-dotall-regex-7.16.5" - sources."@babel/plugin-transform-duplicate-keys-7.16.5" - sources."@babel/plugin-transform-exponentiation-operator-7.16.5" - sources."@babel/plugin-transform-for-of-7.16.5" - sources."@babel/plugin-transform-function-name-7.16.5" - sources."@babel/plugin-transform-literals-7.16.5" - sources."@babel/plugin-transform-member-expression-literals-7.16.5" - sources."@babel/plugin-transform-modules-amd-7.16.5" - sources."@babel/plugin-transform-modules-commonjs-7.16.5" - sources."@babel/plugin-transform-modules-systemjs-7.16.5" - sources."@babel/plugin-transform-modules-umd-7.16.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - sources."@babel/plugin-transform-new-target-7.16.5" - sources."@babel/plugin-transform-object-super-7.16.5" - sources."@babel/plugin-transform-parameters-7.16.5" - sources."@babel/plugin-transform-property-literals-7.16.5" - sources."@babel/plugin-transform-regenerator-7.16.5" - sources."@babel/plugin-transform-reserved-words-7.16.5" - sources."@babel/plugin-transform-shorthand-properties-7.16.5" - sources."@babel/plugin-transform-spread-7.16.5" - sources."@babel/plugin-transform-sticky-regex-7.16.5" - sources."@babel/plugin-transform-template-literals-7.16.5" - sources."@babel/plugin-transform-typeof-symbol-7.16.5" - sources."@babel/plugin-transform-typescript-7.16.1" - sources."@babel/plugin-transform-unicode-escapes-7.16.5" - sources."@babel/plugin-transform-unicode-regex-7.16.5" - (sources."@babel/preset-env-7.16.5" // { + sources."@babel/plugin-syntax-typescript-7.16.7" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-typescript-7.16.8" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.16.5" - sources."@babel/runtime-7.16.5" - sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.5" - sources."@babel/types-7.16.0" + sources."@babel/preset-typescript-7.16.7" + sources."@babel/runtime-7.16.7" + sources."@babel/template-7.16.7" + sources."@babel/traverse-7.16.10" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ @@ -9146,11 +8845,11 @@ let sources."strip-json-comments-3.1.1" ]; }) - sources."@humanwhocodes/config-array-0.9.2" + sources."@humanwhocodes/config-array-0.9.3" sources."@humanwhocodes/object-schema-1.2.1" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.2" // { + (sources."@jest/console-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9161,7 +8860,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.5" // { + (sources."@jest/core-27.4.7" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -9174,18 +8873,16 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - (sources."@jest/reporters-27.4.5" // { + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + (sources."@jest/reporters-27.4.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."istanbul-lib-instrument-4.0.3" - sources."semver-6.3.0" sources."slash-3.0.0" sources."source-map-0.6.1" sources."supports-color-7.2.0" @@ -9196,9 +8893,9 @@ let sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - (sources."@jest/transform-27.4.5" // { + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + (sources."@jest/transform-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9238,7 +8935,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.17" + sources."@types/babel__core-7.1.18" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" @@ -9248,26 +8945,27 @@ let 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/jest-27.0.3" + sources."@types/jest-27.4.0" sources."@types/json-schema-7.0.9" sources."@types/ms-0.7.31" sources."@types/mz-2.7.4" sources."@types/nedb-1.8.12" - sources."@types/node-17.0.4" - sources."@types/prettier-2.4.2" + sources."@types/node-17.0.13" + sources."@types/prettier-2.4.3" sources."@types/serialport-8.0.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/eslint-plugin-5.8.0" - sources."@typescript-eslint/experimental-utils-5.8.0" - sources."@typescript-eslint/parser-5.8.0" - sources."@typescript-eslint/scope-manager-5.8.0" - sources."@typescript-eslint/types-5.8.0" - sources."@typescript-eslint/typescript-estree-5.8.0" - sources."@typescript-eslint/visitor-keys-5.8.0" + sources."@typescript-eslint/eslint-plugin-5.10.1" + sources."@typescript-eslint/parser-5.10.1" + sources."@typescript-eslint/scope-manager-5.10.1" + sources."@typescript-eslint/type-utils-5.10.1" + sources."@typescript-eslint/types-5.10.1" + sources."@typescript-eslint/typescript-estree-5.10.1" + sources."@typescript-eslint/utils-5.10.1" + sources."@typescript-eslint/visitor-keys-5.10.1" sources."abab-2.0.5" - sources."acorn-8.6.0" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -9277,7 +8975,6 @@ let sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -9292,7 +8989,7 @@ let sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.5" // { + (sources."babel-jest-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9306,13 +9003,13 @@ let sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" - (sources."babel-plugin-polyfill-corejs2-0.3.0" // { + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" - sources."babel-plugin-polyfill-regenerator-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" sources."balanced-match-1.0.2" @@ -9334,10 +9031,10 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001292" + sources."caniuse-lite-1.0.30001304" sources."chalk-2.4.2" sources."char-regex-1.0.2" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chownr-1.1.4" sources."ci-info-3.3.0" sources."cjs-module-lexer-1.2.2" @@ -9359,7 +9056,7 @@ let sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" - (sources."core-js-compat-3.20.1" // { + (sources."core-js-compat-3.20.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -9384,7 +9081,7 @@ let sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.0" sources."detect-newline-3.1.0" sources."diff-sequences-27.4.0" sources."dir-glob-3.0.1" @@ -9394,11 +9091,10 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.28" + sources."electron-to-chromium-1.4.57" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."escodegen-2.0.0" // { @@ -9411,7 +9107,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.5.0" // { + (sources."eslint-8.8.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -9425,7 +9121,6 @@ let sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."js-yaml-4.1.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" @@ -9438,8 +9133,8 @@ let sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -9456,13 +9151,9 @@ let sources."execa-5.1.1" sources."exit-0.1.2" sources."expand-template-2.0.3" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" @@ -9472,7 +9163,7 @@ let sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs-readdir-recursive-1.1.0" @@ -9490,12 +9181,12 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" - (sources."globby-11.0.4" // { + (sources."globby-11.1.0" // { dependencies = [ sources."slash-3.0.0" ]; }) - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" (sources."handlebars-4.7.7" // { dependencies = [ sources."source-map-0.6.1" @@ -9518,13 +9209,13 @@ let sources."resolve-from-4.0.0" ]; }) - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-binary-path-2.1.0" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-generator-fn-2.1.0" @@ -9554,20 +9245,20 @@ let sources."source-map-0.6.1" ]; }) - sources."istanbul-reports-3.1.2" - (sources."jest-27.4.5" // { + sources."istanbul-reports-3.1.3" + (sources."jest-27.4.7" // { 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."jest-cli-27.4.5" + sources."jest-cli-27.4.7" sources."supports-color-7.2.0" ]; }) sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.5" // { + (sources."jest-circus-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9578,7 +9269,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.5" // { + (sources."jest-config-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9589,7 +9280,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.2" // { + (sources."jest-diff-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9600,7 +9291,7 @@ let ]; }) sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.2" // { + (sources."jest-each-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9610,11 +9301,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - (sources."jest-jasmine2-27.4.5" // { + sources."jest-haste-map-27.4.6" + (sources."jest-jasmine2-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9624,8 +9315,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.2" - (sources."jest-matcher-utils-27.4.2" // { + sources."jest-leak-detector-27.4.6" + (sources."jest-matcher-utils-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9635,7 +9326,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.2" // { + (sources."jest-message-util-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9646,10 +9337,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.2" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.5" // { + (sources."jest-resolve-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9660,8 +9351,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.5" - (sources."jest-runner-27.4.5" // { + sources."jest-resolve-dependencies-27.4.6" + (sources."jest-runner-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9671,7 +9362,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.5" // { + (sources."jest-runtime-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9683,7 +9374,7 @@ let ]; }) sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.5" // { + (sources."jest-snapshot-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9703,10 +9394,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -9714,7 +9405,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.2" // { + (sources."jest-watcher-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9724,7 +9415,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.5" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -9753,7 +9444,7 @@ let ]; }) sources."makeerror-1.0.12" - sources."marked-3.0.8" + sources."marked-4.0.12" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" @@ -9796,20 +9487,19 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" + sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" - sources."prebuild-install-7.0.0" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" ]; }) sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -9832,7 +9522,7 @@ let ]; }) sources."require-directory-2.1.1" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve.exports-1.1.0" @@ -9847,10 +9537,10 @@ let sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shiki-0.9.15" + sources."shiki-0.10.0" sources."signal-exit-3.0.6" sources."simple-concat-1.0.1" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" sources."sisteransi-1.0.5" sources."slash-2.0.0" sources."slip-1.0.2" @@ -9885,6 +9575,7 @@ let sources."supports-color-7.2.0" ]; }) + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { @@ -9910,12 +9601,12 @@ let sources."type-detect-4.0.8" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.22.10" - sources."typedoc-plugin-markdown-3.11.8" + sources."typedoc-0.22.11" + sources."typedoc-plugin-markdown-3.11.12" sources."typedoc-plugin-no-inherit-1.3.1" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-4.5.4" - sources."uglify-js-3.14.5" + sources."typescript-4.5.5" + sources."uglify-js-3.15.0" 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" @@ -9924,7 +9615,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9973,7 +9664,7 @@ let }) ]; }) - sources."zigbee2mqtt-frontend-0.6.67" + sources."zigbee2mqtt-frontend-0.6.71" ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index cf264f11de..e0ab463b41 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , coreutils , which , gnused @@ -146,6 +147,8 @@ let sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok="; }; + patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4 + # Fix FHS paths in tests postPatch = '' # src/fish_tests.cpp diff --git a/third_party/nixpkgs/pkgs/shells/fish/tests-pcre2-update.patch b/third_party/nixpkgs/pkgs/shells/fish/tests-pcre2-update.patch new file mode 100644 index 0000000000..5e0c327c54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/tests-pcre2-update.patch @@ -0,0 +1,7 @@ +Adapted formating to 3.3.1 from +https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a +--- a/src/fish_tests.cpp ++++ b/src/fish_tests.cpp +@@ -5726,2 +5725,0 @@ +- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"}, +- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"}, diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index 2a019d75e7..522acd2932 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-4cfRysJ202y1996TB/7jvlWO5K2vNJ70IjIkANXIpcQ="; + sha256 = "sha256-JtuCQM7uh4tmZrSwJj1Oh3hUzQKqKFxxWS11CDbvl+o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index d15bd02457..83ef9ea65e 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-12-18"; + version = "2022-01-18"; pname = "oh-my-zsh"; - rev = "904f8685f75ff5dd3f544f8c6f2cabb8e5952e9a"; + rev = "22c11da108764336d92d03d3113c1f486cdb5911"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Pos7LaNQllZrzBUx8a7QXi1sAVcIABQJOLUjIwGIP/U="; + sha256 = "Tnwy+3lCWjzDhjXtgLIiX3SxpJG6shxmmPFyeWkO2R0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix index 333da40adb..be5c665055 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z"; + vendorSha256 = "1863ad97y82fx0an1ysalkxnqjz3zfz228wag9a92wdssl1vwzws"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 419863044b..19d3e70c0a 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -7,25 +7,25 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec { - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh"; + sha256 = "17giwdjrsmr71xskxxf506n8kaab8zx77fv267fx37ifi57nffk5"; }; }); in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.15.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1b3j2riainx3zz4irww72z0pb8l8ymnh1903zpsy5wmjgb0wkcwq"; + sha256 = "0fkfh8j7rd8mkpgz6nsx4v7665d375266shl1aasdad8blgqmf0c"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/stdenv/adapters.nix b/third_party/nixpkgs/pkgs/stdenv/adapters.nix index 971be95e93..9884c219ff 100644 --- a/third_party/nixpkgs/pkgs/stdenv/adapters.nix +++ b/third_party/nixpkgs/pkgs/stdenv/adapters.nix @@ -270,4 +270,25 @@ rec { allowSubstitutes = false; }); }); + + + /* Modify a stdenv so that it builds binaries with the specified list of + compilerFlags appended and passed to the compiler. + + This example would recompile every derivation on the system with + -funroll-loops and -O3 passed to each gcc invocation. + + Example: + nixpkgs.overlays = [ + (self: super: { + stdenv = super.withCFlags [ "-funroll-loops" "-O3" ] super.stdenv; + }) + ]; + */ + withCFlags = compilerFlags: stdenv: + stdenv.override (old: { + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { + NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; + }); + }); } diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 49f884cd8b..9bbdcbf81d 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -351,7 +351,8 @@ in rec { tar xvf ${hello.src} cd hello-* - ./configure --prefix=$out + # stdenv bootstrap tools ship a broken libiconv.dylib https://github.com/NixOS/nixpkgs/issues/158331 + am_cv_func_iconv=no ./configure --prefix=$out make make install diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index 7a70accb72..44caa6838e 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -119,13 +119,20 @@ let } ''; + # flakeNote will be printed in the remediation messages below. + flakeNote = " + Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+ + (Flake) command, `--impure` must be passed in order to read this + environment variable. + "; + remediate_allowlist = allow_attr: rebuild_amendment: attrs: '' a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable for a single invocation of the nix tools. $ export ${remediation_env_var allow_attr}=1 - + ${flakeNote} b) For `nixos-rebuild` you can set { nixpkgs.config.allow${allow_attr} = true; } in configuration.nix to override this. @@ -148,7 +155,7 @@ let variable for a single invocation of the nix tools: $ export NIXPKGS_ALLOW_INSECURE=1 - + ${flakeNote} b) for `nixos-rebuild` you can add ‘${getName attrs}’ to `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, like so: diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh index 2951813c0f..0777fa830c 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash +__nixpkgs_setup_set_original=$- set -eu set -o pipefail shopt -s inherit_errexit @@ -1361,5 +1363,7 @@ runHook userHook dumpVars -# Disable nounset for nix-shell. -set +u +# Restore the original options for nix-shell +[[ $__nixpkgs_setup_set_original == *e* ]] || set +e +[[ $__nixpkgs_setup_set_original == *u* ]] || set +u +unset -v __nixpkgs_setup_set_original diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index b7980c478c..4110327946 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -67,4 +67,6 @@ with pkgs; writers = callPackage ../build-support/writers/test.nix {}; dhall = callPackage ./dhall { }; + + makeWrapper = callPackage ./make-wrapper {}; } diff --git a/third_party/nixpkgs/pkgs/test/make-wrapper/default.nix b/third_party/nixpkgs/pkgs/test/make-wrapper/default.nix new file mode 100644 index 0000000000..6e70945ee1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/make-wrapper/default.nix @@ -0,0 +1,136 @@ +{ lib +, writeText +, writeCBin +, writeShellScript +, makeWrapper +, runCommand +, which +, ... +}: + +let + # Testfiles + foofile = writeText "foofile" "foo"; + barfile = writeText "barfile" "bar"; + + # Wrapped binaries + wrappedArgv0 = writeCBin "wrapped-argv0" '' + #include + #include + + void main(int argc, char** argv) { + printf("argv0=%s", argv[0]); + exit(0); + } + ''; + wrappedBinaryVar = writeShellScript "wrapped-var" '' + echo "VAR=$VAR" + ''; + wrappedBinaryArgs = writeShellScript "wrapped-args" '' + echo "$@" + ''; + + mkWrapperBinary = { name, args, wrapped ? wrappedBinaryVar }: runCommand name + { + nativeBuildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper "${wrapped}" "$out/bin/${name}" ${lib.escapeShellArgs args} + ''; + + mkTest = cmd: toExpect: '' + output="$(${cmd})" + if [[ "$output" != '${toExpect}' ]]; then + echo "test failed: the output of ${cmd} was '$output', expected '${toExpect}'" + echo "the wrapper contents:" + for i in ${cmd}; do + if [[ $i =~ ^test- ]]; then + cat $(which $i) + fi + done + exit 1 + fi + ''; +in +runCommand "make-wrapper-test" +{ + nativeBuildInputs = [ + which + (mkWrapperBinary { name = "test-argv0"; args = [ "--argv0" "foo" ]; wrapped = "${wrappedArgv0}/bin/wrapped-argv0"; }) + (mkWrapperBinary { name = "test-set"; args = [ "--set" "VAR" "abc" ]; }) + (mkWrapperBinary { name = "test-set-default"; args = [ "--set-default" "VAR" "abc" ]; }) + (mkWrapperBinary { name = "test-unset"; args = [ "--unset" "VAR" ]; }) + (mkWrapperBinary { name = "test-run"; args = [ "--run" "echo bar" ]; }) + (mkWrapperBinary { name = "test-run-and-set"; args = [ "--run" "export VAR=foo" "--set" "VAR" "bar" ]; }) + (mkWrapperBinary { name = "test-args"; args = [ "--add-flags" "abc" ]; wrapped = wrappedBinaryArgs; }) + (mkWrapperBinary { name = "test-prefix"; args = [ "--prefix" "VAR" ":" "abc" ]; }) + (mkWrapperBinary { name = "test-suffix"; args = [ "--suffix" "VAR" ":" "abc" ]; }) + (mkWrapperBinary { name = "test-prefix-and-suffix"; args = [ "--prefix" "VAR" ":" "foo" "--suffix" "VAR" ":" "bar" ]; }) + (mkWrapperBinary { name = "test-prefix-multi"; args = [ "--prefix" "VAR" ":" "abc:foo:foo" ]; }) + (mkWrapperBinary { name = "test-suffix-each"; args = [ "--suffix-each" "VAR" ":" "foo bar:def" ]; }) + (mkWrapperBinary { name = "test-prefix-each"; args = [ "--prefix-each" "VAR" ":" "foo bar:def" ]; }) + (mkWrapperBinary { name = "test-suffix-contents"; args = [ "--suffix-contents" "VAR" ":" "${foofile} ${barfile}" ]; }) + (mkWrapperBinary { name = "test-prefix-contents"; args = [ "--prefix-contents" "VAR" ":" "${foofile} ${barfile}" ]; }) + ]; +} + ( + # --argv0 works + mkTest "test-argv0" "argv0=foo" + + # --set works + + mkTest "test-set" "VAR=abc" + # --set overwrites the variable + + mkTest "VAR=foo test-set" "VAR=abc" + # --set-default works + + mkTest "test-set-default" "VAR=abc" + # --set-default doesn"t overwrite the variable + + mkTest "VAR=foo test-set-default" "VAR=foo" + # --unset works + + mkTest "VAR=foo test-unset" "VAR=" + + # --add-flags works + + mkTest "test-args" "abc" + # given flags are appended + + mkTest "test-args foo" "abc foo" + + # --run works + + mkTest "test-run" "bar\nVAR=" + # --run & --set works + + mkTest "test-run-and-set" "VAR=bar" + + # --prefix works + + mkTest "VAR=foo test-prefix" "VAR=abc:foo" + # sets variable if not set yet + + mkTest "test-prefix" "VAR=abc" + # prepends value only once + + mkTest "VAR=abc test-prefix" "VAR=abc" + # Moves value to the front if it already existed + + mkTest "VAR=foo:abc test-prefix" "VAR=abc:foo" + + mkTest "VAR=abc:foo:bar test-prefix-multi" "VAR=abc:foo:bar" + # Doesn't overwrite parts of the string + + mkTest "VAR=test:abcde:test test-prefix" "VAR=abc:test:abcde:test" + # Only append the value once when given multiple times in a parameter + # to makeWrapper + + mkTest "test-prefix" "VAR=abc" + + + # --suffix works + + mkTest "VAR=foo test-suffix" "VAR=foo:abc" + # sets variable if not set yet + + mkTest "test-suffix" "VAR=abc" + # adds the same value only once + + mkTest "VAR=abc test-suffix" "VAR=abc" + + mkTest "VAR=abc:foo test-suffix" "VAR=abc:foo" + # --prefix in combination with --suffix + + mkTest "VAR=abc test-prefix-and-suffix" "VAR=foo:abc:bar" + + # --suffix-each works + + mkTest "VAR=abc test-suffix-each" "VAR=abc:foo:bar:def" + # --prefix-each works + + mkTest "VAR=abc test-prefix-each" "VAR=bar:def:foo:abc" + # --suffix-contents works + + mkTest "VAR=abc test-suffix-contents" "VAR=abc:foo:bar" + # --prefix-contents works + + mkTest "VAR=abc test-prefix-contents" "VAR=bar:foo:abc" + + "touch $out" + ) diff --git a/third_party/nixpkgs/pkgs/tools/X11/obconf/default.nix b/third_party/nixpkgs/pkgs/tools/X11/obconf/default.nix index 5cbcec63c5..8074e52c7c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/obconf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/obconf/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libglade, openbox, - imlib2, libstartup_notification, makeWrapper, libSM }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk3, openbox, + imlib2, libxml2, libstartup_notification, makeWrapper, libSM }: stdenv.mkDerivation rec { pname = "obconf"; - version = "2.0.4"; + version = "unstable-2015-02-13"; - src = fetchurl { - url = "http://openbox.org/dist/obconf/obconf-${version}.tar.gz"; - sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; + src = fetchgit { + url = "git://git.openbox.org/dana/obconf"; + rev = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39"; + sha256 = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk2 libglade libSM openbox imlib2 libstartup_notification - makeWrapper + nativeBuildInputs = [ + autoreconfHook + pkg-config ]; + buildInputs = [ + gtk3 + imlib2 + libSM + libstartup_notification + libxml2 + makeWrapper + openbox + ]; + + postPatch = '' + substituteInPlace configure.ac --replace 2.0.4 ${version} + ''; + postInstall = '' wrapProgram $out/bin/obconf --prefix XDG_DATA_DIRS : ${openbox}/share/ ''; @@ -23,8 +37,8 @@ stdenv.mkDerivation rec { meta = { description = "GUI configuration tool for openbox"; homepage = "http://openbox.org/wiki/ObConf"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.lhvwb ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sfrijters ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix index 0126d68ed2..ea97aa5e52 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-5dzgvoR6qGlVz0RJ1j9B4yna1aCbOczVLcU++GWNEL8="; + sha256 = "sha256-Uzkp4G72oarpBnhbgLoh//JW9kg/t2XpNbiZTNxMl/w="; }; - cargoSha256 = "sha256-cqipYIH/XHMe7ppsXPVnDfsUqXoIep7CHiOGEPbZK4M="; + cargoSha256 = "sha256-92E76QwxeOLp9sfO066L97r2FO/9nQ4DaVyWJrL9L2M="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix b/third_party/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix index 2dc91f037a..f6e92bd528 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix @@ -2,36 +2,55 @@ , lib , fetchFromGitHub , curl +, gawk , python3 +, installShellFiles }: stdenv.mkDerivation rec { pname = "amazon-ec2-utils"; - version = "1.3"; + version = "2.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-utils"; - rev = version; - hash = "sha256:04dpxaaca144a74r6d93q4lp0d5l32v07rldj7v2v1c6s9nsf4mv"; + rev = "v${version}"; + hash = "sha256-u1rHBV8uVcCywvQNYagtDleYB12tmhyqDbXTBzt45dk="; }; + outputs = [ "out" "man" ]; + + strictDeps = true; buildInputs = [ python3 ]; - - propagatedBuildInputs = [ - curl + nativeBuildInputs = [ + installShellFiles ]; installPhase = '' - mkdir -p $out/bin/ + install -Dm755 -t $out/bin/ ebsnvme-id + install -Dm755 -t $out/bin/ ec2-metadata + install -Dm755 -t $out/bin/ ec2nvme-nsid + install -Dm755 -t $out/bin/ ec2udev-vbd - cp ebsnvme-id $out/bin/ - cp ec2-metadata $out/bin/ - cp ec2udev-vbd $out/bin/ - cp ec2udev-vcpu $out/bin/ + install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-hvm-devices.rules + install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-xen-vbd-devices.rules + install -Dm644 -t $out/lib/udev/rules.d/ 53-ec2-read-ahead-kb.rules + install -Dm644 -t $out/lib/udev/rules.d/ 70-ec2-nvme-devices.rules + install -Dm644 -t $out/lib/udev/rules.d/ 60-cdrom_id.rules - chmod +x $out/bin/* + installManPage doc/*.8 + ''; + + postFixup = '' + for i in $out/etc/udev/rules.d/*.rules $out/lib/udev/rules.d/*.rules ; do + substituteInPlace "$i" \ + --replace '/usr/sbin' "$out/bin" \ + --replace '/bin/awk' '${gawk}/bin/awk' + done + + substituteInPlace "$out/bin/ec2-metadata" \ + --replace 'curl' '${curl}/bin/curl' ''; doInstallCheck = true; @@ -48,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aws/amazon-ec2-utils"; description = "Contains a set of utilities and settings for Linux deployments in EC2"; license = licenses.mit; - maintainers = with maintainers; [ ketzacoatl ]; + maintainers = with maintainers; [ ketzacoatl thefloweringash ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix index 84372423d6..9528d6e7ae 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "aws-lambda-runtime-interface-emulator"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-runtime-interface-emulator"; rev = "v${version}"; - sha256 = "sha256-vbVygZzLlJlxaRF/LIqSJP0gZGyu1wSSdeVjILl/OJE="; + sha256 = "sha256-h4T4Go5gzKF1g1jSNZkx5U0icFxEZMYyS4L6cZMTFEY="; }; - vendorSha256 = "sha256-WcvYPGgkrK7Zs5IplAoUTay5ys9LrDJHpRN3ywEdWRM="; + vendorSha256 = "sha256-ncUtJKJnWiut0ZVKm3MLWKq8eyHrTgv6Nva8xcvvqSI="; # disabled because I lack the skill doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index a686596112..d4d62cf527 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-5cBQFkagDfMb8xvEQgWlVbYp++mXIHl2p5TZuiaO4Rw="; }; - vendorSha256 = "sha256-iRJjN+fG5tFhMvHHR3pnWW8Y9VWopuKVv/AgivJC4Eo="; + vendorSha256 = "sha256-THqVvu5eJs1ZTUQ3JxGIt7IsoMhSkeMNicBGbkPz63A="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 49762e3278..11cf6c5307 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.22.21"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.35"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-yzfy6MjXC6LeydLNVXQvcK4UmpVQP/jJ+W2jMgpNMgw="; + hash = "sha256-GsMclLh/VtPaNjD+XDKqTYeSX29R2aRS7If9G918OWY="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 6f6e06db2a..efd1ecfee3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -29,6 +29,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { --replace "javaproperties~=0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ --replace "scp~=0.13.2" "scp" \ + --replace "PyNaCl~=1.4.0" "PyNaCl" \ --replace "jsondiff~=1.2.0" "jsondiff~=1.2" \ --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \ --replace "mock~=4.0" "mock" @@ -141,6 +142,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { pydocumentdb PyGithub pygments + pynacl pyopenssl pytz pyyaml diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 0339caa72c..d27805bb25 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -118,7 +118,7 @@ let }; azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" - "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32da"; + "sha256-zl/bDsli7d/oXNgiBekXfLC720RSZXRuOLO7vx8W3HM="; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; @@ -466,7 +466,8 @@ let inherit version; sha256 = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; }; - # sdist lacks tests + + # sdist doesn't provide tests doCheck = false; }); @@ -502,6 +503,16 @@ let }; }); + argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec { + version = "1.8.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-SreailmO/AgRBGv3dnj4VkMnbokAzWT5xPEPEQ4QEb0="; + }; + }); + sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec { name = "sshtunnel-${version}"; version = "0.1.5"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 7208e4e8cd..5e038b70d5 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.76.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-KhAS8JUM6dobcSJ/QaRhxv2jNpn6AFqiDRCdxeKHwZE="; + sha256 = "sha256-nem090YUHi80P2akWRVuswJxhQ5mIP9fHWVAY4k2LFE="; }; - vendorSha256 = "sha256-6eiJR7DRx3zYKT3B1wBTGSvPQwYw3815K1V/Y9aBX5E="; + vendorSha256 = "sha256-+G3utnWjAilHx9u9P0DtaDf09UT/VqTe7yO/k5o/zMc="; doCheck = false; 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 322e3535b8..9f79db8592 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-GSdVwpYmJ3VnZaMQ8SjzcHpeefFjSaZXRcUAXEI9PKo="; }; - vendorSha256 = "sha256-RZ4cy9XHpWRP85G4A1/qYPjt/4CZ7pgECf+rsViPjGE="; + vendorSha256 = "sha256-4iQxqhXMGeMgHarjVY/rCLr7Am1mniqxTkMxbcp3fGI="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix index 65ca85b463..03571ac7cf 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix @@ -1,11 +1,26 @@ { lib, fetchFromGitHub, python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec { + version = "2.4.7"; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = "pyparsing"; + rev = "pyparsing_${version}"; + sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "gixy"; version = "0.1.20"; # package is only compatible with python 2.7 and 3.5+ - disabled = with python3.pkgs; !(pythonAtLeast "3.5" || isPy27); + disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27); # fetching from GitHub because the PyPi source is missing the tests src = fetchFromGitHub { @@ -19,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { sed -ie '/argparse/d' setup.py ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ cached-property configargparse pyparsing diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix index 266eb0e509..496f478be8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage rec { - version = "0.9.59"; + version = "0.9.79"; src = fetchzip { url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; - sha256 = "05dalrm82mspqrjqb3ya7cjd3vbn1a4wij8cdndfyh0rrbwvglys"; + sha256 = "17f34ifzdrkbap2hhd0y0rdcn8j0svxzsqw0qhcp3h68z3098hdv"; }; packageJSON = ./package.json; diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json index 9bb3c2feef..4a0f5bf613 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.9.59", + "version": "0.9.79", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -47,7 +47,7 @@ "minimist": "^1.2.5", "multiparty": "^4.2.1", "@yetzt/nedb": "^1.8.0", - "node-forge": "^0.10.0", + "node-forge": "^1.0.0", "ws": "^5.2.3", "yauzl": "^2.10.0" }, diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock index cadd3df717..219114d50f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock @@ -2,115 +2,123 @@ # yarn lockfile v1 -"@babel/code-frame@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== +"@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.0" + "@babel/highlight" "^7.16.7" -"@babel/generator@^7.16.0", "@babel/generator@^7.4.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" - integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew== +"@babel/generator@^7.17.0", "@babel/generator@^7.4.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.16.0" + "@babel/types" "^7.17.0" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" - integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== +"@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/helper-get-function-arity" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" - integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== +"@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/types" "^7.16.0" + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-hoist-variables@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" - integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-split-export-declaration@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" - integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== +"@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.0" + "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== - -"@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== +"@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/helper-validator-identifier" "^7.15.7" + "@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/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.0", "@babel/parser@^7.16.3", "@babel/parser@^7.4.3": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" - integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng== +"@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.4.3": + 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/template@^7.16.0", "@babel/template@^7.4.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" - integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== +"@babel/template@^7.16.7", "@babel/template@^7.4.0": + 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.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" "@babel/traverse@^7.4.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" - integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== + 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.0" - "@babel/generator" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.3" - "@babel/types" "^7.16.0" + "@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.16.0", "@babel/types@^7.4.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" - integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== +"@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.4.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.15.7" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" "@mysql/xdevapi@*": - version "8.0.27" - resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.27.tgz#1e19335dee89d413c7ffbfd29340a92930d2e9c6" - integrity sha512-8CVaCDxqXp6qDizxlO/GYPWv2NsYnXXPQygDHFH2rkow2Pi6zlYF7k+mIeRkH4KLZZQ+HZCfjJQkKB1kN5zTzg== + version "8.0.28" + resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.28.tgz#68f3b029e72ef8519e5aad7084ded2573af058b5" + integrity sha512-+plt6Ua6uVpV754w6QR2Lzg0iria7ynlaPPORM0YfiP6cabIAyanlnNmKkXmYR3eGc8kL3GW/zw4HJ2CIlnR6A== dependencies: google-protobuf "3.14.0" parsimmon "1.16.0" -"@sendgrid/client@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.0.tgz#f90cb8759c96e1d90224f29ad98f8fdc2be287f3" - integrity sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA== +"@sendgrid/client@^7.6.1": + version "7.6.1" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz#de17fe9f04af3bdb69aca44fc407316de87cea3b" + integrity sha512-q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ== dependencies: "@sendgrid/helpers" "^7.6.0" axios "^0.21.4" @@ -123,11 +131,11 @@ deepmerge "^4.2.2" "@sendgrid/mail@*": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.0.tgz#e74ee30110527feab5d3b83d68af0cd94537f6d2" - integrity sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw== + version "7.6.1" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz#f7bbfc93781b0b6126549bf4b3649805295b02aa" + integrity sha512-F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg== dependencies: - "@sendgrid/client" "^7.6.0" + "@sendgrid/client" "^7.6.1" "@sendgrid/helpers" "^7.6.0" "@tootallnate/once@2": @@ -140,22 +148,22 @@ resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== -"@types/ldapjs@^1.0.9": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz#34077176af2b06186bd54e4a38ceb6e852387fa4" - integrity sha512-O4D1frY6xy2mQr5WouNPeltMe5EHdmU4FxbLDC6TMDX5HXOuafusGu+7Y9WAoqBaYHZ5hcFa7jfkpggyexfeXQ== +"@types/ldapjs@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-2.2.2.tgz#cf79510d8dc34e5579442c2743f8a228427eb99c" + integrity sha512-U5HdnwIZ5uZa+f3usxdqgyfNmOROxOxXvQdQtsu6sKo8fte5vej9br2csHxPvXreAbAO1bs8/rdEzvCLpi67nQ== dependencies: "@types/node" "*" "@types/node@*": - version "16.11.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz#ac7fb693ac587ee182c3780c26eb65546a1a3c10" - integrity sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw== + version "17.0.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c" + integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw== "@types/node@^14.14.14", "@types/node@^14.14.28": - version "14.18.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a" - integrity sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ== + version "14.18.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz#9bd810a959e1728d78df0f68b5c825b8ea7156f4" + integrity sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg== "@types/webidl-conversions@*": version "6.1.1" @@ -424,23 +432,23 @@ abstract-logging@^2.0.0: integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + 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.24" - negotiator "0.6.2" + mime-types "~2.1.34" + negotiator "0.6.3" acme-client@*: - version "4.1.3" - resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.1.3.tgz#2a37c7c8835da259eeb0cbfd8bcb7be3b9e4725b" - integrity sha512-QL3F5us72ChCDsrSztGnTRo1HXBaOeptyUi6v2PNksZL728wZ3ZaxAST+QcfhAt2tOrr9Zl6zJorqS5vLBTtXA== + version "4.2.3" + resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.3.tgz#f789be89113dc6a656c7bd697fb72e08e52f6877" + integrity sha512-fzNysQ7OdBWPlELQbjjjLo2eqrmMpdd6DZ9/d4jxHJItpKC4GKYLTxA3UIYca9BcY4Zr8un/axyEGnyRHKLGbw== dependencies: - axios "0.21.1" + axios "0.21.4" backo2 "^1.0.0" bluebird "^3.5.0" debug "^4.1.1" - node-forge "^0.10.0" + node-forge "^1.2.0" acorn-globals@^6.0.0: version "6.0.0" @@ -473,9 +481,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.5.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895" - integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw== + version "8.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== aedes-packet@^1.0.0: version "1.0.0" @@ -637,9 +645,9 @@ archiver-utils@^2.1.0: readable-stream "^2.0.0" archiver-zip-encrypted@*: - version "1.0.10" - resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.10.tgz#4218a602b6088480703996808484fc1fc4a60a41" - integrity sha512-Lrufx6UOithz1Z4C0PrwTsbF7qak/TDhMs3nAC/mFxV/tPKKaMhdjUgHV1UqRjcu2FaS8ghNexFVcNZ+CdFaXA== + version "1.0.11" + resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.11.tgz#43a7b9ebba56c6689132b58e556df13e6ddd5878" + integrity sha512-uXQzXSrZKW7TZ1g4BhfJFt1KjlKqY4SnCgDS6QhQKJoAriPXPKqhFQbvaIirWcR0pi5h3UF5Ktau7FVnS3AsGw== dependencies: aes-js "^3.1.2" archiver "^5.3.0" @@ -821,9 +829,9 @@ async@^2.0.1: lodash "^4.17.14" async@^3.2.0, async@~3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" - integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== + version "3.2.3" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" + integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== asynckit@^0.4.0: version "0.4.0" @@ -845,20 +853,27 @@ aws4@^1.8.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.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== - dependencies: - follow-redirects "^1.10.0" - -axios@^0.21.1, axios@^0.21.4: +axios@0.21.4, axios@^0.21.1, axios@^0.21.4: 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" +axios@^0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" + integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== + dependencies: + follow-redirects "^1.14.4" + +axios@^0.25.0: + version "0.25.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" + integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== + dependencies: + follow-redirects "^1.14.7" + babel-cli@^6.16.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" @@ -1459,23 +1474,7 @@ bn.js@^4.0.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -body-parser@^1.19.0: +body-parser@1.19.1, body-parser@^1.19.0: version "1.19.1" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== @@ -1542,9 +1541,9 @@ bson@^1.1.4: integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg== bson@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.0.tgz#15c3b39ba3940c3d915a0c44d51459f4b4fbf1b2" - integrity sha512-8jw1NU1hglS+Da1jDOUYuNcBJ4cNHCFIqzlwoFNnsTOg2R/ox0aTYcTiBN4dzRa9q7Cvy6XErh3L8ReTEb9AQQ== + version "4.6.1" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.1.tgz#2b5da517539bb0f7f3ffb54ac70a384ca899641c" + integrity sha512-I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw== dependencies: buffer "^5.6.0" @@ -1599,11 +1598,6 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - bytes@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" @@ -2053,12 +2047,12 @@ config-master@^2.0.4: feature-detect-es6 "^1.3.1" walk-back "^2.0.1" -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== +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.1.2" + safe-buffer "5.2.1" content-type@~1.0.4: version "1.0.4" @@ -2086,10 +2080,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +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== cookies@0.8.0: version "0.8.0" @@ -2138,12 +2132,12 @@ cpu-features@0.0.2: nan "^2.14.1" crc-32@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" - integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== + version "1.2.1" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.1.tgz#436d2bcaad27bcb6bd073a2587139d3024a16460" + integrity sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w== dependencies: exit-on-epipe "~1.0.1" - printj "~1.1.0" + printj "~1.3.1" crc32-stream@^3.0.1: version "3.0.1" @@ -2617,16 +2611,16 @@ express-ws@4.0.0: ws "^5.2.0" express@^4.17.0: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + 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.0" - content-disposition "0.5.3" + body-parser "1.19.1" + content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.0" + cookie "0.4.1" cookie-signature "1.0.6" debug "2.6.9" depd "~1.1.2" @@ -2640,13 +2634,13 @@ express@^4.17.0: on-finished "~2.3.0" parseurl "~1.3.3" path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" + proxy-addr "~2.0.7" + qs "6.9.6" range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.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" @@ -2906,10 +2900,10 @@ flagged-respawn@^1.0.1: resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== -follow-redirects@^1.10.0, follow-redirects@^1.14.0: - version "1.14.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" - integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A== +follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7: + version "1.14.8" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -3178,9 +3172,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== google-auth-library@^7.0.2: - version "7.10.3" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.3.tgz#e553683315b3095eebef3a8c019c09446cb75a3c" - integrity sha512-VBwUCrjR+/p/J4ifSZRXG0XEc3Cm+2xnFrJi3A9DC2GzbCUK5j+R6CfqS7jyu1Hureb1PV53ZXZS1QV9PYUCrw== + version "7.12.0" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz#7965db6bc20cb31f2df05a08a296bbed6af69426" + integrity sha512-RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -3192,12 +3186,12 @@ google-auth-library@^7.0.2: jws "^4.0.0" lru-cache "^6.0.0" -google-p12-pem@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz#c3d61c2da8e10843ff830fdb0d2059046238c1d4" - integrity sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A== +google-p12-pem@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.3.tgz#5497998798ee86c2fc1f4bb1f92b7729baf37537" + integrity sha512-MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ== dependencies: - node-forge "^0.10.0" + node-forge "^1.0.0" google-protobuf@3.14.0: version "3.14.0" @@ -3217,17 +3211,17 @@ googleapis-common@^5.0.2: uuid "^8.0.0" googleapis@*: - version "92.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-92.0.0.tgz#291b9826a5a4509a9e9a6974ef942328857bfe18" - integrity sha512-5HgJg7XvqEEJ+GO+2gvnzd5cAcDuSS/VB6nW7thoyj2GMq9nH4VvJwncSevinjLCnv06a+VSxrXNiL5vePHojA== + version "95.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz#63f6e28e78874044585f1e86c100a308a44fb385" + integrity sha512-ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA== dependencies: google-auth-library "^7.0.2" googleapis-common "^5.0.2" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== grunt-cli@~1.4.2: version "1.4.3" @@ -3305,12 +3299,12 @@ grunt@^1.0.1: rimraf "~3.0.2" gtoken@^5.0.4: - version "5.3.1" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.1.tgz#c1c2598a826f2b5df7c6bb53d7be6cf6d50c3c78" - integrity sha512-yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ== + version "5.3.2" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f" + integrity sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ== dependencies: gaxios "^4.0.0" - google-p12-pem "^3.0.3" + google-p12-pem "^3.1.3" jws "^4.0.0" handlebars-array@^0.2.0: @@ -3528,18 +3522,7 @@ html-minifier@*: relateurl "^0.2.7" uglify-js "^3.5.1" -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@1.8.1, http-errors@~1.8.0: +http-errors@1.8.1, 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== @@ -3550,17 +3533,6 @@ http-errors@1.8.1, http-errors@~1.8.0: statuses ">= 1.5.0 < 2" toidentifier "1.0.1" -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -3619,9 +3591,9 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== image-size@*: - version "1.0.0" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750" - integrity sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw== + version "1.0.1" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz#86d6cfc2b1d19eab5d2b368d4b9194d9e48541c5" + integrity sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ== dependencies: queue "6.0.2" @@ -3648,11 +3620,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - ini@^1.3.4: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" @@ -3724,10 +3691,10 @@ is-buffer@^1.1.5, is-buffer@~1.1.6: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-core-module@^2.2.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== +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" @@ -4317,11 +4284,11 @@ ldap-filter@^0.3.3: assert-plus "^1.0.0" ldapauth-fork@*: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.1.tgz#18779a9c30371c5bbea02e3b6aaadb60819ad29c" - integrity sha512-EdELQz8zgPruqV2y88PAuAiZCgTaMjex/kEA2PIcOlPYFt75C9QFt5HGZKVQo8Sf/3Mwnr1AtiThHKcq+pRtEg== + version "5.0.2" + resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.2.tgz#abe6a99eac578b7730e1331254643d78dffae6fa" + integrity sha512-fWrrBwJ162rzQIIqfPsfCHy/861kEalQNIu16gmwOMr5cmdfjNkw7XfTlzCTJHybnFg9oW9WaX4DGXa0xiGPmA== dependencies: - "@types/ldapjs" "^1.0.9" + "@types/ldapjs" "^2.2.2" bcryptjs "^2.4.0" ldapjs "^2.2.1" lru-cache "^6.0.0" @@ -4677,7 +4644,7 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": 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.19, mime-types@~2.1.24: +mime-types@^2.1.12, 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== @@ -4717,9 +4684,9 @@ minimalistic-assert@^1.0.0: integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== "minimatch@2 || 3", minimatch@^3.0.4, 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== + version "3.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== dependencies: brace-expansion "^1.1.7" @@ -4852,27 +4819,22 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: +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== multiparty@^4.2.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz#bee5fb5737247628d39dab4979ffd6d57bf60ef6" - integrity sha512-NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q== + version "4.2.3" + resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.3.tgz#6b14981badb5ad3f0929622868751810368d4633" + integrity sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ== dependencies: - http-errors "~1.8.0" + http-errors "~1.8.1" safe-buffer "5.2.1" uid-safe "2.1.5" @@ -4932,10 +4894,10 @@ ncp@~2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +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.6.0: version "2.6.2" @@ -4965,16 +4927,16 @@ node-addon-api@^1.7.1: integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== node-fetch@^2.3.0, node-fetch@^2.6.1: - version "2.6.6" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" - integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" -node-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-forge@^1.0.0, node-forge@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c" + integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w== node-rdpjs-2@*: version "0.3.5" @@ -5136,9 +5098,9 @@ object-get@^2.0.0, object-get@^2.0.2, object-get@^2.1.0: integrity sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg== object-inspect@^1.9.0: - version "1.11.1" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b" - integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA== + 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-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -5476,15 +5438,15 @@ passport-reddit@*: pkginfo "0.3.x" passport-saml@*: - version "3.2.0" - resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.0.tgz#72ec8203df6dd872a205b8d5f578859a4e723e42" - integrity sha512-EUzL+Wk8ZVdvOYhCBTkUrR1fwuMwF9za1FinFabP5Tl9qeJktsJWfoiBz7Fk6jQvpLwfnfryGdvwcOlGVct41A== + version "3.2.1" + resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.1.tgz#c489a61a4c2dd93ddec1d53952a595b9f33e15e8" + integrity sha512-Y8aD94B6MTLht57BlBrDauEgvtWjuSeINKk7NadXlpT/OBmsoGGYPpb0FJeBtdyGX4GEbZARAkxvBEqsL8E7XQ== dependencies: "@xmldom/xmldom" "^0.7.5" debug "^4.3.2" passport-strategy "^1.0.0" xml-crypto "^2.1.3" - xml-encryption "^1.3.0" + xml-encryption "^2.0.0" xml2js "^0.4.23" xmlbuilder "^15.1.1" @@ -5502,9 +5464,9 @@ passport-twitter@*: xtraverse "0.1.x" passport@*: - version "0.5.0" - resolved "https://registry.yarnpkg.com/passport/-/passport-0.5.0.tgz#7914aaa55844f9dce8c3aa28f7d6b73647ee0169" - integrity sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg== + version "0.5.2" + resolved "https://registry.yarnpkg.com/passport/-/passport-0.5.2.tgz#0cb38dd8a71552c8390dfa6a9a6f7f3909954bcf" + integrity sha512-w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw== dependencies: passport-strategy "1.x.x" pause "0.0.1" @@ -5526,7 +5488,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-parse@^1.0.6: +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== @@ -5594,10 +5556,10 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-pool@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" - integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== +pg-pool@^3.4.1, pg-pool@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905" + integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ== pg-protocol@^1.5.0: version "1.5.0" @@ -5615,7 +5577,7 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@8.7.1, pg@^8.4.0: +pg@8.7.1: version "8.7.1" resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== @@ -5628,12 +5590,25 @@ pg@8.7.1, pg@^8.4.0: pg-types "^2.1.0" pgpass "1.x" -pgpass@1.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz#85eb93a83800b20f8057a2b029bf05abaf94ea9c" - integrity sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w== +pg@^8.4.0: + version "8.7.3" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44" + integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw== dependencies: - split2 "^3.1.1" + buffer-writer "2.0.0" + packet-reader "1.0.0" + pg-connection-string "^2.5.0" + pg-pool "^3.5.1" + pg-protocol "^1.5.0" + pg-types "^2.1.0" + pgpass "1.x" + +pgpass@1.x: + version "1.0.5" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d" + integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug== + dependencies: + split2 "^4.1.0" pgtools@0.3.2: version "0.3.2" @@ -5646,9 +5621,9 @@ pgtools@0.3.2: yargs "^5.0.0" picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + 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" @@ -5697,9 +5672,9 @@ please-upgrade-node@^3.2.0: semver-compare "^1.0.0" plivo@*: - version "4.25.1" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.25.1.tgz#ae33f216c58ebcce62c74ae3229d615b8f3ad382" - integrity sha512-AaUxFqxanP855M5Pe2FQ6IGfNVtCXryvjqEso5crRCqPW7IGmNnSONift7RMaEiu4vMXPNjrSPYv5Wfo6UkR0A== + version "4.27.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz#af41278962b858bccf2bc04a9e28fd6008a0bd9a" + integrity sha512-bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -5762,10 +5737,10 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= -printj@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" - integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== +printj@~1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz#9af6b1d55647a1587ac44f4c1654a4b95b8e12cb" + integrity sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg== private@^0.1.6, private@^0.1.8: version "0.1.8" @@ -5796,7 +5771,7 @@ promise@^8.0.2: dependencies: asap "~2.0.6" -proxy-addr@~2.0.5: +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== @@ -5846,27 +5821,22 @@ qlobber@^3.0.2, qlobber@^3.1.0: resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211" integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug== -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - qs@6.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.6.0, qs@^6.7.0, qs@^6.9.4: - version "6.10.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe" - integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw== + version "6.10.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" + integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== dependencies: side-channel "^1.0.4" qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.5.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== querystring@^0.2.0: version "0.2.1" @@ -5911,16 +5881,6 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-body@2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" @@ -5965,7 +5925,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@^3.1.1, 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== @@ -6258,12 +6218,13 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + 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.2.0" - path-parse "^1.0.6" + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" ret@~0.1.10: version "0.1.15" @@ -6419,10 +6380,10 @@ semver@^6.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== +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" @@ -6431,22 +6392,22 @@ send@0.17.1: escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.7.2" + http-errors "1.8.1" mime "1.6.0" - ms "2.1.1" + ms "2.1.3" on-finished "~2.3.0" range-parser "~1.2.1" statuses "~1.5.0" -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== +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.1" + send "0.17.2" set-blocking@^2.0.0: version "2.0.0" @@ -6463,11 +6424,6 @@ set-value@^2.0.0, set-value@^2.0.1: is-plain-object "^2.0.3" split-string "^3.0.1" -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -6498,9 +6454,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.6" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" - integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== + 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== slash@^1.0.0: version "1.0.0" @@ -6638,14 +6594,12 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split2@^3.1.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" - integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== - dependencies: - readable-stream "^3.0.0" +split2@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" + integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== -sprintf-js@^1.0.3: +sprintf-js@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== @@ -6661,9 +6615,9 @@ sqlstring@2.3.1: integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= ssh2@*: - version "1.5.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.5.0.tgz#4dc559ba98a1cbb420e8d42998dfe35d0eda92bc" - integrity sha512-iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA== + version "1.6.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz#61aebc3a6910fe488f9c85cd8355bdf8d4724e05" + integrity sha512-lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q== dependencies: asn1 "^0.2.4" bcrypt-pbkdf "^1.0.2" @@ -6672,9 +6626,9 @@ ssh2@*: nan "^2.15.0" sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + 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" @@ -6833,6 +6787,11 @@ supports-color@^7.1.0: 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== + symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -6985,11 +6944,6 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -7072,11 +7026,11 @@ tweetnacl@^1.0.1: integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== twilio@*: - version "3.71.3" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.71.3.tgz#a446d2b49f8c1ed60b0dd830c919921358c17203" - integrity sha512-m9eda9fvkHxMMDHRtXj8WKI0ViP4EG4xS5au5ay3ScfModhBZ1ZtyfWZ0AfWI++A7a1T1j3ZVNIZ+AMLwxSffw== + version "3.74.0" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz#df912476543b7004cd765d566449c27174289091" + integrity sha512-r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A== dependencies: - axios "^0.21.4" + axios "^0.25.0" dayjs "^1.8.29" https-proxy-agent "^5.0.0" jsonwebtoken "^8.5.1" @@ -7095,7 +7049,7 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-is@~1.6.17, type-is@~1.6.18: +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== @@ -7119,9 +7073,9 @@ uglify-js@^2.6: uglify-to-browserify "~1.0.0" uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.14.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.5.tgz#cdabb7d4954231d80cb4a927654c4655e51f4859" - integrity sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ== + version "3.15.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz#9403dc6fa5695a6172a91bc983ea39f0f7c9086d" + integrity sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ== uglify-to-browserify@~1.0.0: version "1.0.2" @@ -7146,17 +7100,17 @@ unc-path-regex@^0.1.2: integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= underscore.string@~3.3.5: - version "3.3.5" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023" - integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg== + version "3.3.6" + resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159" + integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ== dependencies: - sprintf-js "^1.0.3" + sprintf-js "^1.1.1" util-deprecate "^1.0.2" underscore@^1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1" - integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g== + version "1.13.2" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz#276cea1e8b9722a8dbed0100a407dda572125881" + integrity sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g== underscore@~1.8.3: version "1.8.3" @@ -7219,9 +7173,9 @@ url-join@^4.0.1: integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== url-parse@^1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" - integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== + 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" @@ -7392,11 +7346,11 @@ web-push@*: urlsafe-base64 "^1.0.0" webdav@*: - version "4.7.0" - resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.7.0.tgz#3964c72c1d5dc9854c0031b43e464f260f22476e" - integrity sha512-R1WZl/JeFPAmSEn1EPCmxSdPY8IxS/P0qnxAzBeRqEewpxVJ/UiCMJwXHLpyVsKYA1PIb1dYv+UTQsbNaQnLBw== + version "4.8.0" + resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.8.0.tgz#b5d7ebe46039d048c177fb021c9da591cf3ac6f0" + integrity sha512-CVJvxu0attEfoQUKraDiNh3uMjNPNl+BY0pbcKbyc/X+8IXDnqAT4tT4Ge12w+j49fYuVpFVkpEGwBZabv7Uhw== dependencies: - axios "^0.21.1" + axios "^0.24.0" base-64 "^1.0.0" fast-xml-parser "^3.19.0" he "^1.2.0" @@ -7579,14 +7533,14 @@ ws@5.2.3, ws@^5.2.0: async-limiter "~1.0.0" ws@^7.0.0: - version "7.5.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" - integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== + version "7.5.7" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== ws@^8.2.3: - version "8.3.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d" - integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw== + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== xml-crypto@^2.1.3: version "2.1.3" @@ -7596,14 +7550,13 @@ xml-crypto@^2.1.3: "@xmldom/xmldom" "^0.7.0" xpath "0.0.32" -xml-encryption@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz#4cad44a59bf8bdec76d7865ce0b89e13c09962f4" - integrity sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA== +xml-encryption@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-2.0.0.tgz#d4e1eb3ec1f2c5d2a2a0a6e23d199237e8b4bf83" + integrity sha512-4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q== dependencies: "@xmldom/xmldom" "^0.7.0" escape-html "^1.0.3" - node-forge "^0.10.0" xpath "0.0.32" xml-name-validator@^4.0.0: diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix index 53a2c18c81..c9d5925b65 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix @@ -2,115 +2,123 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.16.0.tgz"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + 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_generator___generator_7.16.0.tgz"; + name = "_babel_generator___generator_7.17.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz"; - sha512 = "RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew=="; + 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_function_name___helper_function_name_7.16.0.tgz"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; - sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog=="; + 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_get_function_arity___helper_get_function_arity_7.16.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; - sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ=="; + 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_hoist_variables___helper_hoist_variables_7.16.0.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; - sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; + 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_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; - sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw=="; + 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_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + 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_highlight___highlight_7.16.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz"; - sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + 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_parser___parser_7.16.4.tgz"; + name = "_babel_highlight___highlight_7.16.10.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.16.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz"; - sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; + 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_template___template_7.16.0.tgz"; + name = "_babel_parser___parser_7.17.0.tgz"; path = fetchurl { - name = "_babel_template___template_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz"; - sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; + 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_traverse___traverse_7.16.3.tgz"; + name = "_babel_template___template_7.16.7.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.16.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz"; - sha512 = "eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag=="; + 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_types___types_7.16.0.tgz"; + name = "_babel_traverse___traverse_7.17.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz"; - sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; + name = "_babel_traverse___traverse_7.17.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz"; + sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg=="; }; } { - name = "_mysql_xdevapi___xdevapi_8.0.27.tgz"; + name = "_babel_types___types_7.17.0.tgz"; path = fetchurl { - name = "_mysql_xdevapi___xdevapi_8.0.27.tgz"; - url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.27.tgz"; - sha512 = "8CVaCDxqXp6qDizxlO/GYPWv2NsYnXXPQygDHFH2rkow2Pi6zlYF7k+mIeRkH4KLZZQ+HZCfjJQkKB1kN5zTzg=="; + 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 = "_sendgrid_client___client_7.6.0.tgz"; + name = "_mysql_xdevapi___xdevapi_8.0.28.tgz"; path = fetchurl { - name = "_sendgrid_client___client_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.0.tgz"; - sha512 = "cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA=="; + name = "_mysql_xdevapi___xdevapi_8.0.28.tgz"; + url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.28.tgz"; + sha512 = "+plt6Ua6uVpV754w6QR2Lzg0iria7ynlaPPORM0YfiP6cabIAyanlnNmKkXmYR3eGc8kL3GW/zw4HJ2CIlnR6A=="; + }; + } + { + name = "_sendgrid_client___client_7.6.1.tgz"; + path = fetchurl { + name = "_sendgrid_client___client_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz"; + sha512 = "q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ=="; }; } { @@ -122,11 +130,11 @@ }; } { - name = "_sendgrid_mail___mail_7.6.0.tgz"; + name = "_sendgrid_mail___mail_7.6.1.tgz"; path = fetchurl { - name = "_sendgrid_mail___mail_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.0.tgz"; - sha512 = "0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw=="; + name = "_sendgrid_mail___mail_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz"; + sha512 = "F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg=="; }; } { @@ -146,27 +154,27 @@ }; } { - name = "_types_ldapjs___ldapjs_1.0.11.tgz"; + name = "_types_ldapjs___ldapjs_2.2.2.tgz"; path = fetchurl { - name = "_types_ldapjs___ldapjs_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz"; - sha512 = "O4D1frY6xy2mQr5WouNPeltMe5EHdmU4FxbLDC6TMDX5HXOuafusGu+7Y9WAoqBaYHZ5hcFa7jfkpggyexfeXQ=="; + name = "_types_ldapjs___ldapjs_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-2.2.2.tgz"; + sha512 = "U5HdnwIZ5uZa+f3usxdqgyfNmOROxOxXvQdQtsu6sKo8fte5vej9br2csHxPvXreAbAO1bs8/rdEzvCLpi67nQ=="; }; } { - name = "_types_node___node_16.11.12.tgz"; + name = "_types_node___node_17.0.17.tgz"; path = fetchurl { - name = "_types_node___node_16.11.12.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz"; - sha512 = "+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="; + name = "_types_node___node_17.0.17.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz"; + sha512 = "e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw=="; }; } { - name = "_types_node___node_14.18.0.tgz"; + name = "_types_node___node_14.18.11.tgz"; path = fetchurl { - name = "_types_node___node_14.18.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz"; - sha512 = "0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ=="; + name = "_types_node___node_14.18.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz"; + sha512 = "zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg=="; }; } { @@ -450,19 +458,19 @@ }; } { - name = "accepts___accepts_1.3.7.tgz"; + name = "accepts___accepts_1.3.8.tgz"; path = fetchurl { - name = "accepts___accepts_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + name = "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 = "acme_client___acme_client_4.1.3.tgz"; + name = "acme_client___acme_client_4.2.3.tgz"; path = fetchurl { - name = "acme_client___acme_client_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/acme-client/-/acme-client-4.1.3.tgz"; - sha512 = "QL3F5us72ChCDsrSztGnTRo1HXBaOeptyUi6v2PNksZL728wZ3ZaxAST+QcfhAt2tOrr9Zl6zJorqS5vLBTtXA=="; + name = "acme_client___acme_client_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.3.tgz"; + sha512 = "fzNysQ7OdBWPlELQbjjjLo2eqrmMpdd6DZ9/d4jxHJItpKC4GKYLTxA3UIYca9BcY4Zr8un/axyEGnyRHKLGbw=="; }; } { @@ -506,11 +514,11 @@ }; } { - name = "acorn___acorn_8.6.0.tgz"; + name = "acorn___acorn_8.7.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz"; - sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; + name = "acorn___acorn_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; }; } { @@ -666,11 +674,11 @@ }; } { - name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.10.tgz"; + name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.11.tgz"; path = fetchurl { - name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.10.tgz"; - sha512 = "Lrufx6UOithz1Z4C0PrwTsbF7qak/TDhMs3nAC/mFxV/tPKKaMhdjUgHV1UqRjcu2FaS8ghNexFVcNZ+CdFaXA=="; + name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.11.tgz"; + sha512 = "uXQzXSrZKW7TZ1g4BhfJFt1KjlKqY4SnCgDS6QhQKJoAriPXPKqhFQbvaIirWcR0pi5h3UF5Ktau7FVnS3AsGw=="; }; } { @@ -874,11 +882,11 @@ }; } { - name = "async___async_3.2.2.tgz"; + name = "async___async_3.2.3.tgz"; path = fetchurl { - name = "async___async_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz"; - sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="; + name = "async___async_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; } { @@ -913,14 +921,6 @@ sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; } - { - name = "axios___axios_0.21.1.tgz"; - path = fetchurl { - name = "axios___axios_0.21.1.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; - sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; - }; - } { name = "axios___axios_0.21.4.tgz"; path = fetchurl { @@ -929,6 +929,22 @@ sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; } + { + name = "axios___axios_0.24.0.tgz"; + path = fetchurl { + name = "axios___axios_0.24.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; + sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + }; + } + { + name = "axios___axios_0.25.0.tgz"; + path = fetchurl { + name = "axios___axios_0.25.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz"; + sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; + }; + } { name = "babel_cli___babel_cli_6.26.0.tgz"; path = fetchurl { @@ -1473,14 +1489,6 @@ sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; } - { - name = "body_parser___body_parser_1.19.0.tgz"; - path = fetchurl { - name = "body_parser___body_parser_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; - }; - } { name = "body_parser___body_parser_1.19.1.tgz"; path = fetchurl { @@ -1538,11 +1546,11 @@ }; } { - name = "bson___bson_4.6.0.tgz"; + name = "bson___bson_4.6.1.tgz"; path = fetchurl { - name = "bson___bson_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/bson/-/bson-4.6.0.tgz"; - sha512 = "8jw1NU1hglS+Da1jDOUYuNcBJ4cNHCFIqzlwoFNnsTOg2R/ox0aTYcTiBN4dzRa9q7Cvy6XErh3L8ReTEb9AQQ=="; + name = "bson___bson_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/bson/-/bson-4.6.1.tgz"; + sha512 = "I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw=="; }; } { @@ -1609,14 +1617,6 @@ sha1 = "0ygVQE1olpn4Wk6k+odV3ROpYEg="; }; } - { - name = "bytes___bytes_3.1.0.tgz"; - path = fetchurl { - name = "bytes___bytes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; - }; - } { name = "bytes___bytes_3.1.1.tgz"; path = fetchurl { @@ -2050,11 +2050,11 @@ }; } { - name = "content_disposition___content_disposition_0.5.3.tgz"; + name = "content_disposition___content_disposition_0.5.4.tgz"; path = fetchurl { - name = "content_disposition___content_disposition_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + name = "content_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=="; }; } { @@ -2090,11 +2090,11 @@ }; } { - name = "cookie___cookie_0.4.0.tgz"; + name = "cookie___cookie_0.4.1.tgz"; path = fetchurl { - name = "cookie___cookie_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + name = "cookie___cookie_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; } { @@ -2154,11 +2154,11 @@ }; } { - name = "crc_32___crc_32_1.2.0.tgz"; + name = "crc_32___crc_32_1.2.1.tgz"; path = fetchurl { - name = "crc_32___crc_32_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz"; - sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + name = "crc_32___crc_32_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.1.tgz"; + sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; }; } { @@ -2714,11 +2714,11 @@ }; } { - name = "express___express_4.17.1.tgz"; + name = "express___express_4.17.2.tgz"; path = fetchurl { - name = "express___express_4.17.1.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + name = "express___express_4.17.2.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz"; + sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; } { @@ -2994,11 +2994,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.6.tgz"; + name = "follow_redirects___follow_redirects_1.14.8.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.6.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz"; - sha512 = "fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="; + name = "follow_redirects___follow_redirects_1.14.8.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz"; + sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; }; } { @@ -3290,19 +3290,19 @@ }; } { - name = "google_auth_library___google_auth_library_7.10.3.tgz"; + name = "google_auth_library___google_auth_library_7.12.0.tgz"; path = fetchurl { - name = "google_auth_library___google_auth_library_7.10.3.tgz"; - url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.3.tgz"; - sha512 = "VBwUCrjR+/p/J4ifSZRXG0XEc3Cm+2xnFrJi3A9DC2GzbCUK5j+R6CfqS7jyu1Hureb1PV53ZXZS1QV9PYUCrw=="; + name = "google_auth_library___google_auth_library_7.12.0.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz"; + sha512 = "RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w=="; }; } { - name = "google_p12_pem___google_p12_pem_3.1.2.tgz"; + name = "google_p12_pem___google_p12_pem_3.1.3.tgz"; path = fetchurl { - name = "google_p12_pem___google_p12_pem_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz"; - sha512 = "tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A=="; + name = "google_p12_pem___google_p12_pem_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.3.tgz"; + sha512 = "MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ=="; }; } { @@ -3322,19 +3322,19 @@ }; } { - name = "googleapis___googleapis_92.0.0.tgz"; + name = "googleapis___googleapis_95.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_92.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-92.0.0.tgz"; - sha512 = "5HgJg7XvqEEJ+GO+2gvnzd5cAcDuSS/VB6nW7thoyj2GMq9nH4VvJwncSevinjLCnv06a+VSxrXNiL5vePHojA=="; + name = "googleapis___googleapis_95.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz"; + sha512 = "ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA=="; }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + 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=="; }; } { @@ -3394,11 +3394,11 @@ }; } { - name = "gtoken___gtoken_5.3.1.tgz"; + name = "gtoken___gtoken_5.3.2.tgz"; path = fetchurl { - name = "gtoken___gtoken_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.1.tgz"; - sha512 = "yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ=="; + name = "gtoken___gtoken_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz"; + sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ=="; }; } { @@ -3649,14 +3649,6 @@ sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; }; } - { - name = "http_errors___http_errors_1.7.2.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; - }; - } { name = "http_errors___http_errors_1.8.1.tgz"; path = fetchurl { @@ -3665,14 +3657,6 @@ sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; } - { - name = "http_errors___http_errors_1.7.3.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; - }; - } { name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { @@ -3738,11 +3722,11 @@ }; } { - name = "image_size___image_size_1.0.0.tgz"; + name = "image_size___image_size_1.0.1.tgz"; path = fetchurl { - name = "image_size___image_size_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz"; - sha512 = "JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw=="; + name = "image_size___image_size_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz"; + sha512 = "VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ=="; }; } { @@ -3777,14 +3761,6 @@ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } - { - name = "inherits___inherits_2.0.3.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; - }; - } { name = "ini___ini_1.3.8.tgz"; path = fetchurl { @@ -3882,11 +3858,11 @@ }; } { - name = "is_core_module___is_core_module_2.8.0.tgz"; + name = "is_core_module___is_core_module_2.8.1.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + 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=="; }; } { @@ -4530,11 +4506,11 @@ }; } { - name = "ldapauth_fork___ldapauth_fork_5.0.1.tgz"; + name = "ldapauth_fork___ldapauth_fork_5.0.2.tgz"; path = fetchurl { - name = "ldapauth_fork___ldapauth_fork_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.1.tgz"; - sha512 = "EdELQz8zgPruqV2y88PAuAiZCgTaMjex/kEA2PIcOlPYFt75C9QFt5HGZKVQo8Sf/3Mwnr1AtiThHKcq+pRtEg=="; + name = "ldapauth_fork___ldapauth_fork_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.2.tgz"; + sha512 = "fWrrBwJ162rzQIIqfPsfCHy/861kEalQNIu16gmwOMr5cmdfjNkw7XfTlzCTJHybnFg9oW9WaX4DGXa0xiGPmA=="; }; } { @@ -4970,11 +4946,11 @@ }; } { - name = "minimatch___minimatch_3.0.4.tgz"; + name = "minimatch___minimatch_3.0.5.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.0.5.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw=="; }; } { @@ -5113,14 +5089,6 @@ sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } - { - name = "ms___ms_2.1.1.tgz"; - path = fetchurl { - name = "ms___ms_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; - }; - } { name = "ms___ms_2.1.2.tgz"; path = fetchurl { @@ -5138,11 +5106,11 @@ }; } { - name = "multiparty___multiparty_4.2.2.tgz"; + name = "multiparty___multiparty_4.2.3.tgz"; path = fetchurl { - name = "multiparty___multiparty_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz"; - sha512 = "NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q=="; + name = "multiparty___multiparty_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.3.tgz"; + sha512 = "Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ=="; }; } { @@ -5202,11 +5170,11 @@ }; } { - name = "negotiator___negotiator_0.6.2.tgz"; + name = "negotiator___negotiator_0.6.3.tgz"; path = fetchurl { - name = "negotiator___negotiator_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + name = "negotiator___negotiator_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; } { @@ -5250,19 +5218,19 @@ }; } { - name = "node_fetch___node_fetch_2.6.6.tgz"; + name = "node_fetch___node_fetch_2.6.7.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.6.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz"; - sha512 = "Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA=="; + 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_forge___node_forge_0.10.0.tgz"; + name = "node_forge___node_forge_1.2.1.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_forge___node_forge_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz"; + sha512 = "Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w=="; }; } { @@ -5426,11 +5394,11 @@ }; } { - name = "object_inspect___object_inspect_1.11.1.tgz"; + name = "object_inspect___object_inspect_1.12.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz"; - sha512 = "If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="; + 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=="; }; } { @@ -5802,11 +5770,11 @@ }; } { - name = "passport_saml___passport_saml_3.2.0.tgz"; + name = "passport_saml___passport_saml_3.2.1.tgz"; path = fetchurl { - name = "passport_saml___passport_saml_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.0.tgz"; - sha512 = "EUzL+Wk8ZVdvOYhCBTkUrR1fwuMwF9za1FinFabP5Tl9qeJktsJWfoiBz7Fk6jQvpLwfnfryGdvwcOlGVct41A=="; + name = "passport_saml___passport_saml_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.1.tgz"; + sha512 = "Y8aD94B6MTLht57BlBrDauEgvtWjuSeINKk7NadXlpT/OBmsoGGYPpb0FJeBtdyGX4GEbZARAkxvBEqsL8E7XQ=="; }; } { @@ -5826,11 +5794,11 @@ }; } { - name = "passport___passport_0.5.0.tgz"; + name = "passport___passport_0.5.2.tgz"; path = fetchurl { - name = "passport___passport_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/passport/-/passport-0.5.0.tgz"; - sha512 = "ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg=="; + name = "passport___passport_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/passport/-/passport-0.5.2.tgz"; + sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw=="; }; } { @@ -5954,11 +5922,11 @@ }; } { - name = "pg_pool___pg_pool_3.4.1.tgz"; + name = "pg_pool___pg_pool_3.5.1.tgz"; path = fetchurl { - name = "pg_pool___pg_pool_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz"; - sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; + name = "pg_pool___pg_pool_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz"; + sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; }; } { @@ -5986,11 +5954,19 @@ }; } { - name = "pgpass___pgpass_1.0.4.tgz"; + name = "pg___pg_8.7.3.tgz"; path = fetchurl { - name = "pgpass___pgpass_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz"; - sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; + name = "pg___pg_8.7.3.tgz"; + url = "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz"; + sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw=="; + }; + } + { + name = "pgpass___pgpass_1.0.5.tgz"; + path = fetchurl { + name = "pgpass___pgpass_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz"; + sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; }; } { @@ -6002,11 +5978,11 @@ }; } { - name = "picomatch___picomatch_2.3.0.tgz"; + name = "picomatch___picomatch_2.3.1.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + name = "picomatch___picomatch_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; } { @@ -6074,11 +6050,11 @@ }; } { - name = "plivo___plivo_4.25.1.tgz"; + name = "plivo___plivo_4.27.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.25.1.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.25.1.tgz"; - sha512 = "AaUxFqxanP855M5Pe2FQ6IGfNVtCXryvjqEso5crRCqPW7IGmNnSONift7RMaEiu4vMXPNjrSPYv5Wfo6UkR0A=="; + name = "plivo___plivo_4.27.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz"; + sha512 = "bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw=="; }; } { @@ -6154,11 +6130,11 @@ }; } { - name = "printj___printj_1.1.2.tgz"; + name = "printj___printj_1.3.1.tgz"; path = fetchurl { - name = "printj___printj_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz"; - sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + name = "printj___printj_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz"; + sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; }; } { @@ -6265,14 +6241,6 @@ sha512 = "B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug=="; }; } - { - name = "qs___qs_6.7.0.tgz"; - path = fetchurl { - name = "qs___qs_6.7.0.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; - sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; - }; - } { name = "qs___qs_6.9.6.tgz"; path = fetchurl { @@ -6282,19 +6250,19 @@ }; } { - name = "qs___qs_6.10.2.tgz"; + name = "qs___qs_6.10.3.tgz"; path = fetchurl { - name = "qs___qs_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz"; - sha512 = "mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw=="; + name = "qs___qs_6.10.3.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz"; + sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; }; } { - name = "qs___qs_6.5.2.tgz"; + name = "qs___qs_6.5.3.tgz"; path = fetchurl { - name = "qs___qs_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + name = "qs___qs_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz"; + sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; } { @@ -6353,14 +6321,6 @@ sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; } - { - name = "raw_body___raw_body_2.4.0.tgz"; - path = fetchurl { - name = "raw_body___raw_body_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; - }; - } { name = "raw_body___raw_body_2.4.2.tgz"; path = fetchurl { @@ -6706,11 +6666,11 @@ }; } { - name = "resolve___resolve_1.20.0.tgz"; + name = "resolve___resolve_1.22.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + name = "resolve___resolve_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; } { @@ -6922,19 +6882,19 @@ }; } { - name = "send___send_0.17.1.tgz"; + name = "send___send_0.17.2.tgz"; path = fetchurl { - name = "send___send_0.17.1.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + name = "send___send_0.17.2.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; } { - name = "serve_static___serve_static_1.14.1.tgz"; + name = "serve_static___serve_static_1.14.2.tgz"; path = fetchurl { - name = "serve_static___serve_static_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + name = "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=="; }; } { @@ -6953,14 +6913,6 @@ sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; } - { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; - }; - } { name = "setprototypeof___setprototypeof_1.2.0.tgz"; path = fetchurl { @@ -6994,11 +6946,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.6.tgz"; + name = "signal_exit___signal_exit_3.0.7.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + 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=="; }; } { @@ -7146,11 +7098,11 @@ }; } { - name = "split2___split2_3.2.2.tgz"; + name = "split2___split2_4.1.0.tgz"; path = fetchurl { - name = "split2___split2_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz"; - sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; + name = "split2___split2_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz"; + sha512 = "VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ=="; }; } { @@ -7178,19 +7130,19 @@ }; } { - name = "ssh2___ssh2_1.5.0.tgz"; + name = "ssh2___ssh2_1.6.0.tgz"; path = fetchurl { - name = "ssh2___ssh2_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.5.0.tgz"; - sha512 = "iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA=="; + name = "ssh2___ssh2_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz"; + sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; }; } { - name = "sshpk___sshpk_1.16.1.tgz"; + name = "sshpk___sshpk_1.17.0.tgz"; path = fetchurl { - name = "sshpk___sshpk_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + name = "sshpk___sshpk_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz"; + sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; } { @@ -7377,6 +7329,14 @@ 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 = "symbol_tree___symbol_tree_3.2.4.tgz"; path = fetchurl { @@ -7545,14 +7505,6 @@ sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; }; } - { - name = "toidentifier___toidentifier_1.0.0.tgz"; - path = fetchurl { - name = "toidentifier___toidentifier_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; - }; - } { name = "toidentifier___toidentifier_1.0.1.tgz"; path = fetchurl { @@ -7658,11 +7610,11 @@ }; } { - name = "twilio___twilio_3.71.3.tgz"; + name = "twilio___twilio_3.74.0.tgz"; path = fetchurl { - name = "twilio___twilio_3.71.3.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.71.3.tgz"; - sha512 = "m9eda9fvkHxMMDHRtXj8WKI0ViP4EG4xS5au5ay3ScfModhBZ1ZtyfWZ0AfWI++A7a1T1j3ZVNIZ+AMLwxSffw=="; + name = "twilio___twilio_3.74.0.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz"; + sha512 = "r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A=="; }; } { @@ -7698,11 +7650,11 @@ }; } { - name = "uglify_js___uglify_js_3.14.5.tgz"; + name = "uglify_js___uglify_js_3.15.1.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.14.5.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.5.tgz"; - sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; + name = "uglify_js___uglify_js_3.15.1.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz"; + sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; } { @@ -7738,19 +7690,19 @@ }; } { - name = "underscore.string___underscore.string_3.3.5.tgz"; + name = "underscore.string___underscore.string_3.3.6.tgz"; path = fetchurl { - name = "underscore.string___underscore.string_3.3.5.tgz"; - url = "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz"; - sha512 = "g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg=="; + name = "underscore.string___underscore.string_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz"; + sha512 = "VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ=="; }; } { - name = "underscore___underscore_1.13.1.tgz"; + name = "underscore___underscore_1.13.2.tgz"; path = fetchurl { - name = "underscore___underscore_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz"; - sha512 = "hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="; + name = "underscore___underscore_1.13.2.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz"; + sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="; }; } { @@ -7834,11 +7786,11 @@ }; } { - name = "url_parse___url_parse_1.5.3.tgz"; + name = "url_parse___url_parse_1.5.4.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz"; - sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ=="; + 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=="; }; } { @@ -8042,11 +7994,11 @@ }; } { - name = "webdav___webdav_4.7.0.tgz"; + name = "webdav___webdav_4.8.0.tgz"; path = fetchurl { - name = "webdav___webdav_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/webdav/-/webdav-4.7.0.tgz"; - sha512 = "R1WZl/JeFPAmSEn1EPCmxSdPY8IxS/P0qnxAzBeRqEewpxVJ/UiCMJwXHLpyVsKYA1PIb1dYv+UTQsbNaQnLBw=="; + name = "webdav___webdav_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/webdav/-/webdav-4.8.0.tgz"; + sha512 = "CVJvxu0attEfoQUKraDiNh3uMjNPNl+BY0pbcKbyc/X+8IXDnqAT4tT4Ge12w+j49fYuVpFVkpEGwBZabv7Uhw=="; }; } { @@ -8258,19 +8210,19 @@ }; } { - name = "ws___ws_7.5.6.tgz"; + name = "ws___ws_7.5.7.tgz"; path = fetchurl { - name = "ws___ws_7.5.6.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz"; - sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; + name = "ws___ws_7.5.7.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; }; } { - name = "ws___ws_8.3.0.tgz"; + name = "ws___ws_8.5.0.tgz"; path = fetchurl { - name = "ws___ws_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz"; - sha512 = "Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw=="; + name = "ws___ws_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz"; + sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; }; } { @@ -8282,11 +8234,11 @@ }; } { - name = "xml_encryption___xml_encryption_1.3.0.tgz"; + name = "xml_encryption___xml_encryption_2.0.0.tgz"; path = fetchurl { - name = "xml_encryption___xml_encryption_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz"; - sha512 = "3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA=="; + name = "xml_encryption___xml_encryption_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-2.0.0.tgz"; + sha512 = "4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q=="; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 2e8eabfc1a..47bb6a67cb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.21.920"; + version = "6.21.1109"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "1qghc5380h4b2pczksmky3kcffz5wn9shw033w4f969wl96p31fz"; + sha256 = "12zxp9kvi070nzxbrnrfsyla38ryb69zlidw6cvypmsgqnylfxj7"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "034iwqxpqhnm6i292fakva7vkwrrzamwcvbm7xyccpd54adj0grn"; + sha256 = "03vhdmzyd16r0kdxpkq9azyy1h705lk4sbgnbw5fr8gkifwng60f"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 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 2576208e8d..436c629062 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "yYzcziEKPSiMvw9LWd60MkHmYFAvN7Qza6Z117NOOv0="; }; - vendorSha256 = "0V9sHi/E095txnfF8YFW5O7o0e1H3sdn3tw5LqB92tI="; + vendorSha256 = "7cGVeja1YE96PEV1IRklyh6MeMDFAP+2TpYvvFkBYnQ="; # some tests require network access to scaleway's API, failing when sandboxed doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index 04f66eaba9..3fa9472735 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.10"; + version = "1.7.11"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F1+goZURc0f1dWV/PGxSVtqHkuePACq4+UzfMTEVJ0M="; + sha256 = "sha256-a2GoTdt6l6Yayaz1n1VdKxwrziNuFk/MO/6PvjqRxVM="; }; - vendorSha256 = "sha256-Duu6lP87KKLC1eGIebycBSIPw7FN6BBxPexize9+jPE="; + vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk="; subPackages = [ "cmd/stripe" diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix index 998fcdf59f..24b6d4ddcb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -2,27 +2,27 @@ buildGoModule rec { pname = "syft"; - version = "0.36.0"; + version = "0.37.10"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JNW4sozNtLey7uAj1xECR/ui+/1L02moZKuGzWXIh5k="; + sha256 = "sha256-j3/WE13djrgI7S6YISg9kPIkV0IR0C65QU8zj0z0MVg="; # 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; postFetch = '' cd "$out" commit="$(git rev-parse HEAD)" - source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad) + source_date_epoch="$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad)" substituteInPlace "$out/internal/version/build.go" \ --replace 'gitCommit = valueNotProvided' "gitCommit = \"$commit\"" \ --replace 'buildDate = valueNotProvided' "buildDate = \"$source_date_epoch\"" find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-urDDb+53KSvUOjVRY/geENIQM1vvBUDddlNpQw3LcLg="; + vendorSha256 = "sha256-gIcPxSzWzldR9UX4iB2fkwc0BfATT1B+Nge+sGefmj8="; nativeBuildInputs = [ installShellFiles ]; @@ -33,6 +33,7 @@ buildGoModule rec { "-w" "-X github.com/anchore/syft/internal/version.version=${version}" "-X github.com/anchore/syft/internal/version.gitTreeState=clean" + "-X github.com/anchore/syft/internal/version.gitDescription=v${version}" ]; # tests require a running docker instance diff --git a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix index fb129760dc..d8e084218d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.1.2"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "7e5377e8460ebb1253b9974e02d0077ffc58f2b4712cf7896f1bef7e9f580cd4"; + sha256 = "4ec8a02cf7cd31822668e97befe96f0a7a32b1103abfe27c1bff643d3bf16588"; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 957ad7f51e..47320eff77 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DH4vr6WiGwzT9zTMs/UqVoCHhpOSoT5t8P9plTPt8ZQ="; + sha256 = "sha256-6eOoFZ2ms1upnbO4brKYKBSPw/9cnQT1Cz/0A4dwoxc="; }; - vendorSha256 = "sha256-1m3izHfxMUvUiz21NRjqdNS95sXf8Rwlu5TuQ411190="; + vendorSha256 = "sha256-ZHVcLmjz7cfL5CjUwCEoWr5fgWZmNsCzHL83Mr+p7kA="; excludedPackages = "misc"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix index f5344a63f4..c93a750e48 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix @@ -1,5 +1,14 @@ -{ stdenv, lib, fetchurl, p7zip }: +{ stdenv, lib, fetchurl, p7zip, uasm, useUasm ? stdenv.isx86_64 }: +let + inherit (stdenv.hostPlatform) system; + platformSuffix = + if useUasm then + { + x86_64-linux = "_x64"; + }.${system} or (throw "`useUasm` is not supported for system ${system}") + else ""; +in stdenv.mkDerivation rec { pname = "7zz"; version = "21.07"; @@ -11,19 +20,18 @@ stdenv.mkDerivation rec { sourceRoot = "CPP/7zip/Bundles/Alone2"; - # we need https://github.com/nidud/asmc/tree/master/source/asmc/linux in order - # to build with the optimized assembler but that doesn't support building with - # GCC: https://github.com/nidud/asmc/issues/8 - makefile = "../../cmpl_gcc.mak"; # "../../cmpl_gcc_x64.mak"; + makeFlags = lib.optionals useUasm [ "MY_ASM=uasm" ]; - nativeBuildInputs = [ p7zip ]; + makefile = "../../cmpl_gcc${platformSuffix}.mak"; + + nativeBuildInputs = [ p7zip ] ++ lib.optionals useUasm [ uasm ]; enableParallelBuilding = true; installPhase = '' runHook preInstall - install -Dm555 -t $out/bin b/g/7zz + install -Dm555 -t $out/bin b/g${platformSuffix}/7zz install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt runHook postInstall @@ -37,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line archiver utility"; - homepage = "https://7zip.org"; + homepage = "https://7-zip.org"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ anna328p peterhoeg ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix index 584f981aff..2f2581f04a 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }) ] ++ lib.optional enableNLS (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; name = "unzip-6.0-natspec.patch"; sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; }); diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix index b94d514e8e..0a62020b3b 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix @@ -1,25 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, which, docutils, freetype, pango }: +{ lib +, stdenv +, fetchFromGitHub +, docutils +, pkg-config +, freetype +, pango +}: stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.12"; + version = "8.14.13"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk="; + hash = "sha256-31cEBtVn7GlNIsPkRiW0DyKA/giLeJ86EUZr8zjYy3s="; }; configureFlags = [ "--INSTALL=install" ]; - buildFlags = [ - "CC=${stdenv.cc}/bin/cc" - ]; - - nativeBuildInputs = [ which pkg-config docutils ]; + nativeBuildInputs = [ docutils pkg-config ]; buildInputs = [ freetype pango ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index d9c34c3fef..7237ba880c 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.01.13"; + version = "2022.01.28"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-jXXUdPAmU6JcnqWBnzc9tfjEyLSdYxZZJh4w4iSCD1w="; + hash = "sha256-+g5oKUfm6vRuRQfOx0QDueYMabgScL8Mfw5GJcXQztg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix index 0724821321..93960a5278 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -52,9 +52,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Minimalistic scrobbler for libre.fm & last.fm"; - homepage = "https://github.com/mariusor/mpris-scrobbler"; - license = licenses.mit; + homepage = "https://github.com/mariusor/mpris-scrobbler"; + license = licenses.mit; maintainers = with maintainers; [ emantor ]; - platforms = platforms.unix; + platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mpris-scrobbler.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix index 40399f2699..3a00ddc995 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -15,23 +15,32 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.4.2"; + version = "0.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-8a68iFbqqKwtZvufu1Vnv6hGHIQ3HU34wjuQsmr1NUA="; + sha256 = "sha256-9fNYNhHS9wqrk2bZnrkkGU1OaDu/16RA8fz+Zj9xsyQ="; }; - postPatch = '' - sed -i requirements.txt \ - -e 's!librosa==[^"]*!librosa!' \ - -e 's!gruut\[.*\]~=2.0.0!gruut!' \ - -e 's!mecab-python3==[^"]*!mecab-python3!' \ - -e 's!numba==[^"]*!numba!' \ - -e 's!numpy==[^"]*!numpy!' \ - -e 's!umap-learn==[^"]*!umap-learn!' + postPatch = let + relaxedConstraints = [ + "gruut" + "librosa" + "mecab-python3" + "numba" + "numpy" + "umap-learn" + "torch" + ]; + in '' + sed -r -i \ + ${lib.concatStringsSep "\n" (map (package: + ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' + ) relaxedConstraints)} + requirements.txt ''; nativeBuildInputs = with python3.pkgs; [ @@ -43,8 +52,8 @@ python3.pkgs.buildPythonApplication rec { coqpit flask fsspec - gruut gdown + gruut inflect jieba librosa @@ -54,15 +63,17 @@ python3.pkgs.buildPythonApplication rec { pandas pypinyin pysbd - pytorch + pytorch-bin pyworld scipy soundfile tensorboardx tensorflow + torchaudio-bin tqdm umap-learn unidic-lite + webrtcvad ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix index 688906e684..40c3b594dc 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -1,6 +1,7 @@ { lib , multiStdenv , fetchFromGitHub +, fetchpatch , substituteAll , pkgsi686Linux , libnotify @@ -34,28 +35,28 @@ let tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "47216c8a73d77e7431ec536fb3e251aed06cc420"; - sha256 = "sha256-cwAzWu5j3ch/56a6JmEoKCsxVNTk6tiZswNdNT6qzX0="; + rev = "8e669aa6990e0ed219c169d491472d749f54c393"; + sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4="; }; # Derived from vst3.wrap vst3 = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; - rev = "v3.7.3_build_20-patched"; + rev = "v3.7.4_build_25-patched"; fetchSubmodules = true; - sha256 = "sha256-m2y7No7BNbIjLNgdAqIAEr6UuAZZ/wwM2+iPWKK17gQ="; + sha256 = "sha256-oHRJZItw+he5M+beVZkUrhJir6rgFZ80ORzA73mJT2A="; }; in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.7.0"; + version = "3.8.0"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - sha256 = "sha256-dz7kScNrVUsjokJntzUCJzDIboqi3vQI+RpXl0UFmUQ="; + sha256 = "sha256-XacJjHxsp60/l36pFPGonUyOsyFF2lmqplAaisHXZDY="; }; # Unpack subproject sources @@ -77,6 +78,14 @@ in multiStdenv.mkDerivation rec { libxcb32 = pkgsi686Linux.xorg.libxcb; inherit libnotify wine; }) + # Remove with next yabridge update + (fetchpatch { + name = "fix-for-wine-7.1.patch"; + url = "https://github.com/robbert-vdh/yabridge/commit/de470d345ab206b08f6d4a147b6af1d285a4211f.patch"; + sha256 = "sha256-xJx1zvxD+DIjbkm7Ovoy4RaAvjx936/j/7AYUPh/kOo="; + includes = [ "src/wine-host/xdnd-proxy.cpp" ]; + }) + ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index 255b0eb88c..9f6bc0c9a9 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 8eae0442..ec0649da 100644 +index 95ecb728..cb30f3af 100644 --- a/meson.build +++ b/meson.build -@@ -196,6 +196,7 @@ if with_32bit_libraries or with_bitbridge +@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge 'boost_filesystem', static : with_static_boost, dirs : [ @@ -10,7 +10,7 @@ index 8eae0442..ec0649da 100644 # Used by Arch based distros '/usr/local/lib32', '/usr/lib32', -@@ -219,7 +220,7 @@ if is_64bit_system +@@ -224,7 +225,7 @@ if is_64bit_system xcb_64bit_dep = dependency('xcb') endif if with_32bit_libraries or with_bitbridge @@ -20,7 +20,7 @@ index 8eae0442..ec0649da 100644 # These are all headers-only libraries, and thus won't require separate 32-bit diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 6e32b4c9..f6eb09eb 100644 +index 1a457f03..20ca1e63 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp @@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const { diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix index 902734de0b..d2e8438e0c 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoSha256 = "sha256-/VREh/f4bAt2DXCqK0noEjn+4hcK5VZUn+gdbYbeAmk="; + cargoSha256 = "sha256-pwy2Q2HUCihr7W81hGvDm9EiZHk9G8knSy0yxPy6hl8="; patches = [ # By default, yabridgectl locates libyabridge.so by using diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch index 7b8e10b2ba..905068f75f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch @@ -1,5 +1,5 @@ diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs -index bc5ccfc4..c6d119bc 100644 +index bc5f6a81..0fcd38d3 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs @@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet}; @@ -10,7 +10,7 @@ index bc5ccfc4..c6d119bc 100644 use std::path::{Path, PathBuf}; use which::which; use xdg::BaseDirectories; -@@ -233,34 +234,24 @@ impl Config { +@@ -235,34 +236,27 @@ impl Config { } } None => { @@ -20,6 +20,8 @@ index bc5ccfc4..c6d119bc 100644 - // in the error message when `libyabridge-vst2.so` can't be found. - let system_path = Path::new("/usr/lib"); + // Search through NIX_PROFILES & data home directory if no path was set explicitly. ++ // NIX_PROFILES is iterated in reverse from the most specific (the user profile) to ++ // the least specific (the system profile). + let nix_profiles = env::var("NIX_PROFILES"); let user_path = xdg_dirs.get_data_home(); - let lib_directories = [ @@ -35,6 +37,7 @@ index bc5ccfc4..c6d119bc 100644 - ]; + let lib_directories = nix_profiles.iter() + .flat_map(|profiles| profiles.split(' ') ++ .rev() + .map(|profile| Path::new(profile).join("lib"))) + .chain(iter::once(user_path.clone())); + @@ -56,12 +59,12 @@ index bc5ccfc4..c6d119bc 100644 )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs -index 8c273f92..432619ec 100644 +index 48cce4fa..209e40e4 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs -@@ -148,7 +148,7 @@ fn main() -> Result<()> { - .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") - .long_about( +@@ -151,7 +151,7 @@ fn main() -> Result<()> { + .help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") + .long_help( "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ - is not set, then yabridgectl will look in both '/usr/lib' and \ + is not set, then yabridgectl will look through 'NIX_PROFILES' and \ diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix index 69f745ecc1..b04263a716 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -7,7 +7,6 @@ , perl , perlPackages , util-linux -, asciidoc , asciidoctor , mbuffer , makeWrapper @@ -19,14 +18,14 @@ stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.31.3"; + version = "0.32.0"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2"; + sha256 = "HmvNtIgFfeaiFuSRobWlcJqusPSYtqAqx+79+CeNVDQ="; }; - nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; + nativeBuildInputs = [ asciidoctor makeWrapper ]; buildInputs = with perlPackages; [ perl DateCalc ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix index fb7fc11795..3c16fb1e0e 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.31.1"; + version = "2.32"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "QK63H+Qyd8zEue84vECcyAP6FH8az++1PZmbrPvBgrU="; + sha256 = "xRoF/HJ4ekHL/Uk6ISQP+65nChRT+n9xLTYcZMJxyvo="; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix index edc2eccd92..a360d0099f 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,10 +1,10 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "CliFx"; version = "2.0.6"; sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; }) + (fetchNuGet { pname = "CliFx"; version = "2.2.1"; sha256 = "1yxxl3jgl6sadar1g9175s62fag5f30lqpgrf58djll3509rbgw5"; }) (fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; }) (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; }) - (fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; }) + (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; }) (fetchNuGet { pname = "Spectre.Console"; version = "0.43.0"; sha256 = "17yh20s17fkcs3iyb5yylqh90jvb36gdn0aaglq3d67rpmcrl5gc"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) ] diff --git a/third_party/nixpkgs/pkgs/tools/backup/gh2md/default.nix b/third_party/nixpkgs/pkgs/tools/backup/gh2md/default.nix new file mode 100644 index 0000000000..5306080aa6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/gh2md/default.nix @@ -0,0 +1,27 @@ +{ lib +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "gh2md"; + version = "2.0.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "7a277939d4781f4ca741eccb74fc70f0aa85811185da52219878129cba7f1d77"; + }; + + propagatedBuildInputs = with python3Packages; [ six requests python-dateutil ]; + + # uses network + doCheck = false; + + pythonImportsCheck = [ "gh2md" ]; + + meta = with lib; { + description = "Export Github repository issues to markdown files"; + homepage = "https://github.com/mattduck/gh2md"; + license = licenses.mit; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index 2b7a9b0faa..f44b18f468 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "kopia"; - version = "0.10.0"; + version = "0.10.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-445E+RiYlfDNOuw51Wdsavb52RjL3FkcrN9EeKmJ+Q8="; + sha256 = "sha256-L6aAcIGNNts4rsJNCmuKSFtBWe/VUzhwiNmlpKCZ+B4="; }; - vendorSha256 = "sha256-wq/9MUCeJBZjrg0SXgHYMyXodqIF3KLRHQmvi7gbv5M="; + vendorSha256 = "sha256-jswXHGjDnH3dVjpvdbr/sMYyWmGvTAZB77oKBMkBsnI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix index 2878e93fe7..648074eb5b 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -5,7 +5,7 @@ callPackage ./generic.nix (args // { sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr"; extraPatches = [ - ./../../../servers/sql/mysql/abi-check.patch + ./abi-check.patch ]; extraPostInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/abi-check.patch b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/abi-check.patch similarity index 100% rename from third_party/nixpkgs/pkgs/servers/sql/mysql/abi-check.patch rename to third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/abi-check.patch diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix index e6f98bdee3..e7869965c7 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -1,15 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, which -, glib, gtk2 +{ lib +, stdenv +, fetchurl +, gettext +, pkg-config +, which +, glib +, gtk2 , enableSoftening ? true }: stdenv.mkDerivation rec { pname = "dvdisaster"; - version = "0.79.5"; + version = "0.79.9"; src = fetchurl { - url = "http://dvdisaster.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"; + url = "https://dvdisaster.jcea.es/downloads/${pname}-${version}.tar.bz2"; + hash = "sha256-eclOJ33pS2aP4F7RUHc84ynpH7sTv2dsO4vn5vB248M="; }; nativeBuildInputs = [ gettext pkg-config which ]; @@ -40,6 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' + runHook preCheck pushd regtest mkdir -p "$TMP"/{log,regtest} @@ -59,9 +66,11 @@ stdenv.mkDerivation rec { done popd + runHook postCheck ''; postInstall = '' + rm -f $out/bin/dvdisaster-uninstall.sh mkdir -pv $out/share/applications cp contrib/dvdisaster.desktop $out/share/applications/ @@ -73,7 +82,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://dvdisaster.net/"; + homepage = "https://dvdisaster.jcea.es/"; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' Dvdisaster provides a margin of safety against data loss on CD and diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix index aa6b6d31a8..17abb6503c 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix @@ -20,18 +20,19 @@ stdenv.mkDerivation rec { "CPPFLAGS=-DNDEBUG" "CFLAGS=-O3" "CXXFLAGS=-O3" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "CXX=${stdenv.cc.targetPrefix}c++"; + "CXX=${stdenv.cc.targetPrefix}c++" + ]; setupHook = ./lzip-setup-hook.sh; doCheck = true; enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://www.nongnu.org/lzip/lzip.html"; description = "A lossless data compressor based on the LZMA algorithm"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl2Plus; + maintainers = with maintainers; [ vlaci ]; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix new file mode 100644 index 0000000000..0d8a700e16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, lzip }: + +stdenv.mkDerivation rec { + pname = "lziprecover"; + version = "1.22"; + + src = fetchurl { + url = "mirror://savannah/lzip/lziprecover/${pname}-${version}.tar.gz"; + sha256 = "sha256-/ZWKCXX3cpxE87eE5WaJH3NsPcaDdNvSFJ7mkqFtCGI="; + }; + + configureFlags = [ + "CPPFLAGS=-DNDEBUG" + "CFLAGS=-O3" + "CXXFLAGS=-O3" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + doCheck = true; + checkInputs = [ lzip ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/lziprecover.html"; + description = "Data recovery tool for lzip compressed files"; + license = lib.licenses.gpl2Plus; + maintainers = with maintainers; [ vlaci ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix b/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix index 8b7f094bf3..d4963487ad 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/nx2elf/default.nix @@ -2,23 +2,19 @@ stdenv.mkDerivation rec { pname = "nx2elf"; - version = "unstable-2020-05-26"; + version = "unstable-2021-11-21"; src = fetchFromGitHub { owner = "shuffle2"; repo = "nx2elf"; - rev = "7212e82a77b84fcc18ef2d050970350dbf63649b"; - sha256 = "1j4k5s86c6ixa3wdqh4cfm31fxabwn6jcjc6pippx8mii98ac806"; + rev = "735aaa0648a5a6c996b48add9465db86524999f6"; + sha256 = "sha256-cS8FFIEgDWva0j9JXhS+s7Y4Oh+mNhFaKRI7BF2hqvs="; }; buildInputs = [ lz4 ]; postPatch = '' - # This project does not comply with C++14 standards, and compilation on that fails. - # This does however succesfully compile with the gnu++20 standard. - substituteInPlace Makefile --replace "c++14" "gnu++20" - - # pkg-config is not supported, so we'll manually use a non-ancient version of lz4 + # pkg-config is not supported, so we'll manually devendor lz4 cp ${lz4.src}/lib/lz4.{h,c} . ''; diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index a3184f6d1e..0bff5110c9 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; rev = "v${version}"; - sha256 = "sha256-D9+kuIjPYnmg5ht/ezIeYCpyiLkrtdiH3fwpmemIPGM="; + sha256 = "sha256-yJvhcysxcbUGuDOqe/TQ3Y5xyM2AUw6r1THSHOqmUy0="; }; nativeBuildInputs = [ cmake ] diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index cb8d74aa16..9e0752b548 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2021-12-25"; + version = "unstable-2022-01-12"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "07b18011cc885f0ef5cadc299d0321322f442388"; - sha256 = "0yvdbjasl05w1afiszygrfv7hn39fxx7kcy42vk39rb6fb3xpvzy"; + rev = "7b15324de1095f3e2e423e9c53da076d208b52d5"; + sha256 = "0glpq0n1xv7ck28v0gahl1fak9dhyp04id8d1l8yxvnriyw19zxa"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index 5f1775e77e..d630c7d43f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.46.4"; + version = "1.46.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ra2d1wasksy1zy3rgviwdni40dnamchisjrrqqi940y545m493m"; + sha256 = "1fgvwbj9ihz5svzrd2l0s18k16r4qg3wimrniv71fn3vdcg0shxp"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://e2fsprogs.sourceforge.net/"; + changelog = "http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = with licenses; [ gpl2Plus diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 7a7f442878..0e6f5ad883 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0vmcn3AOASjN61QzxxGYpPMWlukanh8+vbZQcFpU/vs="; + sha256 = "sha256-FqlSMTCKtcG2HOA6KaPYArK/rxHG9eJSQmNOWIzJzCs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix new file mode 100644 index 0000000000..fbeac15a38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitea, testVersion, garage }: +rustPlatform.buildRustPackage rec { + pname = "garage"; + version = "0.6.0"; + + src = fetchFromGitea { + domain = "git.deuxfleurs.fr"; + owner = "Deuxfleurs"; + repo = "garage"; + rev = "v${version}"; + sha256 = "sha256-NNjqDOkMMRyXce+Z7RQpuffCuVhA1U3qH30rSv939ks="; + }; + + cargoSha256 = "sha256-eKJxRcC43D8qVLORer34tlmsWhELTbcJbZLyf0MB618="; + + passthru = { + tests.version = testVersion { package = garage; }; + }; + + meta = { + description = "S3-compatible object store for small self-hosted geo-distributed deployments"; + homepage = "https://garagehq.deuxfleurs.fr"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ nickcao _0x4A6F ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix index a2dc01f8c0..58c5a8d54a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3; maintainers = [ maintainers.qknight ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix index 9f5980a07e..30283d560f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "snapraid"; - version = "12.0"; + version = "12.1"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "sha256-CcJaxnbRvGYiQjU38qnTgNyim5aDQWmxhQv16ZT1F00="; + sha256 = "sha256-DaFL5YxKdL7swfiWAHNufkeQ7mNd/MdZ6E0yAtC58lc="; }; VERSION = version; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/findimagedupes/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/findimagedupes/default.nix new file mode 100644 index 0000000000..19a80434be --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/findimagedupes/default.nix @@ -0,0 +1,70 @@ +{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "findimagedupes"; + version = "2.19.1"; + + # fetching this from GitHub does not contain the correct version number + src = fetchurl { + url = "http://www.jhnc.org/findimagedupes/findimagedupes-${version}.tar.gz"; + sha256 = "sha256-5NBPoXNZays5wzpQYar4uZZb0P/zB7fdecE+SjkJjcI="; + }; + + # Work around the "unpacker appears to have produced no directories" + setSourceRoot = "sourceRoot=$(pwd)"; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + buildInputs = [ perl ] ++ (with perlPackages; [ + DBFile + FileMimeInfo + FileBaseDir + #GraphicsMagick + ImageMagick + Inline + InlineC + ParseRecDescent + ]); + + # use /tmp as a storage + # replace GraphicsMagick with ImageMagick, because perl bindings are not yet available + postPatch = '' + substituteInPlace findimagedupes \ + --replace "DIRECTORY => '/usr/local/lib/findimagedupes';" "DIRECTORY => '/tmp';" \ + --replace "Graphics::Magick" "Image::Magick" + ''; + + buildPhase = " + runHook preBuild + ${perl}/bin/pod2man findimagedupes > findimagedupes.1 + runHook postBuild + "; + + installPhase = '' + runHook preInstall + install -D -m 755 findimagedupes $out/bin/findimagedupes + installManPage findimagedupes.1 + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/findimagedupes" \ + --prefix PERL5LIB : "${with perlPackages; makePerlPath [ + DBFile + FileMimeInfo + FileBaseDir + #GraphicsMagick + ImageMagick + Inline + InlineC + ParseRecDescent + ]}" + ''; + + meta = with lib; { + homepage = "http://www.jhnc.org/findimagedupes/"; + description = "Finds visually similar or duplicate images"; + license = licenses.gpl3; + maintainers = with maintainers; [ stunkymonkey ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/grim/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/grim/default.nix index f678b2bcae..43824e1690 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/grim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/grim/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }: +{ lib, stdenv, fetchFromGitHub, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }: stdenv.mkDerivation rec { pname = "grim"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-71dmYENfPX8YHcTlR2F67EheoewicePMKm9/wPbmj9A="; + sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w="; }; nativeBuildInputs = [ @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - cairo + pixman + libpng libjpeg wayland wayland-protocols diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index fc7d909ca0..ce3205f7b2 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "10.96.2"; + version = "10.97.2"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4158"; - sha256 = "NK8GXCvCEnbQJWvVngB5UMOVmfsiyU4Fq0JIY9UNSjo="; + rev = "4242"; + sha256 = "ljfowjaa3whNXavrLTFVUq87nG47sykYtrtGSrZb/rE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix index ca4f647dfa..6e2517becc 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2021-07-22"; + version = "unstable-2022-01-30"; src = fetchurl { - url = "https://pikchr.org/home/tarball/d9e1502ed74c6aab/pikchr.tar.gz"; - sha256 = "sha256-YSy95GiSodOS1YJgl9arBniqEJzYPrZ9CHNSCee9Yfg="; + url = "https://pikchr.org/home/tarball/5db3aa1d294dcd16/pikchr.tar.gz"; + sha256 = "sha256-xnT2oOx4LK9CElXeAuQIKlu6WvMB8Nv5+2kBzWQ5Gpc="; }; # can't open generated html files diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix index aa525abacb..11d2a3c0b8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -1,25 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook -, autoconf-archive, libXfixes, libXcursor, libXcomposite }: +{ lib +, stdenv +, fetchFromGitHub +, imlib2 +, xlibsWrapper +, autoreconfHook +, autoconf-archive +, libXfixes +, libXcomposite +, pkg-config +, libbsd +}: stdenv.mkDerivation rec { pname = "scrot"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "sha256-4vguodLnCj0sOBLM4oJXTfX1p8hIo3WTwIuViPtZxHQ="; + sha256 = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY="; }; - nativeBuildInputs = [ autoreconfHook autoconf-archive ]; - buildInputs = [ giblib xlibsWrapper libXfixes libXcursor libXcomposite ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + buildInputs = [ + imlib2 + xlibsWrapper + libXfixes + libXcomposite + libbsd + ]; meta = with lib; { homepage = "https://github.com/resurrecting-open-source-projects/scrot"; description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ globin ]; - license = licenses.mit; + license = licenses.mitAdvertising; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix index 2e3740dabb..9afb6682ba 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.6.2"; + version = "0.6.3"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "sha256-9JASoUN/VzZS8ihepTQL2SXZitxKBMSJEv+13vzQd3w="; + sha256 = "sha256-yYRBV0s19J0M02wenGayy7Ebx6wDhiLiGmb+os29u9I="; }; - cargoSha256 = "sha256-pkdiow+9gsQ9rrSHwukd17r5CfsaJgYj6KA4wYKbtA0="; + cargoSha256 = "sha256-R4W+Oe7Ks2D9qE1IpV6/AMMMwZnCfJ5DzxFAMpV2rFE="; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix index 20dfe15dc6..fdd8cb80e5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, ffmpeg, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, ffmpeg_4, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg libxslt ]; + buildInputs = [ ffmpeg_4 libxslt ]; meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 26d63791be..270f508a88 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.12.1"; + version = "8.12.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-Zo1Y4pYa+o55+ASrAiDUO7SAC4zpcAniEKkTFvIoU6o="; + sha256 = "sha256-ffDJJWe/SzG+lppXEiyfXXL5KLdZgnMjv1SYnuYnh4c="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 2767b4c7c0..422b1148d0 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-libpinyin"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz"; - sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; + sha256 = "1wvsc21imbgq3chlxfw4aycmkb2vi1bkjj9frvhga2m5b5pq82k5"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix index 728152fce5..f00da6045a 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.12"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-v+K4rlUOBWoRXh7lNeETBbgtu5IJqYKXwSznIRzrrwE="; + sha256 = "sha256-Trpye+jTu+l8ieUK6IX+ZqNe4H2DvoJ10juiMkEGRKM="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix new file mode 100644 index 0000000000..7d3ef954b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, fcitx5 +, libchewing +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-chewing"; + version = "5.0.9"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "sha256-wPfod0BNvNy1gwSJyu7N0sS61StnmXLrMNFgmHk9A0M="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + ]; + + buildInputs = [ + fcitx5 + libchewing + ]; + + meta = with lib; { + description = "Chewing wrapper for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-chewing"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 250dda8631..7f75748df5 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-chinese-addons"; + repo = pname; rev = version; - sha256 = "sha256-8h2cHjxcn1swm2TsH9pZu+ojOB6xlspdd4IIXYxZM/8="; + sha256 = "sha256-PBKTc6yxCaLYZxfR7158rTkR7GsDCapjCKBuLxNu4dU="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 33d90a6566..42a7ffd010 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-PrzMKATv//LNGXl82J8dirNOjl6EDvlzGiarkMLaQqs="; + sha256 = "sha256-8Yj4ueLyfPlvjI3HLH5qudY5BEQaBkM5rNgqjH1ihV8="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index ed7f7170a8..eaec4463ca 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-x2sOPybbAUM0/es9JM/F7A1+01HQPVwb9SCBpJ+ueRk="; + sha256 = "sha256-wSYYVQMuydtxMQ/v9b6bBMesyfKlsqUqpqf/y74Q4zc="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix new file mode 100644 index 0000000000..2357c73b76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, fcitx5 +, libhangul +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-hangul"; + version = "5.0.7"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "sha256-vjKQ0h85gvlE+inHuzkIBLgluwA6c/XADtyMi6nQNc8="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + ]; + + buildInputs = [ + fcitx5 + libhangul + ]; + + meta = with lib; { + description = "Hangul wrapper for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-hangul"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 879e6ffa78..8f53508a04 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.5"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-lua"; + repo = pname; rev = version; - sha256 = "0x7b78rz9mdyhm3y8yi7kihah7fgqzjyfgqwjyfx3i90wxflnmmc"; + sha256 = "sha256-6znDtU/yVAJByhCanW7KVg5Tk615aCLbFbxDMESVOlY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index a8a1cd0eb7..ab2219bfb9 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.6"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-w806Xy7S8rhw7ZtMRzHfUD9BDzj3VmCxlP+kHMZgFpc="; + sha256 = "sha256-Mh3a7PzfNmGGXzKb/6QUgLmRw7snsM3WSOduFdxj6OM="; }; nativeBuildInputs = [ 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 2cf6abe331..24e06028a4 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-qt"; + repo = pname; rev = version; - sha256 = "sha256-IXO1mRtkg4Tt9ZRuICdNWhK1UYYFNMbKGdGlUcdmsJY="; + sha256 = "sha256-KSnbwXMyAnya0Os/xrmjzK/wD6/dpM48rs1nS9SL5hs="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 0c1ec7f6ce..ecbe4d5c67 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-cossoo/S1AzB5sHA+b2C49a6Uv8iVMYJAd32i9Y1is4="; + sha256 = "sha256-kEqooOSLMp2LF911M1q67GYRGx421V6iExXOQk1pcl0="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 65ad408ade..fd91a9bafb 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-K+MeFfst+vxgaHkYgLzfj7wqHYP6dIbh5ZOYHaV0cXo="; + sha256 = "sha256-8ad7A6MHkVfQEVMrbuAv2sJlc7t3rlz4EFqaMe51YSw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index b6ba9bfd16..dc601aca80 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-NePb2tDy8mSR+cPxhOF4xBnxFRjLKdNs8YNGlvfFKmg="; + sha256 = "sha256-XpQ/5OLNEcJTu1LvGBM6arGZrBl6XSIWx9MDKH9WIt4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 05b1deeed9..d9517ce214 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -1,21 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, fcitx5, fcitx5-qt -, ninja, gettext, wrapQtAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, fcitx5-qt +, gettext +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "BFIqMmjIC29Z4rATZEf+qQWrULU9Wkuk6WOUXDEPO10="; + sha256 = "sha256-UdhTIVRLEqzxh9aafqwLhA8EOKiO/tD5QksdVd0rvqI="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ fcitx5 fcitx5-qt ninja gettext ]; + buildInputs = [ fcitx5 fcitx5-qt gettext ]; meta = with lib; { description = "Unikey engine support for Fcitx5"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py index 9f54e313fd..2057057004 100755 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py @@ -6,8 +6,24 @@ import json import requests import subprocess -REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-configtool", "fcitx5-lua", - "fcitx5-rime", "fcitx5-chinese-addons", "fcitx5-table-extra", "fcitx5-table-other" ] +REPOS = [ + "libime", + "xcb-imdkit", + + "fcitx5", + "fcitx5-chewing", + "fcitx5-chinese-addons", + "fcitx5-configtool", + "fcitx5-gtk", + "fcitx5-hangul", + "fcitx5-lua", + "fcitx5-m17n", + "fcitx5-qt", + "fcitx5-rime", + "fcitx5-table-extra", + "fcitx5-table-other", + "fcitx5-unikey" + ] OWNER = "fcitx" diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix index 6cac37da7d..68a91d2bfc 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs="; + sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4="; + sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw="; }; # Replace autostart path diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix index 3d691033cc..0028fa6b7b 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2oHjx5RpuZmWcv954ZOrmHhOkQBfrDpEFqgiBFQfAuo="; + sha256 = "sha256-XyE8N+YVwfgxToKkhpe8zJ0e3HFDpKt7cfERxWCfbfU="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-8w3muVJwDmFKY6AFKv/x6vS6jIyR7M/wlxzAvl5ROdE="; + vendorSha256 = "sha256-zTx38kW/ylXXML73C2sFQciV2y3+qbO0S/ZdkiEh5Qs="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/third_party/nixpkgs/pkgs/tools/misc/apt-offline/default.nix b/third_party/nixpkgs/pkgs/tools/misc/apt-offline/default.nix index d59134a033..730786f6b2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/apt-offline/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/apt-offline/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "apt-offline"; - version = "unstable-2021-07-25"; + version = "unstable-2022-02-06"; src = fetchFromGitHub { owner = "rickysarraf"; repo = pname; - rev = "7cfa5fc2736be2c832d0ddfa9255175a1f33158d"; - sha256 = "xX2wcvqoPdgqBAWvQmSd//YWMC4pPmrq0vQjhDUKwEA="; + rev = "2b9929773ff2b6e53d30c50c31fb3a1605631f5f"; + sha256 = "mf2NM39ql6KR/YTWPYNyVe+bvWmUFYfxt5BGmU5WFpQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix index 735508fed2..aca0a6b687 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao="; + sha256 = "sha256-q+FLmu2JCDTJ6zC8blkd27jAKWbNpPyKzmUj1bW1mfA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bfr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bfr/default.nix index 7bda1d92af..5308d2098d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bfr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bfr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = "https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-misc/bfr/files/bfr-1.6-perl.patch?revision=1.1"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch"; sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj"; }) ]; 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 5eff549a65..8fd5c55c89 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 @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-xVPs7D639KY2ryDZpivineH4yZSNXi78FWk2SFKX1sk="; + sha256 = "sha256-XA74rZ477Mwf8u0KLkFngfwiJexS10vh++ST6VtkcVg="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-913GJ/rPvDavQQMqDDTe4gBXziPPeQRPpUUG3DAz96g="; + vendorSha256 = "sha256-ZXWhADfzvHcEW3IZlPyau5nHEXBJRH8aTvb3zCKl/LE="; checkFlags = [ "-short" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 2a85c0dc2b..f89626c55f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.5.2"; - sha256 = "sha256-kul0sjbwbCwadvrccG3KwL/fKWACFUg74QGvgfWE4FQ="; + rev = version; + sha256 = "00pmnzvd4l3w6chzw41mrf1pd7lrcwi1n7320bnq20rn8hsnbnxk"; }; nativeBuildInputs = [ @@ -39,10 +39,17 @@ stdenv.mkDerivation rec { ]; prePatch = '' - oldPath="\$""{datadir}/ddccontrol-db" - newPath="${ddccontrol-db}/share/ddccontrol-db" - sed -i -e "s|$oldPath|$newPath|" configure.ac - sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile* + substituteInPlace configure.ac \ + --replace \ + "\$""{datadir}/ddccontrol-db" \ + "${ddccontrol-db}/share/ddccontrol-db" + + substituteInPlace src/ddcpci/Makefile.am \ + --replace "chmod 4711" "chmod 0711" + '' + lib.optionalString (lib.versionAtLeast "0.6.0" version) '' + # Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115 + substituteInPlace src/lib/Makefile.am \ + --replace "/etc/" "\$""{sysconfdir}/" ''; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 0a956a3251..9ee56a2d50 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "sha256-mIYxGoITaFlHgqAfB6ZZFR3spGD0BElJZJJqFGM4r/I="; + sha256 = "0hbd2ybpqmm96icg387vr57dqkdbc20vyimqjq5yx0sdlp4ikzi7"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 539b9f4b67..0c09010664 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "201"; + version = "203"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-urvSZSpy5ksHhWqJM8ek0dyyKPeme/sJ16L6JfHg7Lg="; + sha256 = "sha256-xDH4Bd87hRnQ0xOeJijeon2RNAnvD3vfpvJgXoAXWAA="; }; outputs = [ "out" "man" ]; @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { xz zip zstd ] ++ (with python3Packages; [ - argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c + argcomplete black debian defusedxml jsondiff jsbeautifier libarchive-c python_magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] @@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec { # Failing because of file-v5.40 has a slightly different output. # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 "test_text_proper_indentation" + + # fails because it fails to determine llvm version + "test_item3_deflate_llvm_bitcode" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix index 8d01cd2531..3bcb4cdfeb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "sha256-Usdu7f3XPTIT39H23vfP0XBlvNPgPA+3BMyOzFOyLHQ="; + sha256 = "sha256-bVuqX88KY+ky+fd1FU9GWP78jQc4fRDk9yRSeIesHyI="; }; - vendorSha256 = "sha256-6PV/v+rk63FIR2M0Q7EzqjVvWIwHtK6TQpEYxkXLQ50="; + vendorSha256 = "sha256-oihi7E67VQmym9U1gdD802AYxWRrSowhzBiKg0CBDPc="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix index de2f2cc8a8..6904d46677 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Pseudorandom Number Sequence Test Program"; - homepage = "http://www.fourmilab.ch/random/"; + homepage = "https://www.fourmilab.ch/random/"; platforms = platforms.all; license = licenses.publicDomain; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index 1dd4225ac0..f36e5217ae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -1,8 +1,9 @@ { lib -, python3 +, buildPythonPackage +, fetchPypi }: -with python3.pkgs; buildPythonPackage rec { +buildPythonPackage rec { pname = "esphome-dashboard"; version = "20220116.0"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 537b964f6f..f790527c92 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , python3 , fetchFromGitHub , fetchpatch @@ -11,20 +10,20 @@ let python = python3.override { packageOverrides = self: super: { - esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; + esphome-dashboard = self.callPackage ./dashboard.nix {}; }; }; in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.1.2"; + version = "2022.1.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-hq+gYhDkEzIqgP4CcHRuA5A9694L3LeW9bditejfjm8="; + sha256 = "sha256-Pv4Rh92d+Jb3ZKPgKVyrgVHr6PGTcIYybdFavbnjuPA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix index 7f746b9a49..c9d746cc96 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix @@ -14,8 +14,8 @@ let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; sha256 = { - "x86_64-linux" = "sha256-n8i4ZqjugeUfXpTzVgIwVomfPk6HvPEbTZLe/jFgwFg="; - "i686-linux" = "sha256-lLGfhW6el2ZOcaykH1kTjGldXo7/0q5O8QnslnDlWAQ="; + "x86_64-linux" = "1yj6ybc99nqpzv2wjmvi7khfb5viwlb2rbjdpvgr4pmlzmiv7n2k"; + "i686-linux" = "09ddcqxw1jhl8v461ngdgj2l4infn2xiwvaqxi6qp3swci627vmz"; }."${system}" or throwSystem; arch = { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.6.0"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix index 3a5f111199..e8d77f0e61 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.3.1"; + version = "8.3.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-1Fxkd37KoFkUYYeFTaCAtndCa00lZB2KptsKIwpIt2o="; + sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg="; }; - cargoSha256 = "sha256-qymlTuFnYMbldNDGVDpkLCC0QQK1il/LAXcIil5koCo="; + cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix index f55c7f6d3b..0815ae04d6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix @@ -78,9 +78,9 @@ in stdenv.mkDerivation { ''; meta = { - homepage = "https://code.dogmap.org./fdtools/"; + homepage = "https://code.dogmap.org/fdtools/"; description = "A set of utilities for working with file descriptors"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.Profpatsch ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix index 27eb1275a2..1afacc4b4b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "git-town"; - version = "7.6.0"; + version = "7.7.0"; goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "sha256-yarJWIEIZuBcXXxltkiM7LwrEM8fveD3+JVoPGarhJQ="; + sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc="; }; ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 446f401dae..3f480a0ec5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QFb702/v+fSzPWJ+hIGAXqVYfLpecA4sOFM+r8QvdYE="; + sha256 = "sha256-pEZ7H7WOPpzCGMLPgyfVJudamSWynoB5qnZSbVXj5uk="; }; - vendorSha256 = "sha256-LZ2fVFvctLw/X2IX8p5/2D3qvoOYmGWhvef6HoeAGeE="; + vendorSha256 = "sha256-7c5bd5pEulcr1mpdEUr2tDZNwjRkjqXOLiu+2x5/uFs="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index 7f5eef3b44..e52744223d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-X41m7bCilDgnTMJy3ISz8g7dAtaz/lphwaCPZDGMDXk="; }; - vendorSha256 = "sha256-EKscJM8r1dbKRQPSZFwFqJYACkQynIS347460PuxQiU="; + vendorSha256 = "sha256-DvpdmURhOxDVFJiRtTGVw6u6y+s5XteT1owmdBJcKHA="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index ea983d6f04..745689e312 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { url = "https://marc.info/?l=grub-devel&m=146193404929072&q=mbox"; sha256 = "00wa1q5adiass6i0x7p98vynj9vsz1w0gn1g4dgz89v35mpyw2bi"; }) + + # Pull upstream patch to fix linkage against binutils-2.36. + (fetchpatch { + name = "binutils-2.36"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701"; + sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82"; + }) ]; postPatch = if kbdcompSupport then '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/h/default.nix b/third_party/nixpkgs/pkgs/tools/misc/h/default.nix index 3f5878472a..7a7ac20025 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/h/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - sha256 = "10y42nn9lgkwdjia74qfyf937nam4md3pkyfjinj7jybvcran4bj"; + hash = "sha256-RyQZ9F+rZ0a/90hljSyNCzYK8eA3rYJlJkV7B5NPRzY="; }; buildInputs = [ ruby ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix index 9f7fa31d3f..c2c48bfa7d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with lib; { description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; - homepage = "https://wiki.hyperledger.org/projects/Fabric"; + homepage = "https://wiki.hyperledger.org/display/fabric"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lookatme/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lookatme/default.nix new file mode 100644 index 0000000000..b046e15690 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/lookatme/default.nix @@ -0,0 +1,57 @@ +{ lib, python3, fetchFromGitHub }: + +let + py = python3.override { + packageOverrides = self: super: { + self = py; + # use click 7 + click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + # needs pyyaml 5 + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; + version = "5.4.1"; + src = fetchFromGitHub { + owner = "yaml"; + repo = "pyyaml"; + rev = version; + sha256 = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM="; + }; + checkPhase = '' + runHook preCheck + PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all + runHook postCheck + ''; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { + pname = "lookatme"; + version = "2.3.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw="; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ + click + pyyaml + pygments + marshmallow + mistune + urwid + ]; + + meta = with lib; { + description = "An interactive, terminal-based markdown presenter"; + homepage = "https://github.com/d0c-s4vage/lookatme"; + license = licenses.mit; + maintainers = with maintainers; [ ameer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix index aae27cb652..ad2721c36e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = with maintainers; [ CRTified ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/lottieconverter.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mailman-rss/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix rename to third_party/nixpkgs/pkgs/tools/misc/mailman-rss/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix index 0e75af6223..cdcdad9947 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/marlin-calc/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix new file mode 100644 index 0000000000..321b139ca1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -0,0 +1,64 @@ +{ lib +, pkg-config +, dbus +, dconf +, fetchFromGitHub +, glib +, gnome +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, python3 +, substituteAll +, wrapGAppsHook +}: + +python3.pkgs.buildPythonPackage rec { + pname = "nautilus-open-any-terminal"; + version = "0.2.15"; + + src = fetchFromGitHub { + owner = "Stunkymonkey"; + repo = pname; + rev = version; + sha256 = "sha256-cc6Lh5XeAuU5Os4eJ0QcL6XJYB6DqxeUGaOf6m1OnpY="; + }; + + patches = [ ./hardcode-gsettings.patch ]; + + nativeBuildInputs = [ + glib + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + dbus + dconf + gnome.nautilus + gnome.nautilus-python + gobject-introspection + gsettings-desktop-schemas + gtk3 + python3.pkgs.pygobject3 + ]; + + postPatch = '' + substituteInPlace nautilus_open_any_terminal/open_any_terminal_extension.py \ + --subst-var-by gsettings_path ${glib.makeSchemaPath "$out" "$name"} + ''; + + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + + meta = with lib; { + description = "Extension for nautilus, which adds an context-entry for opening other terminal-emulators then `gnome-terminal`"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ stunkymonkey ]; + homepage = "https://github.com/Stunkymonkey/nautilus-open-any-terminal"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch new file mode 100644 index 0000000000..402f78ed04 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch @@ -0,0 +1,32 @@ +diff --git a/nautilus_open_any_terminal/open_any_terminal_extension.py b/nautilus_open_any_terminal/open_any_terminal_extension.py +index b02a995..a616399 100644 +--- a/nautilus_open_any_terminal/open_any_terminal_extension.py ++++ b/nautilus_open_any_terminal/open_any_terminal_extension.py +@@ -125,9 +125,10 @@ def set_terminal_args(*args): + + class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): + def __init__(self): +- source = Gio.SettingsSchemaSource.get_default() +- if source.lookup(GSETTINGS_PATH, True): +- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) ++ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++ if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ self._gsettings = Gio.Settings.new_full(_schema, None, None); + self._gsettings.connect("changed", self._bind_shortcut) + self._create_accel_group() + self._window = None +@@ -232,9 +233,10 @@ class OpenAnyTerminalExtension(GObject.GObject, Nautilus.MenuProvider): + return items + + +-source = Gio.SettingsSchemaSource.get_default() +-if source is not None and source.lookup(GSETTINGS_PATH, True): +- _gsettings = Gio.Settings.new(GSETTINGS_PATH) ++source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ _gsettings = Gio.Settings.new_full(_schema, None, None); + _gsettings.connect("changed", set_terminal_args) + value = _gsettings.get_string(GSETTINGS_TERMINAL) + if value in TERM_PARAMS: diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix new file mode 100644 index 0000000000..b89868460e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -0,0 +1,45 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "opentelemetry-collector-contrib"; + version = "0.43.0"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-collector-contrib"; + rev = "v${version}"; + sha256 = "sha256-ktzP+ugG2sa0v8B1Zp47o8Bmpxv98zQyFyWf9QfQRoQ="; + }; + # proxy vendor to avoid hash missmatches between linux and macOS + proxyVendor = true; + vendorSha256 = "sha256-0E52YSWlq1ebHA3kR9Qo/6ufug9R+z1cSD9AfbN/Mi0="; + + subPackages = [ "cmd/otelcontribcol" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/open-telemetry/opentelemetry-collector-contrib/internal/version.Version=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; + description = "OpenTelemetry Collector superset with additional community collectors"; + longDescription = '' + The OpenTelemetry Collector offers a vendor-agnostic implementation on how + to receive, process and export telemetry data. In addition, it removes the + need to run, operate and maintain multiple agents/collectors in order to + support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) + sending to multiple open-source or commercial back-ends. The Contrib + edition provides aditional vendor specific receivers/exporters and/or + components that are only useful to a relatively small number of users and + is multiple times larger as a result. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ uri-canva jk ]; + }; +} 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 6c83d72976..e0abe89359 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -1,30 +1,52 @@ { buildGoModule , fetchFromGitHub , lib +, writeScript }: +let + otelcontribcol = writeScript "otelcontribcol" '' + echo 'ERROR: otelcontribcol is now in `pkgs.opentelemetry-collector-contrib`, call the collector with `otelcorecol` or move to `pkgs.opentelemetry-collector-contrib`' >&2 + exit 1 + ''; +in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.40.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "open-telemetry"; - repo = "opentelemetry-collector-contrib"; + repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-YFgAS4WReyMnzb6FOeRUXHf1LUgknH5gWObiZNKMbv8="; + sha256 = "sha256-hYhJv5LbebUA9Sp8/admfKWXBoOVvXdr3Mzc3qG8GlM="; }; + # there is a nested go.mod + sourceRoot = "source/cmd/otelcorecol"; + vendorSha256 = "sha256-w5uyAVZ1TrurD4CEWTTk1fWmdlQn8eAFWZrNpISB5Rk="; - vendorSha256 = "sha256-DTZLYF3BoQGou59KaL56pkxySsoQ0xeJ5aF/SkewziE="; - proxyVendor = true; + preBuild = '' + # set the build version, can't be done via ldflags + sed -i -E 's/Version:(\s*)".*"/Version:\1"${version}"/' main.go + ''; - CGO_ENABLED = 0; + ldflags = [ "-s" "-w" ]; - subPackages = [ "cmd/otelcontribcol" ]; + postInstall = '' + cp ${otelcontribcol} $out/bin/otelcontribcol + ''; meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-collector"; - description = "OpenTelemetry Collector"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md"; + description = "OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data"; + longDescription = '' + The OpenTelemetry Collector offers a vendor-agnostic implementation on how + to receive, process and export telemetry data. In addition, it removes the + need to run, operate and maintain multiple agents/collectors in order to + support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) + sending to multiple open-source or commercial back-ends. + ''; license = licenses.asl20; - maintainers = [ maintainers.uri-canva ]; + maintainers = with maintainers; [ uri-canva jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index a0803a3683..0a3103cd4f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "sha256-0mUGvu5o2MhlriNAUAUoyDrFgTw2weGGbQcBzaauKEQ="; + sha256 = "sha256-6FVMv+DowMYdRdsQFL2iwG/V9D2cLWkHUVkmR3/TuUI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index edf61ddf6b..4d0c331373 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.8.0"; + version = "10.8.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-HvyMkafW2QdSlizWkOsv9U8VSN9Y9Z3F1jt1PwF9nuo="; + sha256 = "sha256-O1jqaUQZymCNcp+mznLtK0xRr0RHKe77zcbmcCkMqn8="; }; buildInputs = [ php ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix index 32595e17c0..913bfc00a1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.40.0"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b/9NEURp42d/j/Fk8NUS0ZAG99q56eg0pEU/xkFnvrM="; + sha256 = "sha256-go3EXmC9Vp0xXi1mH65p85FKsTe0CbyNXw3VVRrnpeQ="; }; repo = fetchFromGitLab { @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "postmarketOS"; repo = pname; rev = version; - sha256 = "sha256-2yyHAHoIlwHX2+LbwwK7AGrBDZlfkhtCcKAKHdJMBdQ="; + sha256 = "sha256-7Y4rxSdJQaIlq4yiadvrEro0JM5xoHeISDKHz69T4z8="; }; pmb_test = "${repo}/test"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix index a94a4c9bd3..8d5d7356da 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.11"; + version = "03.03.12"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-CCZ7CENeI8zNUgtBYesGWbqf53OCr9hBTN1ibegB4lo="; + sha256 = "sha256-1KpM2lobU+KsxjHpNeAxwAx3mCrU8IZyhvfYJwlUQJ4="; }; propagatedBuildInputs = tclLibraries; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix index 400a63f7df..4b56dec9d5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rpcsvc-proto"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9"; + sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix index c67dddf536..3a7baa62ba 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.6.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ITn31ENEf2bysgJgV3u+NNPXk1pfIkUyJWIvS2DOrzY="; + sha256 = "sha256-Yt+RWox+0VOw8SH7Ry/o4NHOg3IGcebVeE9OWGP17do="; }; nativeBuildInputs = [ cmake util-linux ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 4dd19a7f39..09422cd2d4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.14"; + version = "2022.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-WOG21wSbjXMc/6OHJBEKFOhvnIt+SFpZikB8XkfN32Y="; + sha256 = "sha256-wy6zmVy7+31+wadLldWdf/IyT0dyLArYLmGw/Kgd+sU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix index dd61b82d40..e7e0e42081 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { pname = "screen"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://gnu/screen/${pname}-${version}.tar.gz"; - sha256 = "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf"; + sha256 = "1x1hqy4h47i7hk85f779lkwkm7gkq8h8mxwd0znkh5adpf0m4czr"; }; configureFlags= [ @@ -16,34 +16,20 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = [ - (fetchpatch { - # Fixes denial of services in encoding.c, remove > 4.8.0 - name = "CVE-2021-26937.patch"; - url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch"; - sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0"; - }) - ] ++ lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); - postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) - # XXX: Awful hack to allow cross-compilation. - '' sed -i ./configure \ - -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' - ''; # " - - buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam - ++ lib.optional stdenv.isDarwin utmp; - - # Build fails due to missing dependencies on autogenerated header: - # screen.h:48:10: fatal error: comm.h: No such file or directory - # It will be fixed in next screen-4.9.0 release. The patches are - # invasive. Disabling parallelism for 4.8.0. - enableParallelBuilding = false; + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ + ncurses + ] ++ lib.optional stdenv.isLinux pam + ++ lib.optional stdenv.isDarwin utmp; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix index 394cd8a8ed..85bc57d355 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.1"; + version = "1.2"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-0z9PHni/ni4p4nfeStrZmFFHHtyqT8GYJWVWr5IzFKw="; + sha256 = "sha256-cx+mIVrY9tB5k1YnAHkpGahXVG6S+JBshJKkzEbcKZI="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix index 2fb9553a7f..048e8eb600 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix @@ -3,6 +3,10 @@ , fetchFromGitHub , ffmpeg , yt-dlp +, libsecret +, python3 +, pkg-config +, nodejs , electron , makeWrapper , makeDesktopItem @@ -13,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-0moxrRxydH/g3J5cQmaFSDhTZh9OnUi8ncPVw7q1JC0="; + sha256 = "sha256-wQEP3fdp+Mhgoz873cgF65WouWtbEdCdXfLiVSmrjyA="; }; nativeBuildInputs = [ @@ -55,6 +59,34 @@ stdenvNoCC.mkDerivation rec { "--production" ]; + pkgConfig = { + keytar = { + nativeBuildInputs = [ + python3 + pkg-config + ]; + buildInputs = [ + libsecret + ]; + postInstall = '' + yarn --offline run build + # Remove unnecessary store path references. + rm build/config.gypi + ''; + }; + }; + + preBuild = '' + # Set up headers for node-gyp, which is needed to build keytar. + mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" + + # Set up version which node-gyp checks in against the version in . + echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" + + # Link node headers so that node-gyp does not try to download them. + ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" + ''; + packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; yarnNix = ./yarndeps.nix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/update.sh b/third_party/nixpkgs/pkgs/tools/misc/sharedown/update.sh index 584cb8511a..d08a258a6a 100755 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/update.sh +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/update.sh @@ -1,9 +1,19 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update yarn yarn2nix-moretea.yarn2nix +#!nix-shell -i bash -p common-updater-scripts curl jq yarn yarn2nix-moretea.yarn2nix set -euo pipefail -nix-update sharedown +owner=kylon +repo=Sharedown +latestVersion=$(curl "https://api.github.com/repos/$owner/$repo/releases/latest" | jq -r '.tag_name') +currentVersion=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.version' | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" && "${BUMP_LOCK-}" != "1" ]]; then + # Skip update when already on the latest version. + exit 0 +fi + +update-source-version sharedown "$latestVersion" dirname="$(realpath "$(dirname "$0")")" sourceDir="$(nix-build -A sharedown.src --no-out-link)" diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock index 5b5638db50..58cfe65b3d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock @@ -109,14 +109,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "16.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae" - integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA== + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab" + integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog== "@types/node@^14.6.2": - version "14.17.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz#fe4b38b3f07617c0fa31ae923fca9249641038f0" - integrity sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg== + version "14.18.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz#0e5944eefe2b287391279a19b407aa98bd14436d" + integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q== "@types/plist@^3.0.1": version "3.0.2" @@ -137,9 +137,9 @@ integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== "@types/yargs@^17.0.1": - version "17.0.7" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz#44a484c634761da4391477515a98772b82b5060f" - integrity sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg== + version "17.0.8" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" + integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== dependencies: "@types/yargs-parser" "*" @@ -179,10 +179,10 @@ ansi-align@^3.0.0: dependencies: string-width "^4.1.0" -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@^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@^5.0.1: version "5.0.1" @@ -239,11 +239,24 @@ app-builder-lib@22.14.5: semver "^7.3.5" temp-file "^3.4.0" +aproba@^1.0.3: + 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== +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -266,6 +279,11 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" @@ -440,9 +458,9 @@ cacheable-request@^6.0.0: responselike "^1.0.2" camelcase@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== chalk@^2.4.2: version "2.4.2" @@ -491,13 +509,13 @@ cli-boxes@^2.2.1: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-truncate@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" - integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "^1.0.0" - string-width "^2.0.0" + slice-ansi "^3.0.0" + string-width "^4.2.0" clipboardy@2.3.0: version "2.3.0" @@ -524,6 +542,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -612,6 +635,11 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + 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" @@ -659,7 +687,14 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + 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" + +debug@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -680,6 +715,13 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -702,15 +744,25 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + 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.901419: - version "0.0.901419" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" - integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== +devtools-protocol@0.0.937139: + version "0.0.937139" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz#bdee3751fdfdb81cb701fd3afa94b1065dafafcf" + integrity sha512-daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ== dir-compare@^2.4.0: version "2.4.0" @@ -737,17 +789,16 @@ dmg-builder@22.14.5: dmg-license "^1.0.9" dmg-license@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" - integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== + version "1.0.10" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" + integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" ajv "^6.10.0" - cli-truncate "^1.1.0" crc "^3.8.0" - iconv-corefoundation "^1.1.6" - plist "^3.0.1" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" smart-buffer "^4.0.2" verror "^1.10.0" @@ -780,7 +831,7 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.13.1: +electron-builder@^22.14.5: version "22.14.5" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496" integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg== @@ -823,10 +874,10 @@ electron-publish@22.14.5: lazy-val "^1.0.5" mime "^2.5.2" -electron@^15.3.1: - version "15.3.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a" - integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ== +electron@^16.0.6: + version "16.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" + integrity sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -892,6 +943,11 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +expand-template@^2.0.3: + version "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== + extract-zip@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -951,9 +1007,9 @@ find-up@^4.0.0: path-exists "^4.0.0" follow-redirects@^1.14.4: - version "1.14.5" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" - integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== font-awesome@^4.7.0: version "4.7.0" @@ -1007,6 +1063,20 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -1026,6 +1096,11 @@ get-stream@^5.1.0: dependencies: pump "^3.0.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 sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + glob@^7.1.3, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -1092,9 +1167,9 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -1111,15 +1186,20 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== hosted-git-info@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -1136,12 +1216,12 @@ https-proxy-agent@5.0.0: agent-base "6" debug "4" -iconv-corefoundation@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a" - integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw== +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== dependencies: - cli-truncate "^1.1.0" + cli-truncate "^2.1.0" node-addon-api "^1.6.3" iconv-lite@^0.6.2: @@ -1213,10 +1293,12 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -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@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -1350,6 +1432,14 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" +keytar@^7.7.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2" + integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A== + dependencies: + node-addon-api "^3.0.0" + prebuild-install "^6.0.0" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -1443,6 +1533,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1450,12 +1545,12 @@ minimatch@3.0.4, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0, minimist@^1.2.3, 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== -mkdirp-classic@^0.5.2: +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" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== @@ -1477,16 +1572,33 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +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== + 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@^2.21.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== + dependencies: + semver "^5.4.1" + node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== +node-addon-api@^3.0.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + node-fetch@2.6.5: version "2.6.5" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" @@ -1514,6 +1626,26 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + object-keys@^1.0.12: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -1602,7 +1734,7 @@ pkg-dir@4.2.0: dependencies: find-up "^4.0.0" -plist@^3.0.1: +plist@^3.0.1, plist@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== @@ -1610,6 +1742,25 @@ plist@^3.0.1: base64-js "^1.5.1" xmlbuilder "^9.0.7" +prebuild-install@^6.0.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== + 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" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -1655,13 +1806,13 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -puppeteer@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz#0808719c38e15315ecc1b1c28911f1c9054d201f" - integrity sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg== +puppeteer@13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz#9cd9bb8ec090bade183ca186bf342396bdffa135" + integrity sha512-wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A== dependencies: debug "4.3.2" - devtools-protocol "0.0.901419" + devtools-protocol "0.0.937139" extract-zip "2.0.1" https-proxy-agent "5.0.0" node-fetch "2.6.5" @@ -1673,7 +1824,7 @@ puppeteer@11.0.0: unbzip2-stream "1.4.3" ws "8.2.3" -rc@^1.2.8: +rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -1694,7 +1845,7 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@^2.2.2: +readable-stream@^2.0.6, readable-stream@^2.2.2: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -1761,16 +1912,16 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +safe-buffer@^5.0.1, 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-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.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== - "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -1800,7 +1951,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@^5.5.0: +semver@^5.4.1, semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -1824,6 +1975,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 sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -1853,12 +2009,28 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== -slice-ansi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" - integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== dependencies: - is-fullwidth-code-point "^2.0.0" + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" smart-buffer@^4.0.2: version "4.2.0" @@ -1888,15 +2060,16 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, 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== @@ -1919,12 +2092,12 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.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= +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: - ansi-regex "^3.0.0" + ansi-regex "^2.0.0" strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" @@ -1964,7 +2137,7 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -tar-fs@2.1.1: +tar-fs@2.1.1, tar-fs@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== @@ -2029,6 +2202,13 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" @@ -2161,6 +2341,13 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + 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" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -2222,23 +2409,23 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -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-parser@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" + integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== yargs@^17.0.1: - version "17.2.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea" - integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q== + version "17.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" + integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== 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" + string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^20.2.2" + yargs-parser "^21.0.0" yauzl@^2.10.0: version "2.10.0" diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix index 046a6c71ba..153a928242 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix @@ -6,7 +6,7 @@ path = fetchurl { name = "7zip_bin___7zip_bin_5.1.1.tgz"; url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; }; } { @@ -14,7 +14,7 @@ path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; + sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; }; } { @@ -22,7 +22,7 @@ path = fetchurl { name = "_electron_get___get_1.13.1.tgz"; url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz"; - sha1 = "42a0aa62fd1189638bd966e23effaebb16108368"; + sha512 = "U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA=="; }; } { @@ -30,7 +30,7 @@ path = fetchurl { name = "_electron_universal___universal_1.0.5.tgz"; url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; - sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; + sha512 = "zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag=="; }; } { @@ -38,7 +38,7 @@ path = fetchurl { name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; + sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; } { @@ -46,7 +46,7 @@ path = fetchurl { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; + sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_sindresorhus_is___is_0.14.0.tgz"; url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; } { @@ -62,7 +62,7 @@ path = fetchurl { name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; } { @@ -70,7 +70,7 @@ path = fetchurl { name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; url = "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz"; - sha1 = "24499e69c3aeda4926670675b9fdfeb9ab15f19d"; + sha512 = "eX+O8P/xIkuCDeDI3IOIoyzuTJLVqbGnoBhLiBoFU7MwntF02ygQcByMinhUtXv2zm0pOSy6zeKoQTKAVBK60A=="; }; } { @@ -78,7 +78,7 @@ path = fetchurl { name = "_types_debug___debug_4.1.7.tgz"; url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; } { @@ -86,7 +86,7 @@ path = fetchurl { name = "_types_fs_extra___fs_extra_9.0.13.tgz"; url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha1 = "7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; } { @@ -94,7 +94,7 @@ path = fetchurl { name = "_types_glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha1 = "bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; } { @@ -102,7 +102,7 @@ path = fetchurl { name = "_types_minimatch___minimatch_3.0.5.tgz"; url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; } { @@ -110,23 +110,23 @@ path = fetchurl { name = "_types_ms___ms_0.7.31.tgz"; url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; - sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; } { - name = "_types_node___node_16.11.10.tgz"; + name = "_types_node___node_17.0.10.tgz"; path = fetchurl { - name = "_types_node___node_16.11.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz"; - sha1 = "2e3ad0a680d96367103d3e670d41c2fed3da61ae"; + name = "_types_node___node_17.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz"; + sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; }; } { - name = "_types_node___node_14.17.34.tgz"; + name = "_types_node___node_14.18.9.tgz"; path = fetchurl { - name = "_types_node___node_14.17.34.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz"; - sha1 = "fe4b38b3f07617c0fa31ae923fca9249641038f0"; + name = "_types_node___node_14.18.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz"; + sha512 = "j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q=="; }; } { @@ -134,7 +134,7 @@ path = fetchurl { name = "_types_plist___plist_3.0.2.tgz"; url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01"; + sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; }; } { @@ -142,7 +142,7 @@ path = fetchurl { name = "_types_verror___verror_1.10.5.tgz"; url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; - sha1 = "2a1413aded46e67a1fe2386800e291123ed75eb1"; + sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; }; } { @@ -150,15 +150,15 @@ path = fetchurl { name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; + sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; } { - name = "_types_yargs___yargs_17.0.7.tgz"; + name = "_types_yargs___yargs_17.0.8.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz"; - sha1 = "44a484c634761da4391477515a98772b82b5060f"; + name = "_types_yargs___yargs_17.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz"; + sha512 = "wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw=="; }; } { @@ -166,7 +166,7 @@ path = fetchurl { name = "_types_yauzl___yauzl_2.9.2.tgz"; url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + sha512 = "8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA=="; }; } { @@ -174,7 +174,7 @@ path = fetchurl { name = "agent_base___agent_base_6.0.2.tgz"; url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -182,7 +182,7 @@ path = fetchurl { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } { @@ -190,7 +190,7 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { @@ -198,15 +198,15 @@ path = fetchurl { name = "ansi_align___ansi_align_3.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha1 = "0cdf12e111ace773a86e9a1fad1225c43cb19a59"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; } { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; + name = "ansi_regex___ansi_regex_2.1.1.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 = "ed0317c322064f79466c02966bddb605ab37d998"; + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -214,7 +214,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -222,7 +222,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -230,7 +230,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -238,7 +238,7 @@ path = fetchurl { name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz"; - sha1 = "cb0825c5e12efc85b196ac3ed9c89f076c61040e"; + sha512 = "ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw=="; }; } { @@ -246,7 +246,15 @@ path = fetchurl { name = "app_builder_lib___app_builder_lib_22.14.5.tgz"; url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz"; - sha1 = "a61a50b132b858e98fdc70b6b88994ae99b4f96d"; + sha512 = "k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg=="; + }; + } + { + 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=="; }; } { @@ -254,7 +262,15 @@ path = fetchurl { name = "arch___arch_2.2.0.tgz"; url = "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz"; - sha1 = "1bc47818f305764f23ab3306b0bfc086c5a29d11"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; } { @@ -262,7 +278,7 @@ path = fetchurl { name = "argparse___argparse_2.0.1.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { @@ -270,7 +286,7 @@ path = fetchurl { name = "asar___asar_3.1.0.tgz"; url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; - sha1 = "70b0509449fe3daccc63beb4d3c7d2e24d3c6473"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; } { @@ -278,7 +294,15 @@ 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 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { @@ -286,7 +310,7 @@ path = fetchurl { name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; }; } { @@ -294,7 +318,7 @@ path = fetchurl { name = "async___async_0.9.2.tgz"; url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; }; } { @@ -302,7 +326,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; }; } { @@ -310,7 +334,7 @@ path = fetchurl { name = "at_least_node___at_least_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; } { @@ -318,7 +342,7 @@ path = fetchurl { name = "axios___axios_0.24.0.tgz"; url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha1 = "804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"; + sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; }; } { @@ -326,7 +350,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; } { @@ -334,7 +358,7 @@ path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } { @@ -342,7 +366,7 @@ path = fetchurl { name = "bl___bl_4.1.0.tgz"; url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; } { @@ -350,7 +374,7 @@ path = fetchurl { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; }; } { @@ -358,7 +382,7 @@ path = fetchurl { name = "bluebird___bluebird_3.7.2.tgz"; url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; } { @@ -366,7 +390,7 @@ path = fetchurl { name = "boolean___boolean_3.1.4.tgz"; url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; - sha1 = "f51a2fb5838a99e06f9b6ec1edb674de67026435"; + sha512 = "3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="; }; } { @@ -374,7 +398,7 @@ path = fetchurl { name = "bootstrap___bootstrap_5.1.3.tgz"; url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz"; - sha1 = "ba081b0c130f810fa70900acbc1c6d3c28fa8f34"; + sha512 = "fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q=="; }; } { @@ -382,7 +406,7 @@ path = fetchurl { name = "boxen___boxen_5.1.2.tgz"; url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha1 = "788cb686fc83c1f486dfa8a40c68fc2b831d2b50"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; } { @@ -390,7 +414,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -398,7 +422,7 @@ 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"; - sha1 = "bd7dc26ae2972d0eda253be061dba992349c19f0"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; }; } { @@ -406,7 +430,7 @@ path = fetchurl { name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha1 = "890dd90d923a873e08e10e5fd51a57e5b7cce0ec"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; }; } { @@ -414,7 +438,7 @@ path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; }; } { @@ -422,7 +446,7 @@ path = fetchurl { name = "buffer_equal___buffer_equal_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + sha1 = "WWFrSYME1Var1GaWayLu2j7KX74="; }; } { @@ -430,7 +454,7 @@ path = fetchurl { name = "buffer_fill___buffer_fill_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; + sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; }; } { @@ -438,7 +462,7 @@ path = fetchurl { name = "buffer_from___buffer_from_1.1.2.tgz"; url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; } { @@ -446,7 +470,7 @@ path = fetchurl { name = "buffer___buffer_5.7.1.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; } { @@ -454,7 +478,7 @@ path = fetchurl { name = "builder_util_runtime___builder_util_runtime_8.9.1.tgz"; url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz"; - sha1 = "25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"; + sha512 = "c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg=="; }; } { @@ -462,7 +486,7 @@ path = fetchurl { name = "builder_util___builder_util_22.14.5.tgz"; url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz"; - sha1 = "42a18608d2a566c0846e91266464776c8bfb0cc9"; + sha512 = "zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA=="; }; } { @@ -470,15 +494,15 @@ path = fetchurl { name = "cacheable_request___cacheable_request_6.1.0.tgz"; url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } { - name = "camelcase___camelcase_6.2.1.tgz"; + name = "camelcase___camelcase_6.3.0.tgz"; path = fetchurl { - name = "camelcase___camelcase_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz"; - sha1 = "250fd350cfd555d0d2160b1d51510eaf8326e86e"; + name = "camelcase___camelcase_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; } { @@ -486,7 +510,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -494,7 +518,7 @@ path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { @@ -502,7 +526,7 @@ path = fetchurl { name = "charenc___charenc_0.0.2.tgz"; url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; - sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + sha1 = "wKHS86cJLgN3S/qD8UwPxXkKhmc="; }; } { @@ -510,7 +534,7 @@ path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } { @@ -518,7 +542,7 @@ path = fetchurl { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + sha1 = "BKEGZywYsIWrd02YPfo+oTjyIgU="; }; } { @@ -526,7 +550,7 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { @@ -534,7 +558,7 @@ path = fetchurl { name = "ci_info___ci_info_3.3.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; - sha1 = "b4ed1fb6818dea4803a55c623041f9165d2066b2"; + sha512 = "riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="; }; } { @@ -542,15 +566,15 @@ path = fetchurl { name = "cli_boxes___cli_boxes_2.2.1.tgz"; url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; } { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; path = fetchurl { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; } { @@ -558,7 +582,7 @@ path = fetchurl { name = "clipboardy___clipboardy_2.3.0.tgz"; url = "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz"; - sha1 = "3c2903650c68e46a91b388985bc2774287dba290"; + sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; } { @@ -566,7 +590,7 @@ path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } { @@ -574,7 +598,15 @@ path = fetchurl { name = "clone_response___clone_response_1.0.2.tgz"; url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -582,7 +614,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -590,7 +622,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -598,7 +630,7 @@ 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 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -606,7 +638,7 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { @@ -614,7 +646,7 @@ path = fetchurl { name = "colors___colors_1.0.3.tgz"; url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + sha1 = "BDP0TYCWgP3rYO0mDxsMJi6CpAs="; }; } { @@ -622,7 +654,7 @@ path = fetchurl { name = "combined_stream___combined_stream_1.0.8.tgz"; url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } { @@ -630,7 +662,7 @@ path = fetchurl { name = "commander___commander_2.9.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + sha1 = "nJkJQXbhIkDLItbFFGCYQA/g99Q="; }; } { @@ -638,7 +670,7 @@ path = fetchurl { name = "commander___commander_5.1.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; } { @@ -646,7 +678,7 @@ path = fetchurl { name = "compare_version___compare_version_0.1.2.tgz"; url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; + sha1 = "AWLsLZNR9d3VmpICy6k1NmpyUIA="; }; } { @@ -654,7 +686,7 @@ 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 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -662,7 +694,7 @@ path = fetchurl { name = "concat_stream___concat_stream_1.6.2.tgz"; url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } { @@ -670,7 +702,7 @@ path = fetchurl { name = "config_chain___config_chain_1.1.13.tgz"; url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } { @@ -678,7 +710,15 @@ path = fetchurl { name = "configstore___configstore_5.0.1.tgz"; url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { @@ -686,7 +726,7 @@ 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 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; }; } { @@ -694,7 +734,7 @@ 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"; - sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -702,7 +742,7 @@ path = fetchurl { name = "crc___crc_3.8.0.tgz"; url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; } { @@ -710,7 +750,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; } { @@ -718,7 +758,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -726,7 +766,7 @@ path = fetchurl { name = "crypt___crypt_0.0.2.tgz"; url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + sha1 = "iNf/fsDfuG9xPch7u0LQRNPmxBs="; }; } { @@ -734,7 +774,15 @@ path = fetchurl { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; + }; + } + { + 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=="; }; } { @@ -742,7 +790,7 @@ path = fetchurl { name = "debug___debug_4.3.2.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; } { @@ -750,7 +798,7 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { @@ -758,7 +806,15 @@ path = fetchurl { name = "decompress_response___decompress_response_3.3.0.tgz"; url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; + }; + } + { + name = "decompress_response___decompress_response_4.2.1.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; } { @@ -766,7 +822,7 @@ path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } { @@ -774,7 +830,7 @@ path = fetchurl { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; } { @@ -782,7 +838,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -790,7 +846,23 @@ 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 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; }; } { @@ -798,15 +870,15 @@ path = fetchurl { name = "detect_node___detect_node_2.1.0.tgz"; url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; } { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; - sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz"; + sha512 = "daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ=="; }; } { @@ -814,7 +886,7 @@ path = fetchurl { name = "dir_compare___dir_compare_2.4.0.tgz"; url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; + sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; }; } { @@ -822,15 +894,15 @@ path = fetchurl { name = "dmg_builder___dmg_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz"; - sha1 = "137c0b55e639badcc0b119eb060e6fa4ed61d948"; + sha512 = "1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w=="; }; } { - name = "dmg_license___dmg_license_1.0.9.tgz"; + name = "dmg_license___dmg_license_1.0.10.tgz"; path = fetchurl { - name = "dmg_license___dmg_license_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz"; - sha1 = "a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"; + name = "dmg_license___dmg_license_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz"; + sha512 = "SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A=="; }; } { @@ -838,7 +910,7 @@ path = fetchurl { name = "dot_prop___dot_prop_5.3.0.tgz"; url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; } { @@ -846,7 +918,7 @@ path = fetchurl { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; } { @@ -854,7 +926,7 @@ path = fetchurl { name = "dotenv___dotenv_9.0.2.tgz"; url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } { @@ -862,7 +934,7 @@ path = fetchurl { name = "duplexer3___duplexer3_0.1.4.tgz"; url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; }; } { @@ -870,7 +942,7 @@ path = fetchurl { name = "ejs___ejs_3.1.6.tgz"; url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; } { @@ -878,7 +950,7 @@ path = fetchurl { name = "electron_builder___electron_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz"; - sha1 = "3a25547bd4fe3728d4704da80956a794c5c31496"; + sha512 = "N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg=="; }; } { @@ -886,7 +958,7 @@ path = fetchurl { name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"; - sha1 = "fc258c5e896859904bbe3d01da06902c04b51c3a"; + sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; } { @@ -894,15 +966,15 @@ path = fetchurl { name = "electron_publish___electron_publish_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz"; - sha1 = "34bcdce671f0e651330db20040d6919c77c94bd6"; + sha512 = "h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg=="; }; } { - name = "electron___electron_15.3.2.tgz"; + name = "electron___electron_16.0.7.tgz"; path = fetchurl { - name = "electron___electron_15.3.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz"; - sha1 = "4f0cbad781d14e0194f5dfef1709e09a70c8074a"; + name = "electron___electron_16.0.7.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz"; + sha512 = "/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w=="; }; } { @@ -910,7 +982,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -918,7 +990,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -926,7 +998,7 @@ 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"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -934,7 +1006,7 @@ path = fetchurl { name = "env_paths___env_paths_2.2.1.tgz"; url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; } { @@ -942,7 +1014,7 @@ path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; } { @@ -950,7 +1022,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -958,7 +1030,7 @@ path = fetchurl { name = "escape_goat___escape_goat_2.1.1.tgz"; url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; } { @@ -966,7 +1038,7 @@ 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 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -974,7 +1046,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -982,7 +1054,15 @@ path = fetchurl { name = "execa___execa_1.0.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + } + { + name = "expand_template___expand_template_2.0.3.tgz"; + path = fetchurl { + name = "expand_template___expand_template_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; } { @@ -990,7 +1070,7 @@ path = fetchurl { name = "extract_zip___extract_zip_2.0.1.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -998,7 +1078,7 @@ path = fetchurl { name = "extract_zip___extract_zip_1.7.0.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; - sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; }; } { @@ -1006,7 +1086,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.4.1.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; - sha1 = "8d172c064867f235c0c84a596806d279bf4bcc07"; + sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; }; } { @@ -1014,7 +1094,7 @@ 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"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -1022,7 +1102,7 @@ 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"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -1030,7 +1110,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; }; } { @@ -1038,7 +1118,7 @@ path = fetchurl { name = "filelist___filelist_1.0.2.tgz"; url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; }; } { @@ -1046,15 +1126,15 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz"; - sha1 = "f09a5848981d3c772b5392309778523f8d85c381"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; } { @@ -1062,7 +1142,7 @@ path = fetchurl { name = "font_awesome___font_awesome_4.7.0.tgz"; url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + sha1 = "j6jPBBGhoxr9B7BtKQK7n8gVoTM="; }; } { @@ -1070,7 +1150,7 @@ path = fetchurl { name = "form_data___form_data_4.0.0.tgz"; url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha1 = "93919daeaf361ee529584b9b31664dc12c9fa452"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; } { @@ -1078,7 +1158,7 @@ path = fetchurl { name = "fs_constants___fs_constants_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; - sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; } { @@ -1086,7 +1166,7 @@ path = fetchurl { name = "fs_extra___fs_extra_10.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; - sha1 = "9ff61b655dde53fb34a82df84bb214ce802e17c1"; + sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; } { @@ -1094,7 +1174,7 @@ path = fetchurl { name = "fs_extra___fs_extra_8.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; } { @@ -1102,7 +1182,7 @@ path = fetchurl { name = "fs_extra___fs_extra_9.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } { @@ -1110,7 +1190,15 @@ 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 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -1118,7 +1206,7 @@ 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"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -1126,7 +1214,7 @@ path = fetchurl { name = "get_stream___get_stream_4.1.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; } { @@ -1134,7 +1222,15 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + } + { + name = "github_from_package___github_from_package_0.0.0.tgz"; + path = fetchurl { + name = "github_from_package___github_from_package_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "l/tdlr/eiXMxPyDoKI75oWf6ZM4="; }; } { @@ -1142,7 +1238,7 @@ path = fetchurl { name = "glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } { @@ -1150,7 +1246,7 @@ path = fetchurl { name = "global_agent___global_agent_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha1 = "ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"; + sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } { @@ -1158,7 +1254,7 @@ path = fetchurl { name = "global_dirs___global_dirs_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; }; } { @@ -1166,7 +1262,7 @@ path = fetchurl { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; }; } { @@ -1174,7 +1270,7 @@ path = fetchurl { name = "globalthis___globalthis_1.0.2.tgz"; url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; - sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; + sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; }; } { @@ -1182,15 +1278,15 @@ path = fetchurl { name = "got___got_9.6.0.tgz"; url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + 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=="; }; } { @@ -1198,7 +1294,7 @@ path = fetchurl { name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + sha1 = "TK+tdrxi8C+gObL5Tpo906ORpyU="; }; } { @@ -1206,7 +1302,7 @@ 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 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -1214,7 +1310,15 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -1222,15 +1326,15 @@ path = fetchurl { name = "has_yarn___has_yarn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; } { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; }; } { @@ -1238,7 +1342,7 @@ path = fetchurl { name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; } { @@ -1246,15 +1350,15 @@ path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; } { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz"; - sha1 = "27c135470237f6f8d13462fa1f5eaf250523c29a"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; + sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } { @@ -1262,7 +1366,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.6.3.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; } { @@ -1270,7 +1374,7 @@ path = fetchurl { name = "ieee754___ieee754_1.2.1.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } { @@ -1278,7 +1382,7 @@ path = fetchurl { name = "import_lazy___import_lazy_2.1.0.tgz"; url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; }; } { @@ -1286,7 +1390,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -1294,7 +1398,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -1302,7 +1406,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -1310,7 +1414,7 @@ path = fetchurl { name = "ini___ini_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; } { @@ -1318,7 +1422,7 @@ path = fetchurl { name = "ini___ini_1.3.8.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha1 = "a29da425b48806f34767a4efce397269af28432c"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } { @@ -1326,7 +1430,7 @@ path = fetchurl { name = "is_buffer___is_buffer_1.1.6.tgz"; url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; } { @@ -1334,7 +1438,7 @@ path = fetchurl { name = "is_ci___is_ci_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; } { @@ -1342,7 +1446,7 @@ path = fetchurl { name = "is_ci___is_ci_3.0.1.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; - sha1 = "db6ecbed1bd659c43dac0f45661e7674103d1867"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; } { @@ -1350,15 +1454,15 @@ path = fetchurl { name = "is_docker___is_docker_2.2.1.tgz"; url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; - sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; } { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.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 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -1366,7 +1470,7 @@ 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"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -1374,7 +1478,7 @@ path = fetchurl { name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; }; } { @@ -1382,7 +1486,7 @@ path = fetchurl { name = "is_npm___is_npm_5.0.0.tgz"; url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; + sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; }; } { @@ -1390,7 +1494,7 @@ path = fetchurl { name = "is_obj___is_obj_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; } { @@ -1398,7 +1502,7 @@ path = fetchurl { name = "is_path_inside___is_path_inside_3.0.3.tgz"; url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; } { @@ -1406,7 +1510,7 @@ 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 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; }; } { @@ -1414,7 +1518,7 @@ 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 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; }; } { @@ -1422,7 +1526,7 @@ path = fetchurl { name = "is_wsl___is_wsl_2.2.0.tgz"; url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; - sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } { @@ -1430,7 +1534,7 @@ path = fetchurl { name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha1 = "d502d3382590ea3004893746754c89139973e232"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; } { @@ -1438,7 +1542,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -1446,7 +1550,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha1 = "5d6def3edebf6e8ca8cae9c30183a804b5f8be80"; + sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; } { @@ -1454,7 +1558,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; }; } { @@ -1462,7 +1566,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { @@ -1470,7 +1574,7 @@ path = fetchurl { name = "iso8601_duration___iso8601_duration_1.3.0.tgz"; url = "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-1.3.0.tgz"; - sha1 = "29d7b69e0574e4acdee50c5e5e09adab4137ba5a"; + sha512 = "K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ=="; }; } { @@ -1478,7 +1582,7 @@ path = fetchurl { name = "jake___jake_10.8.2.tgz"; url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; }; } { @@ -1486,7 +1590,7 @@ path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } { @@ -1494,7 +1598,7 @@ path = fetchurl { name = "json_buffer___json_buffer_3.0.0.tgz"; url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; }; } { @@ -1502,7 +1606,7 @@ 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"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -1510,7 +1614,7 @@ 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 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; }; } { @@ -1518,7 +1622,7 @@ path = fetchurl { name = "json5___json5_2.2.0.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; - sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; } { @@ -1526,7 +1630,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; }; } { @@ -1534,7 +1638,15 @@ path = fetchurl { name = "jsonfile___jsonfile_6.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + } + { + name = "keytar___keytar_7.7.0.tgz"; + path = fetchurl { + name = "keytar___keytar_7.7.0.tgz"; + url = "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz"; + sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; }; } { @@ -1542,7 +1654,7 @@ path = fetchurl { name = "keyv___keyv_3.1.0.tgz"; url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } { @@ -1550,7 +1662,7 @@ path = fetchurl { name = "latest_version___latest_version_5.1.0.tgz"; url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; } { @@ -1558,7 +1670,7 @@ path = fetchurl { name = "lazy_val___lazy_val_1.0.5.tgz"; url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha1 = "6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"; + sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; }; } { @@ -1566,7 +1678,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -1574,7 +1686,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -1582,7 +1694,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; } { @@ -1590,7 +1702,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; } { @@ -1598,7 +1710,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -1606,7 +1718,7 @@ path = fetchurl { name = "make_dir___make_dir_3.1.0.tgz"; url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } { @@ -1614,7 +1726,7 @@ path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; }; } { @@ -1622,7 +1734,7 @@ path = fetchurl { name = "md5___md5_2.3.0.tgz"; url = "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz"; - sha1 = "c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"; + sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; } { @@ -1630,7 +1742,7 @@ path = fetchurl { name = "mime_db___mime_db_1.51.0.tgz"; url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; - sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; } { @@ -1638,7 +1750,7 @@ path = fetchurl { name = "mime_types___mime_types_2.1.34.tgz"; url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; - sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; } { @@ -1646,7 +1758,7 @@ path = fetchurl { name = "mime___mime_2.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; - sha1 = "a2a682a95cd4d0cb1d6257e28f83da7e35800367"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; } { @@ -1654,7 +1766,15 @@ path = fetchurl { name = "mimic_response___mimic_response_1.0.1.tgz"; url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + } + { + name = "mimic_response___mimic_response_2.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; } { @@ -1662,7 +1782,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -1670,7 +1790,7 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; } { @@ -1678,7 +1798,7 @@ path = fetchurl { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; - sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; } { @@ -1686,7 +1806,7 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.5.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; } { @@ -1694,7 +1814,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -1702,7 +1822,15 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + } + { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + path = fetchurl { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; } { @@ -1710,7 +1838,15 @@ path = fetchurl { name = "nice_try___nice_try_1.0.5.tgz"; url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + } + { + name = "node_abi___node_abi_2.30.1.tgz"; + path = fetchurl { + name = "node_abi___node_abi_2.30.1.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; } { @@ -1718,7 +1854,15 @@ path = fetchurl { name = "node_addon_api___node_addon_api_1.7.2.tgz"; url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; + }; + } + { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; } { @@ -1726,7 +1870,7 @@ path = fetchurl { name = "node_fetch___node_fetch_2.6.5.tgz"; url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; + sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; }; } { @@ -1734,7 +1878,7 @@ path = fetchurl { name = "normalize_url___normalize_url_4.5.1.tgz"; url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; } { @@ -1742,7 +1886,7 @@ path = fetchurl { name = "npm_conf___npm_conf_1.1.3.tgz"; url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; } { @@ -1750,7 +1894,31 @@ 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 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; + }; + } + { + name = "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="; }; } { @@ -1758,7 +1926,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -1766,7 +1934,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -1774,7 +1942,7 @@ path = fetchurl { name = "p_cancelable___p_cancelable_1.1.0.tgz"; url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; } { @@ -1782,7 +1950,7 @@ 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 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; }; } { @@ -1790,7 +1958,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -1798,7 +1966,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -1806,7 +1974,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -1814,7 +1982,7 @@ path = fetchurl { name = "package_json___package_json_6.5.0.tgz"; url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; } { @@ -1822,7 +1990,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -1830,7 +1998,7 @@ 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 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -1838,7 +2006,7 @@ 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 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; }; } { @@ -1846,7 +2014,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -1854,7 +2022,7 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; }; } { @@ -1862,7 +2030,7 @@ path = fetchurl { name = "pify___pify_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; }; } { @@ -1870,7 +2038,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { @@ -1878,7 +2046,15 @@ path = fetchurl { name = "plist___plist_3.0.4.tgz"; url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; - sha1 = "a62df837e3aed2bb3b735899d510c4f186019cbe"; + sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + }; + } + { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; } { @@ -1886,7 +2062,7 @@ path = fetchurl { name = "prepend_http___prepend_http_2.0.0.tgz"; url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; }; } { @@ -1894,7 +2070,7 @@ 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"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -1902,7 +2078,7 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { @@ -1910,7 +2086,7 @@ path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; }; } { @@ -1918,7 +2094,7 @@ path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; - sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; }; } { @@ -1926,7 +2102,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -1934,7 +2110,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -1942,15 +2118,15 @@ path = fetchurl { name = "pupa___pupa_2.1.1.tgz"; url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; } { - name = "puppeteer___puppeteer_11.0.0.tgz"; + name = "puppeteer___puppeteer_13.0.1.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz"; - sha1 = "0808719c38e15315ecc1b1c28911f1c9054d201f"; + name = "puppeteer___puppeteer_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz"; + sha512 = "wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A=="; }; } { @@ -1958,7 +2134,7 @@ path = fetchurl { name = "rc___rc_1.2.8.tgz"; url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; } { @@ -1966,7 +2142,7 @@ 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"; - sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; + sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; }; } { @@ -1974,7 +2150,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -1982,7 +2158,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -1990,7 +2166,7 @@ path = fetchurl { name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; } { @@ -1998,7 +2174,7 @@ path = fetchurl { name = "registry_url___registry_url_5.1.0.tgz"; url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; } { @@ -2006,7 +2182,7 @@ 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 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -2014,7 +2190,7 @@ path = fetchurl { name = "responselike___responselike_1.0.2.tgz"; url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; }; } { @@ -2022,7 +2198,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -2030,15 +2206,7 @@ path = fetchurl { name = "roarr___roarr_2.15.4.tgz"; url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; - }; - } - { - 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"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; } { @@ -2046,7 +2214,15 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.2.1.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -2054,7 +2230,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -2062,7 +2238,7 @@ path = fetchurl { name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; } { @@ -2070,7 +2246,7 @@ path = fetchurl { name = "sax___sax_1.2.4.tgz"; url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; } { @@ -2078,7 +2254,7 @@ path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; }; } { @@ -2086,7 +2262,7 @@ path = fetchurl { name = "semver_diff___semver_diff_3.1.1.tgz"; url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; }; } { @@ -2094,7 +2270,7 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; } { @@ -2102,7 +2278,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -2110,7 +2286,7 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { @@ -2118,7 +2294,15 @@ path = fetchurl { name = "serialize_error___serialize_error_7.0.1.tgz"; url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + 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"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { @@ -2126,7 +2310,7 @@ 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 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; }; } { @@ -2134,7 +2318,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -2142,7 +2326,7 @@ 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 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; }; } { @@ -2150,7 +2334,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { @@ -2158,15 +2342,31 @@ path = fetchurl { name = "signal_exit___signal_exit_3.0.6.tgz"; url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; - sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; }; } { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; + name = "simple_concat___simple_concat_1.0.1.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d"; + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + } + { + name = "simple_get___simple_get_3.1.0.tgz"; + path = fetchurl { + name = "simple_get___simple_get_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + }; + } + { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; }; } { @@ -2174,7 +2374,7 @@ path = fetchurl { name = "smart_buffer___smart_buffer_4.2.0.tgz"; url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } { @@ -2182,7 +2382,7 @@ 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"; - sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; } { @@ -2190,7 +2390,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -2198,7 +2398,7 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.1.2.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; } { @@ -2206,15 +2406,15 @@ path = fetchurl { name = "stat_mode___stat_mode_1.0.0.tgz"; url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; } { - name = "string_width___string_width_2.1.1.tgz"; + name = "string_width___string_width_1.0.2.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"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -2222,7 +2422,7 @@ path = fetchurl { name = "string_width___string_width_4.2.3.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -2230,7 +2430,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -2238,15 +2438,15 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; + name = "strip_ansi___strip_ansi_3.0.1.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 = "a8479022eb1ac368a871389b635262c505ee368f"; + 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="; }; } { @@ -2254,7 +2454,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_6.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -2262,7 +2462,7 @@ 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 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; }; } { @@ -2270,7 +2470,7 @@ 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 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; }; } { @@ -2278,7 +2478,7 @@ path = fetchurl { name = "sumchecker___sumchecker_3.0.1.tgz"; url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; }; } { @@ -2286,7 +2486,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -2294,7 +2494,7 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { @@ -2302,7 +2502,7 @@ path = fetchurl { name = "tar_fs___tar_fs_2.1.1.tgz"; url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; - sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; } { @@ -2310,7 +2510,7 @@ path = fetchurl { name = "tar_stream___tar_stream_2.2.0.tgz"; url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; - sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; } { @@ -2318,7 +2518,7 @@ path = fetchurl { name = "temp_file___temp_file_3.4.0.tgz"; url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha1 = "766ea28911c683996c248ef1a20eea04d51652c7"; + sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; }; } { @@ -2326,7 +2526,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -2334,7 +2534,7 @@ path = fetchurl { name = "tmp_promise___tmp_promise_3.0.3.tgz"; url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha1 = "60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; }; } { @@ -2342,7 +2542,7 @@ path = fetchurl { name = "tmp___tmp_0.2.1.tgz"; url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; } { @@ -2350,7 +2550,7 @@ path = fetchurl { name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; }; } { @@ -2358,7 +2558,7 @@ path = fetchurl { name = "tr46___tr46_0.0.3.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; }; } { @@ -2366,7 +2566,15 @@ path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + sha1 = "QFkjkJWS1W94pYGENLC3hInKXys="; + }; + } + { + 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="; }; } { @@ -2374,7 +2582,7 @@ path = fetchurl { name = "tunnel___tunnel_0.0.6.tgz"; url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; }; } { @@ -2382,7 +2590,7 @@ path = fetchurl { name = "type_fest___type_fest_0.13.1.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } { @@ -2390,7 +2598,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -2398,7 +2606,7 @@ path = fetchurl { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; } { @@ -2406,7 +2614,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; }; } { @@ -2414,7 +2622,7 @@ path = fetchurl { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; - sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } { @@ -2422,7 +2630,7 @@ path = fetchurl { name = "unique_string___unique_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; } { @@ -2430,7 +2638,7 @@ path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } { @@ -2438,7 +2646,7 @@ path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } { @@ -2446,7 +2654,7 @@ path = fetchurl { name = "update_notifier___update_notifier_5.1.0.tgz"; url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; } { @@ -2454,7 +2662,7 @@ path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } { @@ -2462,7 +2670,7 @@ path = fetchurl { name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; }; } { @@ -2470,7 +2678,7 @@ path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + sha1 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; }; } { @@ -2478,7 +2686,7 @@ 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 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -2486,7 +2694,7 @@ path = fetchurl { name = "verror___verror_1.10.1.tgz"; url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; - sha1 = "4bf09eeccf4563b109ed4b3d458380c972b0cdeb"; + sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; }; } { @@ -2494,7 +2702,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; }; } { @@ -2502,7 +2710,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_5.0.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; }; } { @@ -2510,7 +2718,7 @@ path = fetchurl { name = "which___which_1.3.1.tgz"; url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; } { @@ -2518,7 +2726,15 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + 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=="; }; } { @@ -2526,7 +2742,7 @@ path = fetchurl { name = "widest_line___widest_line_3.1.0.tgz"; url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; } { @@ -2534,7 +2750,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -2542,7 +2758,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { @@ -2550,7 +2766,7 @@ path = fetchurl { name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; } { @@ -2558,7 +2774,7 @@ path = fetchurl { name = "ws___ws_8.2.3.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; - sha1 = "63a56456db1b04367d0b721a0b80cae6d8becbba"; + sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; } { @@ -2566,7 +2782,7 @@ path = fetchurl { name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; } { @@ -2574,7 +2790,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; }; } { @@ -2582,7 +2798,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + sha1 = "Ey7mPS7FVlxVfiD0wi35rKaGsQ0="; }; } { @@ -2590,7 +2806,7 @@ path = fetchurl { name = "y18n___y18n_5.0.8.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } { @@ -2598,23 +2814,23 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; + name = "yargs_parser___yargs_parser_21.0.0.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"; - sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + name = "yargs_parser___yargs_parser_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; }; } { - name = "yargs___yargs_17.2.1.tgz"; + name = "yargs___yargs_17.3.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.2.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz"; - sha1 = "e2c95b9796a0e1f7f3bf4427863b42e0418191ea"; + name = "yargs___yargs_17.3.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz"; + sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; }; } { @@ -2622,7 +2838,7 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; }; } ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix index 1895acacac..a0ec572a40 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/shunit2/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, resholvePackage +, fetchFromGitHub +, bash +, coreutils +, gnused +, gnugrep +, findutils +, ncurses +}: -stdenv.mkDerivation { +resholvePackage rec { pname = "shunit2"; - version = "2019-08-10"; + version = "2.1.8"; src = fetchFromGitHub { owner = "kward"; - repo = "shunit2"; - rev = "ba130d69bbff304c0c6a9c5e8ab549ae140d6225"; - sha256 = "1bsn8dhxbjfmh01lq80yhnld3w3fw1flh7nwx12csrp58zsvlmgk"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IZHkgkVqzeh+eEKCDJ87sqNhSA+DU6kBCNDdQaUEeiM="; }; installPhase = '' @@ -22,10 +31,59 @@ stdenv.mkDerivation { $out/bin/shunit2 ''; + solutions = { + shunit = { + # Caution: see __SHUNIT_CMD_ECHO_ESC before changing + interpreter = "${bash}/bin/sh"; + scripts = [ "bin/shunit2" ]; + inputs = [ coreutils gnused gnugrep findutils ncurses ]; + # resholve's Nix API is analogous to the CLI flags + # documented in 'man resholve' + fake = { + # "missing" functions shunit2 expects the user to declare + function = [ + "oneTimeSetUp" + "oneTimeTearDown" + "setUp" + "tearDown" + "suite" + "noexec" + ]; + # shunit2 is both bash and zsh compatible, and in + # some zsh-specific code it uses this non-bash builtin + builtin = [ "setopt" ]; + }; + fix = { + # stray absolute path; make it resolve from coreutils + "/usr/bin/od" = true; + /* + Caution: this one is contextually debatable. shunit2 + sets this variable after testing whether `echo -e test` + yields `test` or `-e test`. Since we're setting the + interpreter, we can pre-test this. But if we go fiddle + the interpreter later, I guess we _could_ break it. + */ + "$__SHUNIT_CMD_ECHO_ESC" = [ "'echo -e'" ]; + "$SHUNIT_CMD_TPUT" = [ "tput" ]; # from ncurses + }; + keep = { + # dynamically defined in shunit2:_shunit_mktempFunc + eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ]; + + # dynamic based on CLI flag + "$_SHUNIT_LINENO_" = true; + }; + execer = [ + # drop after https://github.com/abathur/binlore/issues/2 + "cannot:${ncurses}/bin/tput" + ]; + }; + }; + meta = with lib; { homepage = "https://github.com/kward/shunit2"; - description = "A xUnit based unit test framework for Bourne based shell scripts"; - maintainers = with maintainers; [ cdepillabout utdemir ]; + description = "An xUnit based unit test framework for Bourne based shell scripts"; + maintainers = with maintainers; [ abathur utdemir ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix index 68e828a07b..554822ba8d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,17 @@ buildGoModule rec { pname = "steampipe"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-vDyox8UArgK27FkNFK3SNksvOmpaRgZ/ueZgqO7MOl0="; + sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys="; }; - vendorSha256 = "sha256-ikmcayOy87u6XMYjxxzFv35Rlp9oTteEKFOPr/+xc2Y="; + vendorSha256 = "sha256-hqjjwYBVnuw7Bt2901tPIkfvYLy955IdeMbeSWTjtL0="; + proxyVendor = true; # tests are failing for no obvious reasons doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix index 0a51eda485..ec42cf7136 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs="; }; - vendorSha256 = "sha256-1VRK8tmsbOuP5t5uJ1h+KPcS4K9D+y6UQKeUP2HPXrQ="; + vendorSha256 = "sha256-X6iVbljbHb9nBoXAZuy+vG8w7Alct+8BkabZlJeuUAM="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix index d5a37e2e67..d8ba086112 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi }: +{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "231"; + version = "273"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "0mcglb84zfmrai2bcdg9j0ck8jp8h7ii2rf4m38yjggy0dvii2lc"; + sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; }; nativeBuildInputs = [ bison flex ]; @@ -17,8 +17,16 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "tests"; - # Remove failing test-- mentions 'usr/bin' so probably related :) - preCheck = "rm -rf tests/017"; + postPatch = '' + # Fixup references to /usr/bin in tests + substituteInPlace tests/017/realpath.tl --replace /usr/bin /bin + substituteInPlace tests/017/realpath.expected --replace /usr/bin /bin + + substituteInPlace tests/018/process.tl --replace /usr/bin/env ${lib.getBin coreutils}/bin/env + ''; + + # Remove failing tests -- 018/chmod tries setting sticky bit + preCheck = "rm -rf tests/018/chmod*"; postInstall = '' d=$out/share/vim-plugins/txr diff --git a/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix index 8148dfdec7..30e2fa3ece 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-D0rakLZ+swrDwBMcr+EJPgaYsQTWob50QteW1PoIdNk="; }; - vendorSha256 = "sha256-gMHPWf/kFb55GyyMciLWRzvrQXUGDQ72RNkIhkMVe54="; + vendorSha256 = "sha256-PGsj7pLtd+xpy9Dhv6qJX5sHin4YAOdXaYj4QCSFte4="; meta = with lib; { description = "A time zone helper"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/unparam/default.nix b/third_party/nixpkgs/pkgs/tools/misc/unparam/default.nix new file mode 100644 index 0000000000..5840a0d82b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/unparam/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "unparam"; + version = "unstable-2021-12-14"; + + src = fetchFromGitHub { + owner = "mvdan"; + repo = "unparam"; + rev = "d0ef000c54e5fbf955d67422b0495b9f29b354da"; + sha256 = "sha256-fH/LcshpOk+UFfQ5dE2eHi6Oi5cm8umeXoyHJvhpAbE="; + }; + + vendorSha256 = "sha256-pfIxWvJYAus4DShTcBI1bwn/Q2c5qWvCwPCwfUsv8c0="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Find unused parameters in Go"; + homepage = "https://github.com/mvdan/unparam"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index 468fa433e8..af484d9f3c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -29,7 +29,7 @@ let pname = "vector"; - version = "0.19.1"; + version = "0.19.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -38,10 +38,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ty+tsT3nkdYN7/avG1imIwWKAmtPA3NPjhrtoADciQs="; + sha256 = "sha256-fTi9Xu/abQAiVCokfieJUgAtPaqUKw6LJQFqMBoW5yc="; }; - cargoSha256 = "sha256-dYIAbjBBnEsCGt5ceV+jG0hsu8dcAH4V+wnfm6Chw8Q="; + cargoSha256 = "sha256-1bxlO9vuNuPLTLhXwcR6mgOpZwFgdXvGVps5b5ioKJc="; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/viddy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/viddy/default.nix index 4b65a63431..f882ce4b5b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/viddy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/viddy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-V/x969wi5u5ND9QgJfc4vtI2t1G1ETlATzeqnpHMncc="; }; - vendorSha256 = "sha256-iSgFDTNeRPpCMxNqj2LhYV+6/eskGa58e+rT0Nhg+pE="; + vendorSha256 = "sha256-LtRHnZF0ynnIp77K9anljqq42BumXohDMwlU7hzSxZk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix index d0a6114316..71d67ed748 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA="; + sha256 = "sha256-83ff0T2P5aRQ6cM9z7IEuoi7syvJldIuzzdiTrygckA="; }; - cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg="; + cargoSha256 = "sha256-W1tLQTTMOKB/BR9P3y3goPIdOe12Qdkf4wYPlhbQjzY="; meta = with lib; { description = "A generator for LS_COLORS with support for multiple color themes"; 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 3534769b86..b73b41acd8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.1.21"; + version = "2022.2.4"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-Ig7EBzibXqcuJd/BHDDlQ0ibkAdcVTEdUlXiBF24qeI="; + sha256 = "sha256-gbUO18+c/MBC2PWhrS0c17E8SLNsB/rxiAaW6sCn3bU="; }; propagatedBuildInputs = [ websockets mutagen ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index f5722ba029..66fd783a00 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "4.0.7"; + version = "4.0.8"; format = "pyproject"; src = fetchFromGitHub { repo = "yubikey-manager"; rev = version; owner = "Yubico"; - sha256 = "sha256-PG/mIM1rcs1SAz2kfQtfUWoMBIwLz2ASZM0YQrz9w5I="; + sha256 = "sha256-OszXOu/NhoX4WutsT4Z1LsY54KTOWRKt13yDo2fzDbA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index 8851a4a874..f22817c3b3 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.7.1"; + version = "0.7.4"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-5m5ckeX3gVY82q9aQWusnq3o/+UBPJSPDdISL86OfV8="; - aarch64-linux = "sha256-+dnQh89kg3JcDL8sucMceCMRFyUjoAIYuZtDM8AUMYw="; - x86_64-darwin = "sha256-ZoWW8y048+5Ru3s7lUxLTMxuITFBC9AgwqafyHPDc54="; + x86_64-linux = "sha256-5owLce0A7AwKDXB/JsUJZeHJHhrHT4/kA6XG+ZwhuyU="; + aarch64-linux = "sha256-WDFIr+GOip70Di5u9fRu2lVWPMJe9urYTcuc2hTMD7g="; + x86_64-darwin = "sha256-FGsY7+bC7n3fu1SsLl92FPytj8MgL4nT95CC6GM6vss="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix b/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix index 73a39c8e54..82a418d5de 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-sSXl2I5vZ8PVLaZWlMl5phcqQ1k1OBy5v+X0O8nHtvw="; }; - vendorSha256 = "sha256-4XA7B0gmFE52VoKiPLsa0urPS7IdzrTBXuU4wZv/Lag="; + vendorSha256 = "sha256-aiqnJ1PjrwSC6YtixNvyTxgbs8z2radcETNhKHGlPk0="; # Requires network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix index 9df5625c23..d7dac44b28 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "chisel"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hUurgwbSUcNZiSi+eVTG/Ija/yxPeWuvEE5pUiG7Dls="; + sha256 = "sha256-3EaVUGcwkJWX0FxIaHddUehJIdbxAPfBm8esXKCUuhM="; }; - vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; + vendorSha256 = "sha256-Oko9nduKW76NIUCVyF0lPzEH+TFT1el9VGIbm5lQXtM="; ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix b/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix index c92cceeabc..bfe609f852 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/connman/connman.nix @@ -56,10 +56,10 @@ let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; - version = "1.40"; + version = "1.41"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "sha256-GleufOI0qjoXRKrDvlwhIdmNzpmUQO+KucxO39XtyxI="; + sha256 = "sha256-eftA9P3VUwxFqo5ZL7Froj02dPOpjPELiaZXbxmN5Yk="; }; patches = lib.optionals stdenv.hostPlatform.isMusl [ @@ -172,9 +172,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A daemon for managing internet connections"; - homepage = "https://01.org/connman"; + homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/"; maintainers = [ maintainers.matejc ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix index 81fe5cacda..03962f1e9e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm"; + sha256 = "sha256-23f+WJcTf+x9GW+hGUU3/j4Qi9MfcsfQuS7aEU4uGU4="; }; - vendorSha256 = "123f9y1pfayfd5amkw5b8jzi8dbn7a16kbf7lzbmw69c1gj4gx9z"; + vendorSha256 = "sha256-SSa+yBZjZ+5vRfzfCtNhF+kRyJ/VMgd9uWqKPwIi8+Y="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index 57b2f8be52..eb7a4f859e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.5.0"; + version = "9.5.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BgUurfzgezbbH0pCTuRINocc5y6ANCM91VlWht86QeE="; + sha256 = "sha256-86uM58MCdmt0sSEIgRRQYPr6Gf4lphFOcqRU7WD5HnI="; }; - vendorSha256 = "sha256-MstlmaMEbbAY9+h5pNVCXqDOqoSv5hjuRSFS/MTg6lo="; + vendorSha256 = "sha256-xL7aiMlnSzZsAtX3NiWfNcrz8oW7BuCLBUnJvx1ng2Y="; doCheck = false; @@ -19,7 +19,8 @@ buildGoModule rec { passthru = { tests = { - local-relay = callPackage ./test-local-relay.nix { }; + # test fails + #local-relay = callPackage ./test-local-relay.nix { }; }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix index 1cdb5677ee..66c912b47f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { Davix provides an API and a set of command line tools"; license = licenses.lgpl2Plus; - homepage = "http://dmc.web.cern.ch/projects/davix/home"; - changelog = "https://github.com/cern-fts/davix/blob/devel/RELEASE-NOTES.md"; + homepage = "https://github.com/cern-fts/davix"; + changelog = "https://github.com/cern-fts/davix/blob/R_${lib.replaceStrings ["."] ["_"] version}/RELEASE-NOTES.md"; maintainers = with maintainers; [ adev ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index d60c87e51f..1cd1918e3c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -34,12 +34,16 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] - ++ lib.optionals enablePrivSep [ - "--enable-privsep" - # dhcpcd disables privsep if it can't find the default user, - # so we explicitly specify a user. - "--privsepuser=dhcpcd" - ]; + ++ ( + if ! enablePrivSep + then [ "--disable-privsep" ] + else [ + "--enable-privsep" + # dhcpcd disables privsep if it can't find the default user, + # so we explicitly specify a user. + "--privsepuser=dhcpcd" + ] + ); makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -50,7 +54,10 @@ stdenv.mkDerivation rec { # Check that the udev plugin got built. postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; - passthru.tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; }; + passthru = { + inherit enablePrivSep; + tests = { inherit (nixosTests.networking.scripted) macvlan dhcpSimple dhcpOneIf; }; + }; meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dibbler/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dibbler/default.nix index 1633505763..4175de2e23 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dibbler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dibbler/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable DHCPv6 implementation"; - homepage = "http://www.klub.com.pl/dhcpv6/"; - license = licenses.gpl2; + homepage = "https://klub.com.pl/dhcpv6/"; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix index 1e1593c667..3fa6e352bc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20220120"; + version = "20220131"; src = fetchFromGitHub { owner = "elceef"; repo = pname; rev = version; - sha256 = "0vrrc0dzivq8sk7ns471r4ws3204d75riq0jzzrnxqvwz2k96wh8"; + sha256 = "sha256-2sRKRzYR6F2cvz9K7MBe2JIorJkPQ5M2/SRKXGTBVGk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix index c101615855..0adca07798 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dogdns/default.nix @@ -5,36 +5,45 @@ , stdenv , pkg-config , openssl +, just +, pandoc , Security }: rustPlatform.buildRustPackage rec { pname = "dogdns"; - version = "0.1.0"; + version = "unstable-2021-10-07"; src = fetchFromGitHub { owner = "ogham"; repo = "dog"; - rev = "v${version}"; - sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; + rev = "721440b12ef01a812abe5dc6ced69af6e221fad5"; + sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0="; }; - nativeBuildInputs = [ installShellFiles ] + nativeBuildInputs = [ installShellFiles just pandoc ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0zgzaq303zy8lymhldm6dpm5hwsxi2ph42zw5brvsdjmgm9ga0rb"; + outputs = [ "out" "man" ]; + + postBuild = '' + just man + ''; + + cargoSha256 = "sha256-agepQVJbqbjzFbEBKbM7BNxc8FlklOrCsTgCAOcuptc="; postInstall = '' installShellCompletion completions/dog.{bash,fish,zsh} + installManPage ./target/man/*.1 ''; meta = with lib; { description = "Command-line DNS client"; homepage = "https://dns.lookup.dog"; license = licenses.eupl12; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ bbigras ma27 ]; mainProgram = "dog"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix index beb931f8d1..fce409dc2d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "07zz0dj0wjwrc1rmayz7s8kpcv03i0ygl4vfwsam72qd4nf6v538"; + sha256 = "sha256-LqqtSmmXr48jB7HyWi954fDNKOynEpQupGYl7QbXUAI="; }; - cargoSha256 = "04gj9gaysjcm2d81ds2raak847hr8w84jgfdwqd51wi8xm32w5jf"; + cargoSha256 = "sha256-SUF/gDy9t2B5N234HZHxMl0Hc0GrVUBw3xeI43c++Nc="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix index 6e5fbdb13d..73e75627c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { Makes your machine appear to be anywhere on the internet to any host running a (UDP) unix traceroute ''; - homepage = "https://moxie.org/software/fakeroute/"; + homepage = "https://github.com/museoa/fakeroute"; # Formerly https://moxie.org/software/fakeroute/ license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix index 3bb1ab38e6..4b8add57b2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.15.1"; + version = "0.16.1"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "1p4rz4kdiif8i78zgxhw6dd0c1bq159f6l1idvig5apph7zi2bwm"; + sha256 = "sha256-5NrULpbf3PStzoywLyrfM5qup43idzeHCMRSuNLXR3g="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix index 8a5440f6b0..a20d63af23 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk="; }; - vendorSha256 = "sha256-8fluCDKrMNnIAlJFlDAisk/P+IYHBCdl7hkSbQtgy1A="; + vendorSha256 = "sha256-OyqkjA90zcfqRL6pfISR/6WXbv5LwVhKDECBtlqords="; # Some tests require internet access, broken in sandbox doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix b/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix index 011d09848d..44cac24592 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/godspeed/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI="; }; - vendorSha256 = "sha256-MCr1ShhkxM9CeSmqqtgAW0qv0QaIPRSOzASj8gt2ZAg="; + vendorSha256 = "sha256-DCDAuKvov4tkf77nJNo9mQU/bAeQasp4VBQRtLX+U6c="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix index 24dc47176e..4703aaf0e0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -2,31 +2,29 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , libiconv +, Security }: rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - sha256 = "sha256-Sxmwuf+iTBTlpfMFCEUp6JyEaoHgmLIKB/gws2KY/xc="; + sha256 = "sha256-7o7Tj0jWFIOLmpHXWT6zcyowm7vnqMDTf0S4zHkWQ2Q="; }; - cargoSha256 = "sha256-xEASs6r5zxYJXS+at6aX5n0whGp5qwuNwq6Jh0GM+/4="; + cargoSha256 = "sha256-t+68Rea74RE43TXTSyhZCLXCdBfh7K92Z/amO+wBUuI="; - patches = [ - (fetchpatch { - url = "https://github.com/orf/gping/commit/b843beb9617e4b7b98d4f6d3942067cad59c9d60.patch"; - sha256 = "sha256-9DIeeweCuGqymvUj4EBct82XVevkFSbHWaV76ExjGbs="; - }) - ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/gping --version | grep "${version}" + ''; meta = with lib; { description = "Ping, but with a graph"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 529339e346..87cb304ed5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.14"; + version = "2.5.1"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0ah6xsxlk1a7jsxdg0pbdhzhssz9ysrfxd3bs5hm1shql1jmqzh4"; + sha256 = "sha256-PpB5DfyDKvpspP30Uo3izi508+H3S+0NcK1UvVkg6VQ="; }; buildInputs = [ openssl zlib ] @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "USE_SYSTEMD=yes" "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ - "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o" + "USE_PROMEX=yes" ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/horst/default.nix b/third_party/nixpkgs/pkgs/tools/networking/horst/default.nix index 331738be53..5e4568914d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/horst/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/horst/default.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; - homepage = "http://br1.einfach.org/tech/horst/"; + homepage = "https://github.com/br101/horst"; maintainers = [ maintainers.fpletz ]; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix index 8e289b7bab..f3488ae402 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httpie/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.6.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "httpie"; repo = "httpie"; rev = version; - sha256 = "1y77dg27dn6bajwp3w6qvw1ls5wfhd1j1788l3fjhxg7j4qjki4g"; + sha256 = "sha256-s3IFzEUQmPBocgspVGx1nINkUamsi7tzwW37IqdBMxo="; }; nativeBuildInputs = [ @@ -24,6 +24,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ charset-normalizer defusedxml + multidict pygments requests requests-toolbelt diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix index fc1280be6c..de332843c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "i2p"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; - sha256 = "sha256-JuX02VsaB2aHD5ezDlfJqOmGkCecO/CRmOMO/6vsxFA="; + sha256 = "sha256-cZYGxMtRDeT+dPJLv6U5EacFMYIfwe55op49luqhZzM="; }; buildInputs = [ jdk ant gettext which ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 7c034a03e2..8bdd18c8ea 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub +, installShellFiles , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null , aesniSupport ? stdenv.hostPlatform.aesSupport @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { buildInputs = with lib; [ boost zlib openssl ] ++ optional upnpSupport miniupnpc; + nativeBuildInputs = [ + installShellFiles + ]; + makeFlags = let ynf = a: b: a + "=" + (if b then "yes" else "no"); in [ (ynf "USE_AESNI" aesniSupport) @@ -32,6 +37,8 @@ stdenv.mkDerivation rec { installPhase = '' install -D i2pd $out/bin/i2pd + install --mode=444 -D 'contrib/i2pd.service' "$out/etc/systemd/system/i2pd.service" + installManPage 'debian/i2pd.1' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix index 5baaf2e122..67f9a9d793 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "tonarino"; repo = "innernet"; rev = "v${version}"; - sha256 = "141zjfl125m5lrimam1dbpk40dqfq4vnaz42sbiq1v1avyg684fq"; + sha256 = "sha256-dpoSjGtjGJTF/sQ8vbeAUCjnkYqz4zGnfO8br8gJbsQ="; }; - cargoSha256 = "0559d0ayysvqs4k46fhgd4r8wa89abgx6rvhlh0gnlnga8vacpw5"; + cargoSha256 = "sha256-EmAlm3W9r6pP1VIxeM2UP1ZG9TjopTarckMfLDonr1k="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix index f51c6f034d..88ee2d44cb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix @@ -6,9 +6,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "https://lftp.tech/ftp/${pname}-${version}.tar.xz" - "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz" "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz" + "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz" ]; sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"; }; @@ -31,8 +30,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A file transfer program supporting a number of network protocols"; - homepage = "https://lftp.tech/"; - license = licenses.gpl3; + homepage = "https://lftp.yar.ru/"; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 28868e8537..532c8c14ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -1,14 +1,36 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkg-config -, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python3, gss, libmysqlclient, system-sendmail }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, dejagnu +, gettext +, gnum4 +, pkg-config +, texinfo +, fribidi +, gdbm +, gnutls +, gss +, guile +, libmysqlclient +, mailcap +, nettools +, pam +, readline +, ncurses +, python3 +, sasl +, system-sendmail +}: stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.12"; + version = "3.14"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0n51ng1f8yf5zfsnh8s0pj9bnw6icb2r0y78gl2kzijaghhzlhvd"; + hash = "sha256-wMWzj+qLRaSvzUNkh/Knb9VSUJLQN4gTputVQsIScTk="; }; postPatch = '' @@ -16,16 +38,29 @@ stdenv.mkDerivation rec { -e 's/chmod [24]755/chmod 0755/' \ */Makefile{.in,.am} sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac - sed -i 's/0\.18/0.19/' configure.ac ''; nativeBuildInputs = [ - autoreconfHook gettext pkg-config + autoreconfHook + gettext + gnum4 + pkg-config + texinfo ]; buildInputs = [ - gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi - gss libmysqlclient python3 + fribidi + gdbm + gnutls + gss + guile + libmysqlclient + mailcap + ncurses + pam + python3 + readline + sasl ] ++ lib.optionals stdenv.isLinux [ nettools ]; patches = [ @@ -48,6 +83,7 @@ stdenv.mkDerivation rec { "--with-mysql" "--with-path-sendmail=${system-sendmail}/bin/sendmail" "--with-mail-rc=/etc/mail.rc" + "DEFAULT_CUPS_CONFDIR=${mailcap}/etc" # provides mime.types to mimeview ]; readmsg-tests = let diff --git a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix index 2993421978..126b3b513a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o="; + sha256 = "sha256-EfuXD2Pi2ojfS22HWeTuZJlExRUkS5eb9Qp6bfHX8Zk="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mqttui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mqttui/default.nix index 7945cd168d..52c481e3c7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mqttui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-taGpVLO9K5VmthWadstQcujcLHTb3fhEWDxKGd3Pj+E="; + sha256 = "sha256-ScB0zJXyk8bPEDCxdymMqNmlhe/skNHr6IRmJpme+qQ="; }; - cargoSha256 = "sha256-aAMDl8GZ+XqA4uBiDm2eHQsNFiqCrMBO66X0ruEjpJg="; + cargoSha256 = "sha256-736UYTCs4d1DcpHWl5AejEaW+SYzlgElozC3t/RU41g="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix b/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix index aec4a1c5f5..77c7d4161d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/n2n/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "n2n"; - version = "2.8"; + version = "3.0"; src = fetchFromGitHub { owner = "ntop"; repo = "n2n"; rev = version; - hash = "sha256-2xJ8gYVZJZoKs6PZ/9GacgxQ+/3tmnRntT1AbPe1At4="; + hash = "sha256-OXmcc6r+fTHs/tDNF3akSsynB/bVRKB6Fl5oYxmu+E0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix index a30c9f3bbd..494fb946ea 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "nebula"; version = "1.5.2"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix index cfd768e40a..995c7ff726 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Disable parallel build, errors: + # link: `parseopt.lo' is not a valid libtool object + enableParallelBuilding = false; + meta = with lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index ac261f83d5..67cd874d6f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.12"; + version = "1.34.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-qKs2oKUC/nPNjjustlhfl/u5Tr73nids268Rwz/49Us="; + sha256 = "sha256-gZeV0ImQdiBPVnJCGljxsdnjk1Nu6Hu4RLkR5iQ78L0="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix index bfcc2d8ae8..5f00c1fa9d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, libnma }: +, withGnome ? true, libnma, glib }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ networkmanager ppp ] + buildInputs = [ networkmanager ppp glib ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix index ca5ec7abff..20a90fffed 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome, kmod, libnma }: +, glib, gtk3, withGnome ? true, gnome, kmod, libnma }: let pname = "NetworkManager-openvpn"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ openvpn networkmanager ] + buildInputs = [ openvpn networkmanager glib ] ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkg-config file libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix index 27d3a6ce51..e636950cd9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix @@ -10,17 +10,18 @@ , coreutils , iptables , makeWrapper +, protoc-gen-go-grpc }: buildGoModule rec { pname = "opensnitch"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - sha256 = "1c2v2x8hfqk524sa42vry74lda4lg6ii40ljk2qx9j2f69446sva"; + sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I="; }; patches = [ @@ -31,17 +32,15 @@ buildGoModule rec { url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch"; sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg="; }) - # Upstream has inconsistent vendoring - ./go-mod.patch ]; modRoot = "daemon"; buildInputs = [ libnetfilter_queue libnfnetlink ]; - nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper ]; + nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper protoc-gen-go-grpc ]; - vendorSha256 = "sha256-sTfRfsvyiFk1bcga009W6jD6RllrySRAU6B/8mF6+ow="; + vendorSha256 = "sha256-81BKMLuEXA/NeIjO7icBm48ROq6KxAxHtvP0nV5yM5A="; preBuild = '' make -C ../proto ../daemon/ui/protocol/ui.pb.go diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/go-mod.patch b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/go-mod.patch deleted file mode 100644 index 290e92ca75..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/go-mod.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/daemon/go.mod b/daemon/go.mod -index ec21c04..a859bfb 100644 ---- a/daemon/go.mod -+++ b/daemon/go.mod -@@ -5,17 +5,12 @@ go 1.14 - require ( - github.com/evilsocket/ftrace v1.2.0 - github.com/fsnotify/fsnotify v1.4.7 -- github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect -- github.com/golang/protobuf v1.5.0 - github.com/google/gopacket v1.1.14 - github.com/google/nftables v0.0.0-20210514154851-a285acebcad3 - github.com/iovisor/gobpf v0.2.0 - github.com/vishvananda/netlink v1.1.0 -- github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect -- golang.org/x/net v0.0.0-20190311183353-d8887717615a -- golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect -- golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 // indirect -- golang.org/x/text v0.3.0 // indirect -+ golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 -+ golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c - google.golang.org/grpc v1.27.0 - google.golang.org/protobuf v1.26.0 - ) diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix index d211a10d2c..8c0b7686d8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "opensnitch-ui"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - sha256 = "sha256-amtDSDJOyNSxmJICEqN5lKhGyfF5C6I0EWViB1EXW7A="; + sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I="; }; nativeBuildInputs = [ @@ -26,6 +26,8 @@ python3Packages.buildPythonApplication rec { unidecode unicode-slugify pyinotify + notify2 + # pyasn # dpendency missing but not mandatory ]; preBuild = '' @@ -48,6 +50,9 @@ python3Packages.buildPythonApplication rec { dontWrapQtApps = true; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + # All tests are sandbox-incompatible and disabled for now + doCheck = false; + meta = with lib; { description = "An application firewall"; homepage = "https://github.com/evilsocket/opensnitch/wiki"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index a75936a152..4b270998a6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; + vendorSha256 = "17m0ssfw9n3g2lkv63qajz3adrk5yp0c9hx66x7dl79snwqd49yg"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index b6d91da334..c917b6d27d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.12.5"; + version = "1.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "sha256-whPaFb+4mYOWmtFc/a+NkH9avCfOnGnAvqz3UFTt+RY="; + sha256 = "sha256-owEUj79IcZAxK0JLoyQI/DDCaaNSYHyD695Xk7hvJxE="; }; - cargoSha256 = "sha256-w7AqNsa9lolPEiHEv7E4XGaFV/UbCeYvmWekr9YzO6Q="; + cargoSha256 = "sha256-Akxe8w+w3JSO6yeCW/C/+/Wjl7Jl0GXYucjLis27V9Q="; RUSTC_BOOTSTRAP = 1; diff --git a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 7960324cbd..d38200a53d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4="; }; - vendorSha256 = "sha256-jIU5UZdmBUqyjva+g7zoijPqHF2p3vzImEFQCP/CFwE="; + vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0="; modRoot = "./v2"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index 6e2fb35fd4..f2bb523187 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.3.4"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "sha256-7gZTEIBsIuL9NvAU4euzMbmKfsTblY6Rw9nL2gZA2Sw="; + sha256 = "sha256-o7ElwDGb0JbWj4IcSggFGy09kni6xv4Yz+PJIBcDpWc="; }; buildInputs = [ libpcap ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 7b61dcf746..06a36473ec 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "sha256-cGG357Z0OI+aXGHWJaOPkkKUm1KcsYBvhHxNlIYlL+0="; + sha256 = "sha256-OM0kMQYYHjk17x4VmrIXyTq/DxXnTrt6oRHEdV+1+Ns="; }; # The Helm chart is go:embed'ed as a tarball in the binary. @@ -21,7 +21,7 @@ buildGoModule rec { go run ./build-aux/package_embedded_chart/main.go ${src.rev} ''; - vendorSha256 = "sha256-DzAxqSiWag9mOgPznjhMCQJhtJZo7hsezhwJBidsvJQ="; + vendorSha256 = "sha256-J7Qj0g479K6k0pXmZzQ3T4VG4Vdj7Sc9Xhuy4Ke/xkU="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 12eb1a7f0a..17e8d9b9fb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fSDmwZNKAHXcMtNZlqJmUFkuFdZLkDbnn+ZrNtnszgU="; + sha256 = "sha256-eEvSELCzpAm9Me46U54MQEQiAPCFlBa5iG2AZMn5BbE="; }; - vendorSha256 = "sha256-DktuZ0NUyg8LbYklxde2ZZJ8/WOyBq50E9yEHtS+Hqw="; + vendorSha256 = "sha256-aYY3rGm2Wvd5v1QrfhN0jWzAO9JYu4j5ZHk9UyEPjH8="; subPackages = [ "cmd/tendermint" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix b/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix index c941aad258..eeb96936ae 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; }; - makeFlags = [ "prefix=$(out)" "LDFLAGS=-lm" ]; + makeFlags = [ "prefix=$(out)" "LDFLAGS=-lm" "env=yes" ]; preConfigure = '' sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules diff --git a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix new file mode 100644 index 0000000000..1392934564 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, wireguard-go, Security }: + +rustPlatform.buildRustPackage rec { + pname = "wg-netmanager"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "gin66"; + repo = "wg_netmanager"; + rev = "wg_netmanager-v${version}"; + sha256 = "AAtSSBz2zGLIEpcEMbe1mfYZikiaYEI+6KeSL5n54PE="; + }; + + cargoSha256 = "17k83QkQDq5uRCRADRLD2Q7pv7yES20lpms/N/UK+BM="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + # Test 01 tries to create a wireguard interface, which requires sudo. + doCheck = true; + checkFlags = "--skip device"; + + meta = with lib; { + description = "Wireguard network manager"; + longDescription = "Wireguard network manager, written in rust, simplifies the setup of wireguard nodes, identifies short connections between nodes residing in the same subnet, identifies unreachable aka dead nodes and maintains the routes between all nodes automatically. To achieve this, wireguard network manager needs to be running on each node."; + homepage = "https://github.com/gin66/wg_netmanager"; + license = with licenses; [ mit asl20 bsd3 mpl20 ]; + maintainers = with maintainers; [ gin66 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 4069e378a2..98ca976fd3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -3,29 +3,24 @@ , hcxdumptool, which, bully, pixiewps }: python3.pkgs.buildPythonApplication rec { - version = "2.5.7"; + version = "2.6.0"; pname = "wifite2"; src = fetchFromGitHub { owner = "kimocoder"; repo = "wifite2"; rev = version; - sha256 = "sha256-dJ+UOSIR48m8nGoci/6iblLsX296ZGL1hZ74RUsa9lw="; + sha256 = "sha256-q8aECegyIoAtYFsm8QEr8OnX+GTqjEeWfYQyESk27SA="; }; patches = [ - # Fix issue when missing optional pyrit dependency: https://github.com/kimocoder/wifite2/pull/76 (fetchpatch { - url = "https://github.com/kimocoder/wifite2/commit/2e5d76c794f2e5493cf5048384d6564727ae2c19.patch"; - sha256 = "0lawk8s1md98g061xg6ma37wqyqc4j2ag0gmf7insf4kvlgg3l9z"; + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/2.5.8-2/debian/patches/Disable-aircrack-failing-test.patch"; + sha256 = "1kj2m973l067fdg9dj61vbjf4ym9x1m9kn0q8ci9r6bb30yg6sv2"; }) (fetchpatch { - url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-aircrack-failing-test.patch"; - sha256 = "04qql8w27c1lqk59ghkr1n6r08jwdrb1dcam5k88szkk2bxv8yx1"; - }) - (fetchpatch { - url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-two-failing-tests.patch"; - sha256 = "1sixcqz1kbkhxf38yq55pwycm54adjx22bq46dfnl44mg69nx356"; + url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/2.5.8-2/debian/patches/Disable-two-failing-tests.patch"; + sha256 = "15vas7zvpdk2lr1pzv8hli6jhdib0dibp7cmikiai53idjxay56z"; }) (fetchpatch { url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/2.5.8-2/debian/patches/fix-for-new-which.patch"; @@ -47,17 +42,11 @@ python3.pkgs.buildPythonApplication rec { pixiewps ]; - postFixup = let - sitePackagesDir = "$out/lib/python3.${lib.versions.minor python3.version}/site-packages"; - in '' - mv ${sitePackagesDir}/wifite/__main__.py ${sitePackagesDir}/wifite/wifite.py - ''; - checkInputs = propagatedBuildInputs; checkPhase = "python -m unittest discover tests -v"; meta = with lib; { - homepage = "https://github.com/derv82/wifite2"; + homepage = "https://github.com/kimocoder/wifite2"; description = "Rewrite of the popular wireless network auditor, wifite"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix index ad6d02399e..2a5708c8d0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-zq1jpkMcq7WHc6weht2iEFMlxIJSoDreWqJCi8F+Lxs="; + sha256 = "sha256-+GiVehgU0g/rHeikSyACbTdCdpjHd8WxjkP+uxCylnY="; }; - cargoSha256 = "sha256-NcznWWMcgK4RixqvumPEQUlvIFRyYkbeTTGvjQ91ggE="; + cargoSha256 = "sha256-G3jaM6U7O+GLAiAbaWMIyh6Ksu4ypTK50s/RNe2wT3c="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xxh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xxh/default.nix new file mode 100644 index 0000000000..c03708f08a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/xxh/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh, nixosTests }: + +buildPythonApplication rec{ + pname = "xxh"; + version = "0.8.8"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + hash = "sha256-TzC8GTDmnYN56Rp5DyZxh+yGrkgWr6Xt86a/jyB3j5k="; + }; + + propagatedBuildInputs = [ pexpect pyyaml openssh ]; + + passthru.tests = { + inherit (nixosTests) xxh; + }; + + meta = with lib; { + description = "Bring your favorite shell wherever you go through ssh"; + homepage = "https://github.com/xxh/xxh"; + license = licenses.bsd2; + maintainers = [ maintainers.pasqui23 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index 0284e5117d..5f30c4d7f8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-5bx9KGZD7m+FX9hWU1pu8uJ2FU+P/TetRS3kJL5jhhI="; + sha256 = "sha256-dI+KJblSvsBC3CrUzjaDsIZ6N2QEXRTXRbEXolBK5ko="; }; - vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; + vendorSha256 = "sha256-yhPArisADhP5Uop4zZVbqED76uWeBZJlV6IkKbL4EFI="; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to diff --git a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix new file mode 100644 index 0000000000..c24de3947f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "alejandra"; + version = "unstable-2022-01-30"; + + src = fetchFromGitHub { + owner = "kamadorueda"; + repo = "alejandra"; + rev = "b72274b052ae06cbe60a97d623829b1458369cc2"; + sha256 = "sha256-snq9C/a/53VivFcLNvdeKwVmPBXbcVzbbjTB+iULFUc="; + }; + + cargoSha256 = "sha256-/JzATzRhNexmyjtgjHVkw8LVyr4PdIdPJfUGXz4pZbQ="; + + meta = with lib; { + description = "The uncompromising Nix formatter"; + homepage = "https://github.com/kamadorueda/alejandra"; + license = licenses.unlicense; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix index fd219935ae..3d9d34aa7c 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "statix"; # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix # the version can be found in flake.nix of the source code - version = "0.4.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "nerdypepper"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4hVEwm2xuuHFy38/EJLKjGuxTYCAcKRHHfFKLvqp+M0="; + sha256 = "sha256-ibz5b+amOTlLxDlCPrC7A6rSFac3JXwiq3HMyIJwdUw="; }; - cargoSha256 = "sha256-15C/ye8nYLtriBlqbf1ul41IFtShGY2LTX10z1/08Po="; + cargoSha256 = "sha256-MKInDGBZcOp+90cus6X2GAgjZx6M1TbSJgpUQWx60sQ="; buildFeatures = lib.optional withJson "json"; 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 d87eb6f0c5..511643e38a 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.3.14"; + version = "2.3.15"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-uQo87RUuzTiaVdoRFeBFZb/L9fWKgIzbcfa1LU0vC98="; + hash = "sha256-JWIAfREJk91+eobdgeplDmEhAXm1nqxytu3/Y2TAu6Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 392a7f2e9b..8ef9fea016 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xwziGGdFBmPpLRlBBficioULISt8WjGBocbrQUXa8CY="; }; - vendorSha256 = "sha256-RaAb8QDFp/7TolsNZqcXurozr3vvK0SRyyy2h8MPhnk="; + vendorSha256 = "sha256-5gH19R+SZpGWXntQ/Te96t1YGIIIQuy2ZRQSiczvM3Y="; doCheck = false; 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 ba95e0ddbf..842ef5de32 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix @@ -9,6 +9,7 @@ assert (sha256 == null) -> (src != null); let atLeast24 = lib.versionAtLeast version "2.4pre"; atLeast25 = lib.versionAtLeast version "2.5pre"; + atLeast27 = lib.versionAtLeast version "2.7pre"; in { stdenv , autoconf-archive @@ -44,7 +45,7 @@ in , util-linuxMinimal , xz -, enableDocumentation ? atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform +, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform , enableStatic ? stdenv.hostPlatform.isStatic , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp @@ -100,6 +101,8 @@ stdenv.mkDerivation { lowdown ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ libcpuid + ] ++ lib.optional (atLeast27) [ + nlohmann_json ] ++ lib.optionals withLibseccomp [ libseccomp ] ++ lib.optionals withAWS [ @@ -165,7 +168,8 @@ stdenv.mkDerivation { makeFlags = [ "profiledir=$(out)/etc/profile.d" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0" + ++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1"; installFlags = [ "sysconfdir=$(out)/etc" ]; 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 490ddcc53b..ffbe598b92 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -34,7 +34,7 @@ let boehmgc = boehmgc-nix; aws-sdk-cpp = aws-sdk-cpp-nix; }; -in rec { +in lib.makeExtensible (self: { nix_2_3 = (common rec { version = "2.3.16"; src = fetchurl { @@ -62,17 +62,16 @@ in rec { sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; }; - # FIXME: nix_2_6 is broken on aarch64-darwin for now. - stable = nix_2_5; + stable = self.nix_2_6; unstable = lib.lowPrio (common rec { version = "2.7"; - suffix = "pre20220124_${lib.substring 0 7 src.rev}"; + suffix = "pre20220127_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "0a70b37b5694c769fb855c1afe7642407d1db64f"; - sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg="; + rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c"; + sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4="; }; }); -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix index b62597e7e5..25ad5be89e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix @@ -1,60 +1,95 @@ -{ stdenv, fetchFromGitHub, lib -, intltool, glib, pkg-config, polkit, python3, sqlite -, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive -, nix, enableNixBackend ? false, boost +{ stdenv +, fetchFromGitHub +, lib +, gettext +, glib +, pkg-config +, polkit +, python3 +, sqlite +, gobject-introspection +, vala +, gtk-doc +, nix +, boost +, meson +, ninja +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, libxml2 +, gst_all_1 +, gtk3 , enableCommandNotFound ? false -, enableBashCompletion ? false, bash-completion ? null -, enableSystemd ? stdenv.isLinux, systemd }: +, enableBashCompletion ? false +, bash-completion ? null +, enableSystemd ? stdenv.isLinux +, systemd +}: stdenv.mkDerivation rec { pname = "packagekit"; - version = "1.1.13"; + version = "1.2.5pre"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { - owner = "hughsie"; + owner = "PackageKit"; repo = "PackageKit"; - rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0xmgac27p5z8wr56yw3cqhywnlvaf8kvyv1g0nzxnq167xj5vxam"; + rev = "9c2ef9cddf39ebde587907561f8e7ac99ed6be1a"; + sha256 = "05z1ds240kcmigygkbgjasr4spn7vd7cbpsbfrghhgnmszx9bjgl"; }; - buildInputs = [ glib polkit python3 gobject-introspection ] - ++ lib.optional enableSystemd systemd - ++ lib.optional enableBashCompletion bash-completion; - propagatedBuildInputs = - [ sqlite boost ] - ++ lib.optional enableNixBackend nix; - nativeBuildInputs = [ vala intltool pkg-config autoreconfHook autoconf-archive gtk-doc ]; - - preAutoreconf = '' - gtkdocize - intltoolize - ''; - - configureFlags = [ - (if enableSystemd then "--enable-systemd" else "--disable-systemd") - "--disable-dummy" - "--disable-cron" - "--enable-introspection" - "--disable-offline-update" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" - ] - ++ lib.optional enableNixBackend "--enable-nix" - ++ lib.optional (!enableBashCompletion) "--disable-bash-completion" - ++ lib.optional (!enableCommandNotFound) "--disable-command-not-found"; - - enableParallelBuilding = true; - - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - "localstatedir=\${TMPDIR}" + buildInputs = [ + glib + polkit + python3 + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gtk3 + sqlite + nix + boost + ] ++ lib.optional enableSystemd systemd + ++ lib.optional enableBashCompletion bash-completion; + nativeBuildInputs = [ + vala + gettext + pkg-config + gtk-doc + meson + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + libxml2 + ninja ]; + mesonFlags = [ + (if enableSystemd then "-Dsystemd=true" else "-Dsystem=false") + "-Dpackaging_backend=nix" + "-Ddbus_sys=${placeholder "out"}/share/dbus-1/system.d" + "-Ddbus_services=${placeholder "out"}/share/dbus-1/system-services" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dcron=false" + "-Dgtk_doc=true" + "--sysconfdir=/etc" + "--localstatedir=/var" + ] + ++ lib.optional (!enableBashCompletion) "-Dbash_completion=false" + ++ lib.optional (!enableCommandNotFound) "-Dbash_command_not_found=false"; + + postPatch = '' + # HACK: we want packagekit to look in /etc for configs but install + # those files in $out/etc ; we just override the runtime paths here + # same for /var & $out/var + substituteInPlace etc/meson.build \ + --replace "install_dir: join_paths(get_option('sysconfdir'), 'PackageKit')" "install_dir: join_paths('$out', 'etc', 'PackageKit')" + substituteInPlace data/meson.build \ + --replace "install_dir: join_paths(get_option('localstatedir'), 'lib', 'PackageKit')," "install_dir: join_paths('$out', 'var', 'lib', 'PackageKit')," + ''; + meta = with lib; { description = "System to facilitate installing and updating packages"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pdm/check-update.patch b/third_party/nixpkgs/pkgs/tools/package-management/pdm/check-update.patch new file mode 100644 index 0000000000..9bc216177e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/pdm/check-update.patch @@ -0,0 +1,12 @@ +diff --git a/tests/conftest.py b/tests/conftest.py +index d310d36..e15d398 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -252,6 +252,7 @@ def project_no_init(tmp_path, mocker): + old_config_map = Config._config_map.copy() + tmp_path.joinpath("caches").mkdir(parents=True) + p.global_config["cache_dir"] = tmp_path.joinpath("caches").as_posix() ++ p.global_config["check_update"] = False + do_use(p, getattr(sys, "_base_executable", sys.executable)) + with temp_environ(): + os.environ.pop("VIRTUAL_ENV", None) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix new file mode 100644 index 0000000000..e9db7f63fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix @@ -0,0 +1,106 @@ +{ lib, python3, fetchFromGitHub, fetchurl }: +let + python = python3.override { + # override resolvelib due to + # 1. pdm requiring a later version of resolvelib + # 2. Ansible being packaged as a library + # 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 { + version = "0.8.1"; + src = fetchFromGitHub { + owner = "sarugaku"; + repo = "resolvelib"; + rev = version; + sha256 = "sha256-QDHEdVET7HN2ZCKxNUMofabR+rxJy0erWhNQn94D7eI="; + }; + }); + }; + self = python; + }; +in + +with python.pkgs; +buildPythonApplication rec { + pname = "pdm"; + version = "1.12.6"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MXKER2ijU+2yPnsBFH0cu/hjHI4uNt++AqggH5rhnaU="; + }; + + # this patch allows us to run additional tests that invoke pdm, which checks + # itself for an update on every invocation by default, drammatically slowing + # down test runs inside the sandbox + # + # the patch is necessary because the fixture is creating a project and + # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream + patches = [ + ./check-update.patch + (fetchurl { + # Mark test that require network access + url = "https://github.com/pdm-project/pdm/files/7911962/mark-network-tests.patch.txt"; + hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd"; + }) + ]; + + propagatedBuildInputs = [ + blinker + click + installer + packaging + pdm-pep517 + pep517 + pip + platformdirs + python-dotenv + pythonfinder + resolvelib + shellingham + tomli + tomlkit + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + pytest-xdist + ]; + + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + "-m 'not network'" + ]; + + preCheck = "HOME=$TMPDIR"; + + disabledTests = [ + # sys.executable and expected executable are different + "test_set_non_exist_python_path" + # pythonfinder isn't aware of nix's python infrastructure + "test_auto_isolate_site_packages" + "test_use_invalid_wrapper_python" + "test_use_wrapper_python" + # tries to read/write files without proper permissions + "test_completion_command" + "test_plugin_add" + "test_plugin_list" + "test_plugin_remove" + # tries to treat a gzip file as a zipfile and fails + "test_resolve_local_artifacts" + ]; + + meta = with lib; { + homepage = "https://pdm.fming.dev"; + description = "A modern Python package manager with PEP 582 support"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} 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 9c0da87a90..3deda8d7c5 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite, zstd +, sqlite, zstd, fetchpatch }: stdenv.mkDerivation rec { @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fix build for macOS aarch64 + (fetchpatch { + url = "https://github.com/rpm-software-management/rpm/commit/ad87ced3990c7e14b6b593fa411505e99412e248.patch"; + hash = "sha256-WYlxPGcPB5lGQmkyJ/IpGoqVfAKtMxKzlr5flTqn638="; + }) + ]; + postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/aide/default.nix b/third_party/nixpkgs/pkgs/tools/security/aide/default.nix index 40f43c7b05..0724a756b9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ousYg8r6rQVvvkPuHorgn9NsqjCgvI7f6l1HvWfEZPg="; + sha256 = "sha256-yBUFJG8//C52A21Dp3ISroKJW1iB2bniXBNhsam3qEY="; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/cariddi/default.nix b/third_party/nixpkgs/pkgs/tools/security/cariddi/default.nix index 670a03c888..9f29826808 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cariddi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cariddi/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-PXQljC9rwlxXQ96fII3EjD4NXu61EMkYvMWqkcJZ4vU="; }; - vendorSha256 = "sha256-yVfRjUlw90oUsbF2P6pW6FhMXok9ZwcKmAWyTFLI/cY="; + vendorSha256 = "sha256-zNUdglsfy6lEV54afCAoigxa3rR0qf/e3+B4PvVRIa4="; meta = with lib; { description = "Crawler for URLs and endpoints"; diff --git a/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix b/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix new file mode 100644 index 0000000000..1544194983 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cfripper"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = pname; + rev = version; + hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + boto3 + cfn-flip + click + pluggy + pycfmodel + pydash + pyyaml + setuptools + ]; + + checkInputs = with python3.pkgs; [ + moto + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "click~=7.1.1" "click" \ + --replace "pluggy~=0.13.1" "pluggy" \ + --replace "pydash~=4.7.6" "pydash" + ''; + + disabledTestPaths = [ + # Tests are failing + "tests/test_boto3_client.py" + "tests/config/test_pluggy.py" + ]; + + pythonImportsCheck = [ + "cfripper" + ]; + + meta = with lib; { + description = "Tool for analysing CloudFormation templates"; + homepage = "https://github.com/Skyscanner/cfripper"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix index fbb9c421e3..64d8885eed 100644 --- a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix @@ -10,14 +10,15 @@ python3.pkgs.buildPythonApplication rec { pname = "chipsec"; - version = "1.6.1"; + version = "1.8.1"; + disabled = !stdenv.isLinux; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "01sp24z63r3nqxx57zc4873b8i5dqipy7yrxzrwjns531vznhiy2"; + hash = "sha256-bK8wlwhP0pi8rOs8ysbSZ+0aZOaX4mckfH/p4OLGnes="; }; patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ]; @@ -29,9 +30,9 @@ python3.pkgs.buildPythonApplication rec { nasm ]; - checkInputs = [ - python3.pkgs.distro - python3.pkgs.pytestCheckHook + checkInputs = with python3.pkgs; [ + distro + pytestCheckHook ]; preBuild = lib.optionalString withDriver '' @@ -45,10 +46,15 @@ python3.pkgs.buildPythonApplication rec { $out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko ''; - setupPyBuildFlags = [ "--build-lib=$CHIPSEC_BUILD_LIB" ] - ++ lib.optional (!withDriver) "--skip-driver"; + setupPyBuildFlags = [ + "--build-lib=$CHIPSEC_BUILD_LIB" + ] ++ lib.optional (!withDriver) [ + "--skip-driver" + ]; - pythonImportsCheck = [ "chipsec" ]; + pythonImportsCheck = [ + "chipsec" + ]; meta = with lib; { description = "Platform Security Assessment Framework"; diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix index fbbd26dea6..54beab643a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mxDLF9DQKySDR1c7jD/D0/xI+/R8a/ZlukliT/R4wCg="; + sha256 = "sha256-hQFkbHOmtk0SqFSPw1+5nCvjq9cKsGzFPtK4jXDrubQ="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-xqwwvVGXWFFKKBtH4a/+akFSlZ2hCOC1v1sO0d2p9fs="; + vendorSha256 = "sha256-d3aOX4iMlhlxgYbqCHCIFKXunVha0Fw4ZBmy4OA6EhI="; excludedPackages = "\\(sample\\|webhook\\|help\\)"; @@ -26,6 +26,9 @@ buildGoModule rec { postPatch = '' rm pkg/cosign/tuf/client_test.go # Require network access + rm internal/pkg/cosign/fulcio/signer_test.go # Require network access + rm internal/pkg/cosign/rekor/signer_test.go # Require network access + rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix b/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix index 2919354db4..ebbdd9882b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-QSIaqHUNsVpb1qbQLIxxjoDH1DMM1XpXxWZtImMV1yM="; }; - vendorSha256 = "sha256-QtSWlGsbCxLpb4+TZgV0/wfSb5flGG3qHquO2maIOKU="; + vendorSha256 = "sha256-F0uIV4T/dCqPY/gsSOrzJTxFGlDh9NfxKhJxrftj0Lo="; meta = with lib; { description = "Tool for analysing parameter and XSS scanning"; diff --git a/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix b/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix new file mode 100644 index 0000000000..d1595d9de2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dontgo403"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "devploit"; + repo = pname; + rev = version; + hash = "sha256-QHkmnhOLdyci3PAhf/JIiYlCta8DJ3cZb1S6Sim0qGQ="; + }; + + vendorSha256 = "sha256-jF+CSmLHMdlFpttYf3pK84wdfFAHSVPAK8S5zunUzB0="; + + meta = with lib; { + description = "Tool to bypass 40X response codes"; + homepage = "https://github.com/devploit/dontgo403"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix index 2b37336096..925931e6a3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Belgian electronic identity card (eID) middleware"; - homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; + homepage = "https://eid.belgium.be/en"; license = licenses.lgpl3Only; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. diff --git a/third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix b/third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix deleted file mode 100644 index 92d783dd5f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype -, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes -, libXrender, libXcomposite , alsa-lib, libXdamage, libXtst, libXrandr -, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify -}: - -let - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd" - else if stdenv.hostPlatform.system == "i686-linux" then "i386" - else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!"; - - sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2" - else if stdenv.hostPlatform.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm" - else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!"; - -in stdenv.mkDerivation rec { - pname = "encryptr"; - version = "2.0.0"; - - src = fetchurl { - url = "https://spideroak.com/dist/encryptr/signed/linux/targz/encryptr-${version}_${arch}.tar.gz"; - inherit sha256; - }; - - dontBuild = true; - - rpath = lib.makeLibraryPath [ - glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi - libXcursor libXext libXfixes libXrender libXcomposite alsa-lib - libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf - libnotify stdenv.cc.cc - ]; - - installPhase = '' - mkdir -pv $out/bin $out/lib - cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin - mv -v $out/bin/encryptr{-bin,} - cp -v lib* $out/lib - ln -sv ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath $out/lib:${rpath} \ - $out/bin/encryptr - ''; - - # If stripping, node-webkit does not find - # its application and shows a generic page - dontStrip = true; - - meta = with lib; { - homepage = "https://spideroak.com/solutions/encryptr"; - description = "Free, private and secure password management tool and e-wallet"; - license = licenses.unfree; - maintainers = with maintainers; [ guillaumekoenig ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index a59fc1dc90..35ccbec9ea 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-01-26"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-5WdAh4YFNLOF8h8f0pN6GHdoyASf/3fN345Mp9b1Cfg="; + sha256 = "sha256-+E8MmkXnynCudGfKnCa6usmyPVM+y6kRB8eAm4F9glY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/extrude/default.nix b/third_party/nixpkgs/pkgs/tools/security/extrude/default.nix new file mode 100644 index 0000000000..e8d2b07841 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/extrude/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "extrude"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "liamg"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU="; + }; + + vendorSha256 = "sha256-8qjIYPkWtYTvl7wAnefpZAjbNSQLQFqRnGGccYZ8ZmU="; + + meta = with lib; { + description = "Tool to analyse binaries for missing security features"; + homepage = "https://github.com/liamg/extrude"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix index 92848def1d..6c3fb07270 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: - +{ lib, stdenv, fetchFromGitHub +, python3 +, fetchpatch +}: python3.pkgs.buildPythonApplication rec { pname = "fail2ban"; @@ -17,7 +19,21 @@ python3.pkgs.buildPythonApplication rec { systemd ]; + patches = [ + # remove references to use_2to3, for setuptools>=58 + # has been merged into master, remove next release + (fetchpatch { + url = "https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497.patch"; + sha256 = "sha256-aozQJHwPcJTe/D/PLQzBk1YH3OAP6Qm7wO7cai5CVYI="; + }) + ]; + preConfigure = '' + # workaround for setuptools 58+ + # https://github.com/fail2ban/fail2ban/issues/3098 + patchShebangs fail2ban-2to3 + ./fail2ban-2to3 + for i in config/action.d/sendmail*.conf; do substituteInPlace $i \ --replace /usr/sbin/sendmail sendmail \ diff --git a/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix index c220fe4ded..2762527775 100644 --- a/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix @@ -7,35 +7,36 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; version = "2.0.2"; - disabled = python3.pythonOlder "3.7"; - src = fetchFromGitHub { owner = "infobyte"; repo = pname; rev = "v${version}"; - sha256 = "1jq8sim0b6k830lv1qzbrd1mx0nc2x1jq24fbama76gzqlb2axi7"; + hash = "sha256-J3YlFsX/maOqWo4ILEMXzIJeQ8vr47ApGGiaBWrUCMs="; }; propagatedBuildInputs = with python3.pkgs; [ + arrow click + cmd2 colorama faraday-plugins jsonschema + log-symbols + packaging pyyaml simple-rest-client - tabulate - validators spinners + tabulate termcolor - cmd2 - log-symbols - arrow + validators ]; # Tests requires credentials doCheck = false; - pythonImportsCheck = [ "faraday_cli" ]; + pythonImportsCheck = [ + "faraday_cli" + ]; meta = with lib; { description = "Command Line Interface for Faraday"; diff --git a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix index d744b8b5da..59dc202e69 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ="; }; - vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA="; + vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; meta = with lib; { description = "Tool to fetch known URLs"; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix index 2e5311696d..831ec3b613 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix @@ -19,13 +19,13 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.1.1"; + version = "10.1.2"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - sha256 = "sha256-0hj9IVvTxgStCbfnTzqeKD+Q5GnGowDsIkMvk2GqJqY="; + sha256 = "sha256-gnSIXje0hUpAculNXAyiS7Twc5XWitMgYp7svyZQxzE="; }; desktopItem = makeDesktopItem { @@ -101,7 +101,7 @@ HERE ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-Yxf6g908+fRRUh40PrwNUCTvxzlvSmwzE8R+3ZkRIvs="; + outputHash = "sha256-UHV7Z2HaVTOCY5U0zjUtkchJicrXMBfYBHvL8AA7NTg="; }; in stdenv.mkDerivation rec { @@ -172,6 +172,7 @@ in stdenv.mkDerivation rec { homepage = "https://ghidra-sre.org/"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; + maintainers = [ "roblabla" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix index f818dc7f11..ef7a5cf85e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { ./tests-add-test-cases-for-import-without-uid.patch ./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch + ] ++ lib.optional stdenv.isDarwin [ + # Remove an innocent warning printed on systems without procfs + # https://dev.gnupg.org/T5656 + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/890be5f6af88e7913d177af87a50129049e681bb/gnupg/2.3.3-proc-error.patch"; + sha256 = "sha256-oiTa7Nf+AEmhZ683CJEaCb559PXJ6RpSSgRLpxz4CKU="; + }) ]; postPatch = '' sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index c2350f5072..50dfe3b8ce 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.13.0"; + version = "1.13.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MBpk84H3Ng/+rCjW2Scm/su0/5kgs7IzvFk/bFLNzXY="; + sha256 = "sha256-g/ICT489uW3a5EnsxJPYOnV+yeOFfaFPMowdIK0M1Fc="; }; vendorSha256 = "sha256-HGc6jUp4WO5P5dwfa0r7+X78a8us9fWrf+/IOotZHqk="; diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/summon.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/summon.nix new file mode 100644 index 0000000000..c1be7c9eb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/summon.nix @@ -0,0 +1,39 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, gopass +}: + +buildGoModule rec { + pname = "gopass-summon-provider"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mRZXczIlW1s0VGZJ+KQue4Dz6XCXGfl56+g6iRv2lZg="; + }; + + vendorSha256 = "sha256-fiV4rtel2jOw6y/ukOZHeFuNVqxHS3rnYhXJ6JZ+a/8="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; + + postFixup = '' + wrapProgram $out/bin/gopass-summon-provider --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Gopass Summon Provider"; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/gpgstats/default.nix b/third_party/nixpkgs/pkgs/tools/security/gpgstats/default.nix deleted file mode 100644 index f6f6d36781..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/gpgstats/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, gpgme }: - -stdenv.mkDerivation rec { - pname = "gpgstats"; - version = "0.5"; - - src = fetchurl { - url = "https://www.vanheusden.com/gpgstats/${pname}-${version}.tgz"; - sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy"; - }; - - buildInputs = [ ncurses gpgme ]; - - installPhase = '' - mkdir -p $out/bin - cp gpgstats $out/bin - ''; - - NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.is64bit) - "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"; - - meta = with lib; { - description = "Calculates statistics on the keys in your gpg key-ring"; - longDescription = '' - GPGstats calculates statistics on the keys in your key-ring. - ''; - homepage = "http://www.vanheusden.com/gpgstats/"; - license = licenses.gpl2; - maintainers = with maintainers; [ davidak ]; - platforms = platforms.unix; - }; -} - diff --git a/third_party/nixpkgs/pkgs/tools/security/haveged/default.nix b/third_party/nixpkgs/pkgs/tools/security/haveged/default.nix index b088f07c6e..89e0793648 100644 --- a/third_party/nixpkgs/pkgs/tools/security/haveged/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/haveged/default.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "haveged"; - version = "1.9.2"; + version = "1.9.15"; - src = fetchurl { - url = "http://www.issihosts.com/haveged/haveged-${version}.tar.gz"; - sha256 = "0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp"; + src = fetchFromGitHub { + owner = "jirka-h"; + repo = "haveged"; + rev = "v${version}"; + sha256 = "sha256-bU+/lRx0RAqHheNQ9CWT/V0oZnZd0W9EHhhX3RRIZ/0="; }; - meta = { + strictDeps = true; + + postPatch = '' + patchShebangs ent # test shebang + ''; + + installFlags = [ + "sbindir=$(out)/bin" # no reason for us to have a $out/sbin, its just a symlink to $out/bin + ]; + + doCheck = true; + + meta = with lib; { description = "A simple entropy daemon"; longDescription = '' The haveged project is an attempt to provide an easy-to-use, unpredictable @@ -19,9 +33,9 @@ stdenv.mkDerivation rec { of haveged is directed towards improving overall reliability and adaptability while minimizing the barriers to using haveged for other tasks. ''; - homepage = "http://www.issihosts.com/haveged/"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.domenkozar ]; - platforms = lib.platforms.unix; + homepage = "https://github.com/jirka-h/haveged"; + license = licenses.gpl3; + maintainers = with maintainers; [ domenkozar ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index 2614ee67e5..1e57679b4a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-XA099gBp52g0RUbbFSE8uFa7gh56bO8H66KaFAtK1RU="; }; - vendorSha256 = "sha256-rmuRZ8jRwSaAYgrOBgJwsEOAaUNJwhPJX9hEaJTX6/E="; + vendorSha256 = "sha256-Qx0QaPKpEq4U+G3qdfMN4EVyY5zI2SyzcK/U6o6loHE="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix index a2ec75cfd2..1d1d4797a9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.7.6"; + version = "3.8.2"; src = fetchurl { url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; - sha256 = "sha256-IjbuCCwcAOlCM2XbM5qBGjaGn8xNNDjoyJmCzP5JF/Q="; + sha256 = "sha256-064V1KnMXBnjgM6mBrwkezdl+Tko3Xri0D4fCk9iPbk="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix index ec94b0e73d..eae06ea649 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-6I8pK1DZkjAf6XljREMasoZQGR9YGDxn6+sdQ/nf31A="; + hash = "sha256-5meBBBijX49EQc9VejySwiIKsyCBEKGKIXvH7en6XuU="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-i+vK085P1T182wW4PajpDyZgyupKHlrx1yJgzJdHETU="; + outputHash = "sha256-t+CkjoZqWqphxbg/4E3/7U8nKoV0AlITyRScLN8x6yY="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix index 058ed8d148..4e372e7dad 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -1,15 +1,14 @@ -{ stdenv, substituteAll, lib, buildGoPackage, fetchFromGitHub +{ stdenv, substituteAll, lib, buildGoModule, fetchFromGitHub , AVFoundation, AudioToolbox, ImageIO, CoreMedia -, Foundation, CoreGraphics, MediaToolbox -, gnupg +, Foundation, CoreGraphics, MediaToolbox, gnupg }: -buildGoPackage rec { +buildGoModule rec { pname = "keybase"; - version = "5.8.1"; + version = "5.9.1"; - goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/kbnm" "go/keybase" ]; + modRoot = "go"; + subPackages = [ "kbnm" "keybase" ]; dontRenameImports = true; @@ -17,8 +16,9 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-SeBZtrRsWTv5yBBsp18daKCNAr70OalH3shlKf+aiEU="; + sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI="; }; + vendorSha256 = "sha256-ckAnSSSEF00gbgxnPAi2Pi8TNu3nmAahK7TP6HnfmNo="; patches = [ (substituteAll { @@ -30,12 +30,13 @@ buildGoPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; tags = [ "production" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne ]; + maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne shofius ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix index 8912961e35..d5f04099f7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20210930160723.fefa22edc1"; + versionSuffix = "20220120174718.95a3939b3a"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.8.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.9.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "cqbGvnJ6wx5boVe78Ju8CimH1H08DfkM5nmwbV0uKG0="; + sha256 = "sha256-Wdl5pZFIz+mDkkE0EDpLGH/eGWYoBbLV05LYJgkwpI4="; }; nativeBuildInputs = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne ]; + maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix index dc49f9d9e7..52fedf3fee 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/kbfs.nix @@ -1,22 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub, keybase }: +{ lib, buildGoModule, fetchFromGitHub, keybase }: -buildGoPackage { +buildGoModule { pname = "kbfs"; - inherit (keybase) src version; + inherit (keybase) src version vendorSha256; - goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/redirector" "go/kbfs/kbfsgit/git-remote-keybase" ]; - - dontRenameImports = true; + modRoot = "go"; + subPackages = [ "kbfs/kbfsfuse" "kbfs/redirector" "kbfs/kbfsgit/git-remote-keybase" ]; tags = [ "production" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; platforms = platforms.unix; - maintainers = with maintainers; [ avaq rvolosatovs bennofs np ]; + maintainers = with maintainers; [ avaq rvolosatovs bennofs np shofius ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix b/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix index c1ecd55c38..cbd4e4e315 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kube-hunter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "066pivd9mdhy24n40m9917zr5f9gh4fva4zmxk9vyppgk1b3mpwc"; + sha256 = "sha256-2pmViizQLwyTdP6J92ynvdIdqkfgc6SIhsll85g9pHA="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix index ef18a0f2d7..338e00d79d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.143"; + version = "2.0.146"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-ylmH3vQTWT9I57J+Q771PG/r6t8t3P6zNC+sGIx3C1A="; + hash = "sha256-OSpT6S0jCw/svWl4q9CyZUwUB/cFAyiyWt+oXKVPSJ0="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-1TupDdiG8hnbAM+JJRTJWCYQBGN/o+C3H2e0w9muYog="; + vendorSha256 = "sha256-p2bLZfwsSevaiAqciCfEvpdOx3WlVdWBHVXtLBMjLGA="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix index d15fab720f..001e851912 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubesec/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-z1v+xm0ZWs8F5KtltBSDx9W+xNqRsfvAgQUKgrZa+28="; }; - vendorSha256 = "sha256-/2u92KvfzbJxJjh1cy9+4AuM5Qw1tK9Hu0xjRs0nhBE="; + vendorSha256 = "sha256-t2GZaLa/Pc/TCjqTNGuLnOFSepExmE2xA8pc9HkUtcs="; # Tests wants to download the kubernetes schema for use with kubeval doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/lmp/default.nix b/third_party/nixpkgs/pkgs/tools/security/lmp/default.nix index 6fd544df20..2f7f0283f9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lmp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lmp/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-VL/Hp7YaXNcV9JPb3kgRHcdhJJ5p3KHUf3hHbT3gKVk="; }; - vendorSha256 = "sha256-K3jD+r/JFQH5QeLHatCzTdgiABbmKOd/jR3Di10w6mo="; + vendorSha256 = "sha256-3NTaJ/Y3Tc6UGLfYTKjZxAAI43GJyZQ5wQVYbnXHSYc="; meta = with lib; { description = "Scanning and validation toolkit for the Log4J vulnerability"; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 4e770c3ead..8812a16df3 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.1.25" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.28" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index d7be1df5a8..cdd2849be2 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: 4a1ba0f9095d5c6e954ba58bc71d02feefc411a5 - ref: refs/tags/6.1.25 + revision: b8975cbd6552cc52044250143ffc440775a8a29e + ref: refs/tags/6.1.28 specs: - metasploit-framework (6.1.25) + metasploit-framework (6.1.28) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.66) + metasploit-payloads (= 2.0.71) metasploit_data_models - metasploit_payloads-mettle (= 1.0.17) + metasploit_payloads-mettle (= 1.0.18) mqtt msgpack nessus_rest @@ -47,7 +47,7 @@ GIT openvas-omp packetfu patch_finder - pcaprub (= 0.12.4) + pcaprub pdf-reader pg puma @@ -128,23 +128,23 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.549.0) - aws-sdk-core (3.125.5) + aws-partitions (1.552.0) + aws-sdk-core (3.126.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.294.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ec2 (1.298.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.65.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-iam (1.66.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.53.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-kms (1.54.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.111.1) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-s3 (1.112.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -152,7 +152,7 @@ GEM bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) bindata (2.4.10) - bson (4.14.0) + bson (4.14.1) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) @@ -216,7 +216,7 @@ GEM domain_name (~> 0.5) http_parser.rb (0.8.0) httpclient (2.8.3) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) io-console (0.5.11) irb (1.3.6) @@ -251,7 +251,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.66) + metasploit-payloads (2.0.71) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -262,12 +262,12 @@ GEM railties (~> 6.0) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.17) + metasploit_payloads-mettle (1.0.18) method_source (1.0.0) mini_portile2 (2.7.1) minitest (5.15.0) mqtt (0.5.0) - msgpack (1.4.3) + msgpack (1.4.4) multi_json (1.15.0) multipart-post (2.1.1) mustermann (1.1.1) @@ -291,16 +291,16 @@ GEM packetfu (1.1.13) pcaprub patch_finder (1.0.2) - pcaprub (0.12.4) - pdf-reader (2.8.0) + pcaprub (0.13.1) + pdf-reader (2.9.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.2.3) + pg (1.3.1) public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.1) nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) @@ -334,7 +334,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.20) + rex-core (0.1.25) rex-encoder (0.1.6) metasm rex-arch @@ -379,12 +379,12 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.0.0) + ruby_smb (3.0.1) bindata openssl-ccm openssl-cmac rubyntlm - windows_error + windows_error (>= 0.1.3) rubyntlm (0.6.3) rubyzip (2.3.2) sawyer (0.8.2) @@ -437,7 +437,7 @@ GEM activesupport (>= 4.2, < 7.0) xmlrpc (0.3.2) webrick - zeitwerk (2.5.3) + zeitwerk (2.5.4) 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 d9a508640c..d7b2bb8b9e 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.1.25"; + version = "6.1.28"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-lfTueN3s7wsyQRrulsx7TKVMhOu6//4Z6DDjR/Lm6Vw="; + sha256 = "sha256-3l9yBnOejCVSo/zw46mGv3uBoArtyOPbjE1l8CoVNkg="; }; 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 56bc013871..b55f76e8a8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -104,60 +104,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02d86hv5jfs27hszd9d92q31dz3wl3s1racimkhb7nx8xg0l9ldj"; + sha256 = "0wr4jkylfkd89970hw3akfy7vyj54qz11gq3aar48j8p9px0gl17"; type = "gem"; }; - version = "1.549.0"; + version = "1.552.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i6835n7d2ss3k3ljwbw8by0fagymk0122ill3i9ipghz21xpqld"; + sha256 = "002hgcpsch33r82jd5imyxj0h2w4v8ymmby42rnxdisd03jkygy9"; type = "gem"; }; - version = "3.125.5"; + version = "3.126.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rzbd111n7pgzpgjabcxi2mpnkxf3fcxkvy4rqidyf80m4633gwy"; + sha256 = "0s0xdcrhmcgbh4m1g57dnw04g45zviv6a4r3qaw8468bm6bi16z6"; type = "gem"; }; - version = "1.294.0"; + version = "1.298.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gss3wi1csngmd2iirxznnhafr0yvgqnkr0cksz7dk9kqrly04gl"; + sha256 = "0dr1lgg76syyqj12x8w0j6qvwn3410vdjhy0r9y8k930svrjlkh7"; type = "gem"; }; - version = "1.65.0"; + version = "1.66.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "044nzbh16x4vx7kbjv1hfh553sp126kcdk2x99apr52j506sk87c"; + sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2"; type = "gem"; }; - version = "1.53.0"; + version = "1.54.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pgh6zd07r9sfzkdz4bf6piq4n8gzl0f76h68l2zxchc1g9z4lqw"; + sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5"; type = "gem"; }; - version = "1.111.1"; + version = "1.112.0"; }; aws-sigv4 = { groups = ["default"]; @@ -204,10 +204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vfwqzd89542xm8sc1ni6jvjy6wgycnri67q7agxnc5jmwawmcgf"; + sha256 = "03n3w96vpblaxvk1qk8hq7sbsmg4nv7qdkdr8f7nfvalgpakp5i5"; type = "gem"; }; - version = "4.14.0"; + version = "4.14.1"; }; builder = { groups = ["default"]; @@ -564,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; io-console = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "4a1ba0f9095d5c6e954ba58bc71d02feefc411a5"; - sha256 = "0p79wvr4gqrhx0czxzxsxf24r9acgg69dvhs84r0pvzcvmwfxx4m"; + rev = "b8975cbd6552cc52044250143ffc440775a8a29e"; + sha256 = "0j1n2lmg0radikdy7j7d1ah82yxzhsly7w7wld92b34yfc374pyy"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.25"; + version = "6.1.28"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpsxysd6lg4falybci1fwlxjmxazjx5birqppdyc9wkqha58j9r"; + sha256 = "12fr3v5mjwlilnlccnbimamz6sq6kckf16vgzpfpgi8gjma3lgb9"; type = "gem"; }; - version = "2.0.66"; + version = "2.0.71"; }; metasploit_data_models = { groups = ["default"]; @@ -726,10 +726,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06v72lyj08haqzs5a12ds6vadq6r2kxy50s7jxp1vxq5i2j4p2gm"; + sha256 = "09mm8wbp7yaaqpz16bhsag3q5xd4aqx5l1n2p06zg55nph1dgy0s"; type = "gem"; }; - version = "1.0.17"; + version = "1.0.18"; }; method_source = { groups = ["default"]; @@ -776,10 +776,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14kg9wdfls7s63lds9blrd77n8mx780bzyh05dj8kn0aimw3l9dx"; + sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; multi_json = { groups = ["default"]; @@ -957,30 +957,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; + sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy"; type = "gem"; }; - version = "0.12.4"; + version = "0.13.1"; }; pdf-reader = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; + sha256 = "1fh2pq3gk5fh18g71wir98k4bz4rvihhx8qmn8zi9fz6yfqx39qj"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "1zn1miz2h3pki11jwf6f474540kvai3sc43jp8smi3mjx8brvws0"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.1"; }; public_suffix = { groups = ["default"]; @@ -997,10 +997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "03blhf8snz59433zsv7apwqy1hg92yhkb5am9x2dpqr0c4i6hscs"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.1"; }; racc = { groups = ["default"]; @@ -1147,10 +1147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hy7xrd3pwyfk2199zkgfa6kz1fsx7ngf6s512gpk8gadjc8hq6j"; + sha256 = "04w1pknswnjs02fgsqcr8dx6cz3qjmx7hs83kbhn836s4yfpyv6a"; type = "gem"; }; - version = "0.1.20"; + version = "0.1.25"; }; rex-encoder = { groups = ["default"]; @@ -1357,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1klfrp56qid5fr1kzsi62bkhpp2yn6pbv0yg4ikf0lgzg5nq781w"; + sha256 = "0mf3mzxq83y7i8nr6bcl5yacvfz6y5p3hdmvr1m6xq0l0i9a9axy"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; rubyntlm = { groups = ["default"]; @@ -1627,9 +1627,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix index 83bb83e4e2..5acd0a93ac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid"; }; - vendorSha256 = "0kkkx8p0r04gg3pp0qy835afaxnqxjggnr7q7l6azdvg8qvgxfms"; + vendorSha256 = "17x60x68hd2jm84xw5mgsclv6phn6ajkp92kpcz013vlkcdaqrxs"; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix index 69bea2ac54..0a6733e993 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3 -, pcre, liblinear, libssh2 +, pcre, libssh2 , graphicalSupport ? false , libX11 ? null , gtk2 ? null @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { configureFlags = [ (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua") + "--with-liblinear=included" ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ]; makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ]; - buildInputs = [ pcre liblinear libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [ + buildInputs = [ pcre libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [ python2 libX11 gtk2 ]); diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index 396b8e0379..27805bdd76 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-r6nOVTg/vZr2somTCoEJQHtbMMZ1RCkdDzGQeTISreU="; }; - vendorSha256 = "sha256-/TFg+ztubfZfyUbRabVr943oF9R0Xg8mIDxUl/MFbJE="; + vendorSha256 = "sha256-zLZ7+eJPKJ8nX47SdbzCLwg3nmv2lFcd2te8oh0UU4s="; modRoot = "./v2"; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/orjail/default.nix b/third_party/nixpkgs/pkgs/tools/security/orjail/default.nix new file mode 100644 index 0000000000..adcbf5ae4f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/orjail/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, tor +, firejail +, iptables +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "orjail"; + version = "1.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + patchShebangs make-helper.bsh + mkdir bin + mv usr/sbin/orjail bin/orjail + rm -r usr + ''; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + ]; + + postInstall = '' + # Specify binary paths: tor, firejail, iptables + # mktemp fails with /tmp path prefix, will work without it anyway + # https://github.com/orjail/orjail/issues/78 + # firejail will fail reading /etc/hosts, therefore remove --hostname arg + # https://github.com/netblue30/firejail/issues/2758 + substituteInPlace $out/bin/orjail \ + --replace ''$'TORBIN=\n' ''$'TORBIN=${tor}/bin/tor\n' \ + --replace ''$'FIREJAILBIN=\n' ''$'FIREJAILBIN=${firejail}/bin/firejail\n' \ + --replace 'iptables -' '${iptables}/bin/iptables -' \ + --replace 'mktemp /tmp/' 'mktemp ' \ + --replace '--hostname=host ' "" + ''; + + meta = with lib; { + description = "Force programs to exclusively use tor network"; + homepage = "https://github.com/orjail/orjail"; + license = licenses.wtfpl; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix b/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix index b8974bc720..e4c42a83f0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "otpauth"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-LGDeNkCxVLDVpwi5VFFL0DFsf8CexI7Nc5l+l2ASHaw="; + sha256 = "sha256-qSu0kGRi1es9OciN1s9Eh1Z3JkxbcKO8W5cAC7c7n0k="; }; - vendorSha256 = "sha256-fwO3cmlnmuD682vGB8X06yGHZqBadeltRrsEUjQWazc="; + vendorSha256 = "sha256-TU5crhmQAhSfURdfPe/xaa3RgGyc+UFn2E+jJ0flNsg="; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch new file mode 100644 index 0000000000..ce6849d677 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/0001-Set-base-to-an-empty-value.patch @@ -0,0 +1,43 @@ +From a2d5d973f53efb11bdcaecbd0099df9714bc287f Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Tue, 8 Feb 2022 19:35:35 +0100 +Subject: [PATCH] Set `base` to an empty value + +`DESTDIR` ensures that everything lands in the correct location (i.e. +the target store-path on Nix), within this path, everything should be +moved into `/lib` and `/share`. +--- + setup.py | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +diff --git a/setup.py b/setup.py +index 1f0a58b..f7baa41 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,21 +8,8 @@ from pathlib import Path + + from setuptools import setup + +-share = Path(sys.prefix, 'share') +-base = '/usr' +-if os.uname().sysname == 'Darwin': +- base = '/usr/local' +-lib = Path(base, 'lib', 'password-store', 'extensions') +- +-if '--user' in sys.argv: +- if 'PASSWORD_STORE_EXTENSIONS_DIR' in os.environ: +- lib = Path(os.environ['PASSWORD_STORE_EXTENSIONS_DIR']) +- else: +- lib = Path.home() / '.password-store' / '.extensions' +- if 'XDG_DATA_HOME' in os.environ: +- share = Path(os.environ['XDG_DATA_HOME']) +- else: +- share = Path.home() / '.local' / 'share' ++share = Path('share') ++lib = Path('lib', 'password-store', 'extensions') + + setup( + data_files=[ +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix index 415a4b9e79..c4c16b8ff8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix @@ -5,16 +5,17 @@ let in stdenv.mkDerivation rec { pname = "pass-audit"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-audit"; rev = "v${version}"; - sha256 = "1vapymgpab91kh798mirgs1nb7j9qln0gm2d3321cmsghhb7xs45"; + sha256 = "sha256-xigP8LxRXITLF3X21zhWx6ooFNSTKGv46yFSt1dd4vs="; }; patches = [ + ./0001-Set-base-to-an-empty-value.patch ./0002-Fix-audit.bash-setup.patch ]; @@ -40,7 +41,8 @@ in stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; postInstall = '' wrapProgram $out/lib/password-store/extensions/audit.bash \ - --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" + --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" \ + --run "export COMMAND" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/passphrase2pgp/default.nix b/third_party/nixpkgs/pkgs/tools/security/passphrase2pgp/default.nix index 55e19b9481..f1dce116a6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/passphrase2pgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/passphrase2pgp/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-VNOoYYnHsSgiSbVxlBwYUq0JsLa4BwZQSvMVSiyB6rg="; }; - vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs"; + vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs="; postInstall = '' mkdir -p $out/share/doc/$name diff --git a/third_party/nixpkgs/pkgs/tools/security/pbis/default.nix b/third_party/nixpkgs/pkgs/tools/security/pbis/default.nix index 7561b1fae9..acd1fc5607 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pbis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pbis/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # curl must be placed after openssl_1_0_2, because it pulls openssl 1.1 dependency. buildInputs = [ pam popt libiconv libuuid openssl_1_0_2 cyrus_sasl - curl sqlite popt tdb libxml2 /*libglade2 for gtk*/ + curl sqlite popt tdb libxml2 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix new file mode 100644 index 0000000000..afe1d03fff --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libassuan +, libgpg-error, popt, bemenu }: + +stdenv.mkDerivation rec { + pname = "pinentry-bemenu"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "t-8ch"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-AFS4T7VqPga53/3rG8be9Q//6/2JJIe7+Ata33ewySg="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ libassuan libgpg-error popt bemenu ]; + + meta = with lib; { + description = "Pinentry implementation based on bemenu"; + homepage = "https://github.com/t-8ch/pinentry-bemenu"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jc ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix index 47bf2c8297..7d8de48800 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix @@ -1,44 +1,53 @@ -{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkg-config -, sysfsutils -, argp-standalone +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, pkg-config +, argp-standalone ? null +, openssl +, jitterentropy ? null, withJitterEntropy ? true # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS # https://www.nist.gov/programs-projects/nist-randomness-beacon -, curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false - # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source -, libgcrypt ? null, withGcrypt ? true -, jitterentropy ? null, withJitterEntropy ? true +, curl ? null, jansson ? null, libxml2 ? null, withNistBeacon ? false , libp11 ? null, opensc ? null, withPkcs11 ? true +, librtlsdr ? null, withRtlsdr ? true }: +assert (stdenv.hostPlatform.isMusl) -> argp-standalone != null; +assert (withJitterEntropy) -> jitterentropy != null; +assert (withNistBeacon) -> curl != null && jansson != null && libxml2 != null; +assert (withPkcs11) -> libp11 != null && opensc != null; +assert (withRtlsdr) -> librtlsdr != null; + with lib; stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.11"; + version = "6.14"; src = fetchFromGitHub { owner = "nhorman"; - repo = "rng-tools"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M="; + hash = "sha256-NTXp2l5gVxKhO4Gqcy4VzomYU5B3HydkefMvdzypK8M="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; configureFlags = [ - (withFeature withGcrypt "libgcrypt") - (enableFeature withJitterEntropy "jitterentropy") - (withFeature withNistBeacon "nistbeacon") - (withFeature withPkcs11 "pkcs11") + (enableFeature (withJitterEntropy) "jitterentropy") + (withFeature (withNistBeacon) "nistbeacon") + (withFeature (withPkcs11) "pkcs11") + (withFeature (withRtlsdr) "rtlsdr") ]; - # argp-standalone is only used when libc lacks argp parsing (musl) - buildInputs = [ sysfsutils ] - ++ optionals stdenv.hostPlatform.isx86_64 [ argp-standalone ] - ++ optionals withGcrypt [ libgcrypt ] - ++ optionals withJitterEntropy [ jitterentropy ] - ++ optionals withNistBeacon [ curl libxml2 openssl ] - ++ optionals withPkcs11 [ libp11 openssl ]; + buildInputs = [ openssl ] + ++ optionals (stdenv.hostPlatform.isMusl) [ argp-standalone ] + ++ optionals (withJitterEntropy) [ jitterentropy ] + ++ optionals (withNistBeacon) [ curl jansson libxml2 ] + ++ optionals (withPkcs11) [ libp11 openssl ] + ++ optionals (withRtlsdr) [ librtlsdr ]; enableParallelBuilding = true; @@ -51,9 +60,18 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = "patchShebangs tests/*.sh"; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + set -o pipefail + $out/bin/rngtest --version | grep $version + runHook postInstallCheck + ''; + meta = { description = "A random number generator daemon"; homepage = "https://github.com/nhorman/rng-tools"; + changelog = "https://github.com/nhorman/rng-tools/releases/tag/v${version}"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ johnazoidberg c0bw3b ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/rnp/cmake_nogit.patch b/third_party/nixpkgs/pkgs/tools/security/rnp/cmake_nogit.patch deleted file mode 100644 index 733b093de5..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/rnp/cmake_nogit.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git i/cmake/version.cmake w/cmake/version.cmake -index 0ed123b5..4348e7e1 100644 ---- i/cmake/version.cmake -+++ w/cmake/version.cmake -@@ -90,41 +90,12 @@ function(determine_version source_dir var_prefix) - else() - message(STATUS "Found no version.txt.") - endif() -- # for GIT_EXECUTABLE -- find_package(Git REQUIRED) -- # get a description of the version, something like: -- # v1.9.1-0-g38ffe82 (a tagged release) -- # v1.9.1-0-g38ffe82-dirty (a tagged release with local modifications) -- # v1.9.0-3-g5b92266 (post-release snapshot) -- # v1.9.0-3-g5b92266-dirty (post-release snapshot with local modifications) -- _git(version describe --abbrev=${GIT_REV_LEN} --match "v[0-9]*" --long --dirty) -- if (NOT _git_ec EQUAL 0) -- # no annotated tags, fake one -- message(STATUS "Found no annotated tags.") -- _git(revision rev-parse --short=${GIT_REV_LEN} --verify HEAD) -- if (_git_ec EQUAL 0) -- set(version "v${base_version}-0-g${revision}") -- # check if dirty (this won't detect untracked files, but should be ok) -- _git(changes diff-index --quiet HEAD --) -- if (NOT _git_ec EQUAL 0) -- string(APPEND version "-dirty") -- endif() -- # append the commit timestamp of the most recent commit (only -- # in non-release branches -- typically master) -- _git(commit_timestamp show -s --format=%ct) -- if (_git_ec EQUAL 0) -- string(APPEND version "+${commit_timestamp}") -- endif() -- elseif(has_version_txt) -- # Nothing to get from git - so use version.txt completely -- set(version "${version_file}") -- else() -- # Sad case - no git, no version.txt -- set(version "v${base_version}") -- endif() -+ if(has_version_txt) -+ # Nothing to get from git - so use version.txt completely -+ set(version "${version_file}") - else() -- set(has_release_tag YES) -- message(STATUS "Found annotated tag ${version}") -+ # Sad case - no git, no version.txt -+ set(version "v${base_version}") - endif() - extract_version_info("${version}" "${local_prefix}") - if ("${has_version_txt}" AND NOT ${base_version} STREQUAL ${local_prefix}_VERSION) diff --git a/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix b/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix index 38e6c80428..a18571c804 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix @@ -15,17 +15,15 @@ stdenv.mkDerivation rec { pname = "rnp"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rnpgp"; repo = "rnp"; rev = "v${version}"; - sha256 = "1jph69nsz245fbv04nalh1qmhniyh88sacsf3nxv1vxm190314i9"; + sha256 = "u0etVslTBF9fBqnpVBofYsm0uC/eR6gO3lhwzqua5Qw="; }; - patches = [ ./cmake_nogit.patch ]; - buildInputs = [ zlib bzip2 json_c botan2 ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 6d96025f0c..2f1127fd68 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.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-99URhGJJKO4l+ztMGljiuNKVTYIG2iyWUMBXG1WTPdI="; + sha256 = "sha256-JRJjuVF0MkV7KVmbAZhiWPWVwDORByCsZqPwdTuVRoA="; }; - vendorSha256 = "sha256-oUEgJ1DDzhKUpYevylIr+1X28xFGaWMh5+q1HTqOHaU="; + vendorSha256 = "sha256-/N/RYqt+lhhECK+uq99vkm3Mg7PWpdE0GYLXkIYthNw="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix index 8fd4276427..a865e441f1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-SXBdtwYEslR871wLwCCHD7hsM/riHswyKrIilrsLqns="; + vendorSha256 = "sha256-NSV7mDn1efQAO4jm6bJm12ExDFTN76TkmD4r61V6D2Q="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix index e88187f846..890518126d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix @@ -7,15 +7,13 @@ stdenv.mkDerivation { pname = "secp256k1"; - # I can't find any version numbers, so we're just using the date of the - # last commit. - version = "unstable-2021-06-06"; + version = "unstable-2022-02-06"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "7973576f6e3ab27d036a09397152b124d747f4ae"; - sha256 = "0vjk55dv0mkph4k6bqgkykmxn05ngzvhc4rzjnvn33xzi8dzlvah"; + rev = "5dcc6f8dbdb1850570919fc9942d22f728dbc0af"; + sha256 = "x9qG2S6tBSRseWaFIN9N2fRpY1vkv8idT3d3rfJnmaU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix b/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix index 31619ea7f5..e469e4b004 100644 --- a/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "snallygaster"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "hannob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xUWnu+T6+5Ro6TrmtFD/Qd40FffY5rfuAvWzNkBhTME="; + sha256 = "sha256-JXuRCUWpoGhBbU38XMEQovCiVfbyBMJ+SIrt3iqFuAo="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix index c5d33645f1..412cba21f9 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.1.2"; + version = "1.2.0"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MX2kbdLj72S2WBceUW/3ps34Bcsf/VArK8RN4r13wQY="; + sha256 = "01ph9jzh18bnidrsbnnxm3gxh0cgfllnjvf7a5haqz51lm6a9pny"; }; - vendorSha256 = "sha256-ZRcXMNKhNY3W5fV9q/V7xsnODoG6KWHrzpWte9hx/Ms="; + vendorSha256 = "1fd1k5by4wcjmzfgi3gnrwnb38b0wa3w67kzjlx8s0nwapyfgx0b"; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix index d403d72831..97a4264631 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-f9sp5sAWysOOoIdCiCJxTWRhyt0wfpO5p4pxW6jj0xc="; + sha256 = "sha256-oebmJ+xrJTV5gXH3U1lWCSQMHiVnUTa0ZTp39sVB7KM="; }; - vendorSha256 = "sha256-iDfPCRU91cuZsKqNOjkLGYmWf8i5FO4NmDsfD5Xqip0="; + vendorSha256 = "sha256-IJXJS+Z93Hw1I1CAeRv4mq8as9DKebqNFa0IMgZ+Kic="; ldflags = [ "-buildid=" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix index 9004699092..e91a35b808 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.17.7"; + version = "0.18.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Qg71JcnA+20zme1ltG4J6qht4P46J5sHPjV3w4HCKPc="; + sha256 = "sha256-gMJFzfqQsxOXPRdRj48c3FKhXsPLEmegiENa2OHWEGo="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-kVvbSTybO23zb1ivCrjZqkM44ljPGD1GdBv76qCpTEQ="; + vendorSha256 = "sha256-wnMQPnL8M57BOY9QmawLpqtWv+n3GdfIadJ3PwuicOU="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix index 58afd5318d..7baf1cf6b8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.8p2"; + version = "1.9.9"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "sha256-njuLjafe9DtuYMJXq+gEZyBWcP0PfAgd4UI8QUtoDy0="; + sha256 = "sha256-bW7oY6O8Jsh2YQk6dOxj4Q/QMc66cUZC0hY23+JePgA="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch new file mode 100644 index 0000000000..b19b9ffe8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 1c915f1..83a8e41 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,7 +4,7 @@ + WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversion -Wconversion -Wfloat-conversion -Wshorten-64-to-32 -Wuninitialized -Wmissing-variable-declarations -Wmissing-declarations + WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align + CFLAGS ?= -g +-OPTS=-I. -O3 $(CFLAGS) -fcommon -Wl,--allow-multiple-definition ++OPTS=-I. -O3 $(CFLAGS) -fcommon + # -Wall -g -pedantic + LIBS=-lm + DESTDIR ?= diff --git a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix index f60d537464..b12daff003 100644 --- a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58="; }; + patches = lib.optionals stdenv.isDarwin [ + ./darwin-remove-ldflag.patch + ]; + postPatch = let makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs); in '' @@ -43,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://www.thc.org/thc-hydra/"; license = licenses.agpl3; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix b/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix index e056b556aa..8132364298 100644 --- a/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "traitor"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eUeKkjSpKel6XH3/VVw/WPCG/Nq8BcZwMNFG9z9FUuU="; + sha256 = "sha256-SHfAPPVq5OmS0yPaSXGsMjskQdosoBN4XRLSzkrviJM="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 67b48f9ce6..6f1de7b45a 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.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-vuwVPBB7zxpmJsBZ+J/vl0E49gx7CUGGi5j1Grgv2Jo="; + sha256 = "sha256-2pysQsJynuedqX9Yi4BjTnWuJZ5XTq11UEgkSh7eZyw="; }; - vendorSha256 = "sha256-i7f/7BRn++m+0KAK1V9dWJykgGobzmB2OZ6ltR//kRg="; + vendorSha256 = "sha256-LNN0u48B6xGjrUasxGF+4sw1HxiR22hj8H2/mSyh1SI="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 13399698c0..49e02a4e1c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "sha256-UMeltpuGUPdB5j4NBxA6SuLUqzinrF8USCaJk9SjDJA="; + sha256 = "sha256-zeMVdsTSp1z8cwebU2N6w7436N8CcI7PzNedDOSvEx4="; }; - cargoSha256 = "sha256-8SjCWioOK/bk6G+0Yfl0ilgbLu83hn+AtuX9QWrnQEc="; + cargoSha256 = "sha256-Sn6DuzV2OfaywE0W2afRG0h8PfOprqMtZtYM/exGEww="; postPatch = '' # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working diff --git a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix index 037adda92e..90d4e0f509 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.10.0"; + version = "1.10.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1d5mqpc4g1wkqcwxp8m9k130i3ii3q7n1n4b1fyb5wijidmyn3xv"; + sha256 = "07v3ddvvhi3bslwrlin45kz48i3va2lzd6ny0blj5i2z8z40qcfm"; }; outputs = [ "out" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix b/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix index fa243e4b04..d2496df94c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yubikey-agent/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "0cpj4nj2g0ick6p79h4pnjg7ybnyz9p26jivv0awi6bmn378nbxn"; + vendorSha256 = "1v4ccn7ysh8ax1nkf1v9fcgsdnz6zjyh6j6ivyljyfvma1lmcrmk"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix b/third_party/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix index 8a06c363fa..476ea3dbfb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = version; sha256 = "sha256-f6j+YNYASH0Adg3236QijApALd/yXJjNMYEdP0Pifw0="; }; - vendorSha256 = "sha256-bmFbxMU3PEWpYI0eQw/1RRDP+JGfUY8kOCeTWbdVt9k="; + vendorSha256 = "sha256-H05EJwYDdg4lq6+psXiwujQd5g294epdRPjqviHhLWs="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix index 6a6ae20dfa..766b5afd4e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.6"; + version = "0.6.8"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-nE718NA3oLkBTTjewypYyUVRgTm4xiDTui5kEPYYCBc="; + sha256 = "sha256-zmiYVLaXKHH+MObO75wOiGkDetKy4bVLe7IAqiO2ER8="; }; prePatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-M6LgriXjhxlnoky+TNU7Eb15M+uTgbVKk3g/Sk90xsg="; + cargoSha256 = "sha256-GMG6YBm/jA5D7wxC2gczMn/6Lkqiq/toSPNf86kgOys="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/data.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/data.nix index 3867bd6bb3..52e394db40 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/data.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/data.nix @@ -1,14 +1,14 @@ { stdenv, collectd }: stdenv.mkDerivation { - inherit (collectd) meta version; - pname = "collectd-data"; + inherit (collectd) meta src version; - dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; installPhase = '' - mkdir -p $out/share/collectd - cp ${collectd}/share/collectd/*.{db,conf} $out/share/collectd/ + install -Dm444 -t $out/share/collectd/ src/*.{db,conf} ''; } diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix index de8948db6c..1455feb1c3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix @@ -41,8 +41,8 @@ , xen , yajl , IOKit -# Defaults to `null` for all supported plugins, -# list of plugin names for a custom build +# Defaults to `null` for all supported plugins (except xen, which is marked as +# insecure), otherwise a list of plugin names for a custom build , enabledPlugins ? null , ... }: @@ -136,7 +136,7 @@ let buildInputs = if enabledPlugins == null then builtins.concatMap pluginBuildInputs - (builtins.attrNames plugins) + (builtins.attrNames (builtins.removeAttrs plugins ["xencpu"])) else builtins.concatMap pluginBuildInputs enabledPlugins; in { inherit configureFlags buildInputs; diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix b/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix index 6191947ac3..829d249da5 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ddrescue"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; - sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"; + sha256 = "sha256-5RPNOpDZgQ392RGX1AqkD23wFZe/tez9+yBd4RJ8VR8="; }; nativeBuildInputs = [ lzip ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/fakechroot/default.nix b/third_party/nixpkgs/pkgs/tools/system/fakechroot/default.nix index 382a47039b..fd8fa04d21 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fakechroot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fakechroot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, nixosTests, perl }: stdenv.mkDerivation rec { pname = "fakechroot"; @@ -44,6 +44,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl ]; + passthru = { + tests = { + # A lightweight *unit* test that exercises fakeroot and fakechroot together: + nixos-etc = nixosTests.etc.test-etc-fakeroot; + }; + }; + meta = with lib; { homepage = "https://github.com/dex4er/fakechroot"; description = "Give a fake chroot environment through LD_PRELOAD"; diff --git a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix index c4d3845df8..bbf0dc2b08 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -1,47 +1,28 @@ -{ lib, stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, getopt +, libcap +, gnused +, nixosTests +}: stdenv.mkDerivation rec { - version = "1.23"; + version = "1.27"; pname = "fakeroot"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz"; - sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; + url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.gz"; + sha256 = "1p5d3jq6l1pzk96agkf05dck7dbgvldx5sg2d4h7d8h230nyni9w"; }; patches = lib.optionals stdenv.isLinux [ ./einval.patch - - # glibc 2.33 patches from ArchLinux (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; - sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; - sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; - sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8="; - }) - ] - # patchset from brew - ++ lib.optionals stdenv.isDarwin [ - (fetchpatch { - name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; - sha256 = "1m6ggrqwqy0in264sxqk912vniipiw629dxq7kibakvsswfk6bkk"; - }) - (fetchpatch { - name = "0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch;att=2;bug=766649"; - sha256 = "0rhayp42x4i1a6yc4d28kpshmf7lrmaprq64zfrjpdn4kbs0rkln"; - }) - (fetchpatch { - name = "fakeroot-always-pass-mode.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20"; - sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p"; + name = "also-wrap-stat-library-call.patch"; + url = "https://sources.debian.org/data/main/f/fakeroot/1.27-1/debian/patches/also-wrap-stat-library-call.patch"; + sha256 = "0p7lq6m31k3rqsnjbi06a8ykdqa3cp4y5ngsjyk3q1269gx59x8b"; }) ]; @@ -53,17 +34,12 @@ stdenv.mkDerivation rec { sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in ''; - postConfigure = let - # additional patch from brew, but needs to be applied to a generated file - patch-wraptmpf = fetchpatch { - name = "fakeroot-patch-wraptmpf-h.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=3;bug=766649;filename=fakeroot-patch-wraptmpf-h.patch;msg=20"; - sha256 = "1jhsi4bv6nnnjb4vmmmbhndqg719ckg860hgw98bli8m05zwbx6a"; + passthru = { + tests = { + # A lightweight *unit* test that exercises fakeroot and fakechroot together: + nixos-etc = nixosTests.etc.test-etc-fakeroot; }; - in lib.optional stdenv.isDarwin '' - make wraptmpf.h - patch -p1 < ${patch-wraptmpf} - ''; + }; meta = { homepage = "https://salsa.debian.org/clint/fakeroot"; @@ -72,5 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [viric]; platforms = lib.platforms.unix; }; - } diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index a771e3967c..41e4d99f6a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.12.1"; + version = "5.13.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pXHMNyebUkHEZvUWtDkyp5Fqk07GA5sd+254fls8PjU="; + sha256 = "sha256-bUzL9QkSgzJePBnGSYQvsKC975ss5b3kBdIgwgGzEtk="; }; - vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; + vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix b/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix index 22918f1414..9613ab8d65 100644 --- a/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix @@ -1,18 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { - pname = "goreman"; - version = "0.2.1"; +{ lib, buildGoModule, fetchFromGitHub }: - goPackagePath = "github.com/mattn/goreman"; - subPackages = ["."]; +buildGoModule rec { + pname = "goreman"; + version = "0.3.9"; + rev = "df1209e7cdbad10aecc0aa75d332bc32822925f5"; src = fetchFromGitHub { owner = "mattn"; repo = "goreman"; rev = "v${version}"; - sha256 = "1h7ip788j7bkygahpp7ylgnrx9jrbhwjzqpjhd1pflmlaxcbflcy"; + sha256 = "1irjf5i5ybdchyn42bamfq8pj3w00p633h1gg202n0vsr39h0bxw"; }; + ldflags = [ + "-s" + "-w" + "-X main.revision=${builtins.substring 0 7 rev}" + ]; + + vendorSha256 = "sha256-+RFh6Ppxxs7P7DWqOBeEJTvPsBgOfopMjx22hPEI1/U="; + + doCheck = false; + meta = with lib; { description = "foreman clone written in go language"; homepage = "https://github.com/mattn/goreman"; @@ -20,4 +29,3 @@ buildGoPackage rec { maintainers = with maintainers; [ zimbatm ]; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix index 7fc247c8a5..3edc6d4694 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-c+9IZEKiW95JIh6krs9NhdBohUatTTEIYBU13kj9zB8="; + vendorSha256 = "sha256-WwHaprq4+4uduiKpNu5iVcV6qJsYX/aSXJAJWpbDVqc="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/iops/default.nix b/third_party/nixpkgs/pkgs/tools/system/iops/default.nix deleted file mode 100644 index b2be488673..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/iops/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "iops"; - version = "0.1"; - - src = fetchurl { - url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz"; - sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; - }; - - installPhase = '' - mkdir -p $out/bin - cp iops $out/bin - ''; - - meta = with lib; { - description = "Measure I/O operations per second of a storage device"; - longDescription = '' - Iops lets you measure how many I/O operations per second a storage device can perform. - Usefull for determing e.g. the best RAID-setting of your storage device. - ''; - homepage = "http://www.vanheusden.com/iops/"; - license = licenses.gpl2; - maintainers = with maintainers; [ davidak ]; - platforms = platforms.linux; # build problems on Darwin - }; -} - diff --git a/third_party/nixpkgs/pkgs/tools/system/proot/default.nix b/third_party/nixpkgs/pkgs/tools/system/proot/default.nix index cf5a845827..d11cd8382c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/proot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/proot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , talloc , pkg-config , libarchive @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "proot"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; rev = "v${version}"; - sha256 = "1ir3a7rp9rvpv9i8gjrkr383sqadgl7f9nflcrfg7q05bxapwiws"; + sha256 = "sha256-89d1a5QBusra0vd3Ph0lQalXrblBwogi6bNgvvpQL+Q="; }; postPatch = '' @@ -26,13 +26,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libarchive talloc ] ++ lib.optional enablePython python3; nativeBuildInputs = [ pkg-config docutils ] ++ lib.optional enablePython swig; - patches = [ - # without this patch the package does not build with python>3.7 - (fetchpatch { - url = "https://github.com/proot-me/proot/pull/285.patch"; - sha256= "1vncq36pr4v0h63fijga6zrwlsb0vb4pj25zxf1ni15ndxv63pxj"; - }) - ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix index 8da87ecfa7..a564c946bc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "thinkfan"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "vmatare"; repo = "thinkfan"; rev = version; - sha256 = "sha256-ZCZqi7A4qdWtDSkTw6ktHIZnPhdes2AX7+QBroaDDfI="; + sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix index 42784d65a7..8b8a8a7b77 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 = "0.9.4"; + version = "0.10.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 = "1l5ryhwifhff41r4z1d2lifpvjcc4yi1vzrzlvkx3iy9dmxqcssl"; + vendorSha256 = "09b718vjd6npg850fr7z6srs2sc5vsr7byzlz5yb5qx0vm3ajxpf"; 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 9bfc8d9c2c..224bb4328d 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": "6520148857c2ae3106ff371e527abea815b23915", - "date": "2021-10-17T08:46:20+11:00", - "path": "/nix/store/0s8a46d1nyjl3yhsgni2jz5vdv95cka8-chroma", - "sha256": "1iy6mymdjxbl5wbll1mivv7gqdyqhl6xpfqps99z307m7y38r1ni", + "rev": "36bdd4b98823bd1d7be96767cde3dd575e60b406", + "date": "2022-01-12T21:49:38+11:00", + "path": "/nix/store/951ya4wlxp217a2j3qdni29zwqfq0z7v-chroma", + "sha256": "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix index ee86bcd635..729a0900f8 100644 --- a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -2,27 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.12.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU="; + sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE="; }; - cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4="; - - postPatch = '' - pushd vendor - for grammar in */; do - if [ -d "${tree-sitter.grammars}/$grammar" ]; then - rm -r "$grammar" - ln -s "${tree-sitter.grammars}/$grammar" - fi - done - popd - ''; + cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94="; meta = with lib; { description = "A syntax-aware diff"; diff --git a/third_party/nixpkgs/pkgs/tools/text/gpt2tc/default.nix b/third_party/nixpkgs/pkgs/tools/text/gpt2tc/default.nix index 3714a41854..4d6ac33d61 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gpt2tc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gpt2tc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Text completion and compression using GPT-2"; - homepage = "https://bellard.org/nncp/gpt2tc.html"; + homepage = "https://bellard.org/libnc/gpt2tc.html"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ anna328p ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix index c230278c0a..1362591e24 100644 --- a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -1,26 +1,38 @@ -{ - mkDerivation, lib, fetchurl, - extra-cmake-modules, kdoctools, wrapGAppsHook, - kcrash, kconfig, kinit, kparts, kiconthemes +{ mkDerivation +, lib +, fetchurl +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, boost +, kcrash +, kconfig +, kinit +, kparts +, kiconthemes }: mkDerivation rec { pname = "kdiff3"; - version = "1.8.5"; + version = "1.9.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vJL30E6xI/nFbb4wR69nv3FSQPqZSHrB0czypF4IVME="; + sha256 = "sha256-oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo="; }; + buildInputs = [ boost ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; + cmakeFlags = [ "-Wno-dev" ]; + meta = with lib; { + description = "Compares and merges 2 or 3 files or directories"; homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/link-grammar/default.nix b/third_party/nixpkgs/pkgs/tools/text/link-grammar/default.nix index 3a6686dba5..c685ef6033 100644 --- a/third_party/nixpkgs/pkgs/tools/text/link-grammar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/link-grammar/default.nix @@ -13,13 +13,13 @@ let link-grammar = stdenv.mkDerivation rec { pname = "link-grammar"; - version = "5.9.1"; + version = "5.10.2"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-4D/rqoIGlvR+q7Az8E1xPYSQQMJMRVeRM9HQIbjssLo="; + sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix index 741bc652e5..0d81895d20 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-maYFOlWNqKFmyDM2nDF25rzYnUXMlV9Ry9TMoXReUUg="; + sha256 = "sha256-AUhJwAi1rdM7tw8rm8lSQ1tBu+NtxMgVRB2sat4Dyps="; }; - cargoSha256 = "sha256-GL5Z4KfRu0zQAzVCWRIhaYtG5FrDdQabsbyFX7SjZvg="; + cargoSha256 = "sha256-0j1cSTH3lK/knJBUH+B7qBdRh8cBqB8hNz7i3vN2+tE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/patchutils/generic.nix b/third_party/nixpkgs/pkgs/tools/text/patchutils/generic.nix index 923dd06d18..d1cd4334e1 100644 --- a/third_party/nixpkgs/pkgs/tools/text/patchutils/generic.nix +++ b/third_party/nixpkgs/pkgs/tools/text/patchutils/generic.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ perl ] ++ extraBuildInputs; hardeningDisable = [ "format" ]; + # tests fail when building in parallel + enableParallelBuilding = false; + postInstall = '' for bin in $out/bin/{splitdiff,rediff,editdiff,dehtmldiff}; do wrapProgram "$bin" \ diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix index 5757db1e87..8fc299fa6c 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 rec { pname = "ugrep"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hEP7Oe1CNLEvSfUIXoXwRJUG4kIkb2f1549cZRXK+NY="; + hash = "sha256-5ZlZ/nCUOiyOWagF1Vla945d7zKbMsHp56ZE4HwdEP4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 8303e46e46..67a7b03f18 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.14.0"; + version = "2.15.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-4kFd2ULap9kcMu81Lu0SxER7xDAnVVyi9yAVsS1yhnw="; + sha256 = "sha256-HWekPMrQYTizyiRu9QSztZfZXsDmybXYarj6alGWJag="; }; - vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY="; + vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; postInstall = '' mkdir -p $data/share/vale diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile index 9e65ac43af..cfeefff2f0 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile @@ -5,6 +5,7 @@ gem 'asciidoctor-diagram' gem 'asciidoctor-epub3' gem 'asciidoctor-html5s' gem 'asciidoctor-mathematical' +gem 'asciidoctor-multipage' gem 'asciidoctor-pdf' gem 'asciidoctor-revealjs' gem 'asciidoctor-rouge' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock index 98418e183d..5b0e79aa2b 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock @@ -5,7 +5,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.16) + asciidoctor (2.0.17) asciidoctor-bibtex (0.8.0) asciidoctor (~> 2.0) bibtex-ruby (~> 5.1) @@ -30,7 +30,9 @@ GEM asciidoctor (~> 2.0) asciimath (~> 2.0) mathematical (~> 1.6.0) - asciidoctor-pdf (1.6.1) + asciidoctor-multipage (0.0.15) + asciidoctor (>= 2.0.11, < 2.1) + asciidoctor-pdf (1.6.2) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) prawn (~> 2.4.0) @@ -62,7 +64,7 @@ GEM rexml csl-styles (1.0.1.11) csl (~> 1.0) - css_parser (1.10.0) + css_parser (1.11.0) addressable gepub (1.0.15) nokogiri (>= 1.8.2, < 2.0) @@ -75,14 +77,14 @@ GEM ruby-enum (~> 0.4) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) - mini_portile2 (2.6.1) + mime-types-data (3.2022.0105) + mini_portile2 (2.7.1) namae (1.1.1) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) pdf-core (0.9.0) - pdf-reader (2.6.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -104,10 +106,10 @@ GEM pdf-reader (~> 2.0) prawn (~> 2.2) public_suffix (4.0.6) - pygments.rb (2.2.0) + pygments.rb (2.3.0) racc (1.6.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) ruby-enum (0.9.0) i18n ruby-rc4 (0.1.5) @@ -128,6 +130,7 @@ DEPENDENCIES asciidoctor-epub3 asciidoctor-html5s asciidoctor-mathematical + asciidoctor-multipage asciidoctor-pdf asciidoctor-revealjs asciidoctor-rouge diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix index 6bb0eac62f..c4aa7fa4a2 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix @@ -10,8 +10,9 @@ bundlerApp { exes = [ "asciidoctor" - "asciidoctor-pdf" "asciidoctor-epub3" + "asciidoctor-multipage" + "asciidoctor-pdf" "asciidoctor-revealjs" ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix index e88f9701d0..498653c12f 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2"; + sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; type = "gem"; }; - version = "2.0.16"; + version = "2.0.17"; }; asciidoctor-bibtex = { dependencies = ["asciidoctor" "bibtex-ruby" "citeproc-ruby" "csl-styles" "latex-decode"]; @@ -115,16 +115,27 @@ }; version = "0.3.5"; }; + asciidoctor-multipage = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1372213kxw1b9k120dmyackafzsk80h1y2n0r1hmfrri26kczgfb"; + type = "gem"; + }; + version = "0.0.15"; + }; asciidoctor-pdf = { dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk"; + sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; asciidoctor-revealjs = { dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"]; @@ -239,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; gepub = { dependencies = ["nokogiri" "rubyzip"]; @@ -313,20 +324,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.1115"; + version = "3.2022.0105"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.1"; }; namae = { groups = ["default"]; @@ -344,10 +355,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.1"; }; pdf-core = { groups = ["default"]; @@ -365,10 +376,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; + sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; polyglot = { groups = ["default"]; @@ -450,10 +461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb"; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; racc = { groups = ["default"]; @@ -480,10 +491,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; type = "gem"; }; - version = "3.26.1"; + version = "3.27.0"; }; ruby-enum = { dependencies = ["i18n"]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 5c607d269b..7652239b99 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -5,8 +5,8 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.16) - asciidoctor-pdf (1.6.1) + asciidoctor (2.0.17) + asciidoctor-pdf (1.6.2) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) prawn (~> 2.4.0) @@ -18,11 +18,11 @@ GEM treetop (~> 1.6.0) coderay (1.1.3) concurrent-ruby (1.1.9) - css_parser (1.10.0) + css_parser (1.11.0) addressable hashery (2.1.2) pdf-core (0.9.0) - pdf-reader (2.6.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -44,9 +44,9 @@ GEM pdf-reader (~> 2.0) prawn (~> 2.2) public_suffix (4.0.6) - pygments.rb (2.2.0) + pygments.rb (2.3.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) ruby-rc4 (0.1.5) safe_yaml (1.0.5) treetop (1.6.11) diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix index b57d1e5ac4..d87c6c1fa9 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2"; + sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; type = "gem"; }; - version = "2.0.16"; + version = "2.0.17"; }; asciidoctor-pdf = { dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"]; @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk"; + sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; coderay = { groups = ["default"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; hashery = { groups = ["default"]; @@ -108,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; + sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; polyglot = { groups = ["default"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb"; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; rexml = { groups = ["default"]; @@ -213,10 +213,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; type = "gem"; }; - version = "3.26.1"; + version = "3.27.0"; }; ruby-rc4 = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix index 9e9e818bb5..958ba9f88d 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1dw8qs5y2m90vhjsxpnvnr8blq0ld2fvny5ir8zjharja7wny24i"; + sha256 = "0ilnb4gmrj5h5i4q7pl2pyd6n2rdc358x7r163ap0dszypq6f0si"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/video/dvgrab/default.nix b/third_party/nixpkgs/pkgs/tools/video/dvgrab/default.nix index 9f4b8832f3..c5bb05853b 100644 --- a/third_party/nixpkgs/pkgs/tools/video/dvgrab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/dvgrab/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS. ''; - homepage = "http://kinodv.org/"; + homepage = "https://github.com/ddennedy/dvgrab"; # Formerly http://www.kinodv.org/ license = licenses.gpl2Plus; platforms = platforms.gnu ++ platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/video/mjpegtools/default.nix b/third_party/nixpkgs/pkgs/tools/video/mjpegtools/default.nix index 77c187a48a..4d9fdfd782 100644 --- a/third_party/nixpkgs/pkgs/tools/video/mjpegtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/mjpegtools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A suite of programs for processing MPEG or MJPEG video"; homepage = "http://mjpeg.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix index e35057fb88..ed6a8f5423 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -4,14 +4,14 @@ let rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; in rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.5.0"; + version = "0.5.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3g2wqQJk26KUfzmneKdTxfNSRI/ioMa5MR6AEeR7eKs="; + sha256 = "sha256-v2i/dMWos+nB3cRDOkROSOPb1ONRosbmp9RDZI2DLeI="; }; - cargoSha256 = "sha256-sPUAWQj8UDHV7IvYnerASltSPPGVB7f1tThqFYBu6t4="; + cargoSha256 = "sha256-V9QbztkFj3t5yBV+yySysDy3Q6IUY4gNzBL8h23aEg4="; nativeBuildInputs = [ nasm cargo-c ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; 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 6bc070d2cb..9da4290dad 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,11 +1,14 @@ { lib +, nixosTests , buildPythonApplication , cloud-utils , dmidecode , fetchFromGitHub +, iproute2 , openssh , python3 , shadow +, systemd }: python3.pkgs.buildPythonApplication rec { @@ -25,6 +28,13 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace setup.py \ --replace /lib/systemd $out/lib/systemd + + substituteInPlace cloudinit/net/networkd.py \ + --replace "['/usr/sbin', '/bin']" "['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']" + + substituteInPlace tests/unittests/test_net_activators.py \ + --replace "['/usr/sbin', '/bin']" \ + "['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']" ''; postInstall = '' @@ -108,6 +118,8 @@ python3.pkgs.buildPythonApplication rec { "cloudinit" ]; + passthru.tests.cloud-init = nixosTests.cloud-init; + meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-utils/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/ec2-utils/default.nix deleted file mode 100644 index 2832191084..0000000000 --- a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-utils/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, lib, rpmextract, fetchurl, python2, tree }: - -stdenv.mkDerivation { - pname = "ec2-utils"; - version = "0.5.1"; - - # The url can be determined by booting an "Amazon Linux 2" and running: - # > yumdownloader --urls ec2-utils - src = fetchurl { - url = "http://amazonlinux.ap-northeast-1.amazonaws.com/blobstore/a3b4d2c35c2300518fe10381a05b3bd7936ff5cdd3d351143a11bf84073d9e00/ec2-utils-0.5-1.amzn2.0.1.noarch.rpm"; - sha256 = "004y7l3q9gqi78a53lykrpsnz4yp7dds1083w67m2013bk1x5d53"; - }; - - nativeBuildInputs = [ rpmextract ]; - - buildInputs = [ python2 ]; - - unpackPhase = '' - mkdir source - cd source - rpmextract "$src" - ''; - - installPhase = '' - mkdir $out - - mv --target-directory $out \ - etc sbin usr/bin usr/lib - ''; - - postFixup = '' - for i in $out/etc/udev/rules.d/*.rules; do - substituteInPlace "$i" \ - --replace '/sbin' "$out/bin" - done - - substituteInPlace "$out/etc/udev/rules.d/70-ec2-nvme-devices.rules" \ - --replace 'ec2nvme-nsid' "$out/lib/udev/ec2nvme-nsid" - ''; - - meta = { - description = "A set of tools for running in EC2"; - homepage = "https://aws.amazon.com/amazon-linux-ami/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thefloweringash ]; - }; -} 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 new file mode 100644 index 0000000000..a4ebd2db8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -0,0 +1,53 @@ +{ buildGoModule, fetchFromGitHub, fetchpatch, lib, coreutils, makeWrapper +, google-guest-configs, google-guest-oslogin, iproute2, dhcp, procps +}: + +buildGoModule rec { + pname = "guest-agent"; + version = "20220104.00"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = pname; + rev = version; + sha256 = "sha256-BC2qpnGJU/D0z8jlmAEwvmFwBk1n0ZvqPBB6Zon9N/U="; + }; + + vendorSha256 = "sha256-YcWKSiN715Z9lmNAQx+sHEgxWnhFhenCNXBS7gdMV4M="; + + patches = [ ./disable-etc-mutation.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + substitute ${./fix-paths.patch} fix-paths.patch \ + --subst-var out \ + --subst-var-by true "${coreutils}/bin/true" + patch -p1 < ./fix-paths.patch + ''; + + # 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 ]; + + # Skip tests which require networking. + preCheck = '' + rm google_guest_agent/wsfc_test.go + ''; + + postInstall = '' + mkdir -p $out/etc/systemd/system + cp *.service $out/etc/systemd/system + install -Dm644 instance_configs.cfg $out/etc/default/instance_configs.cfg + + wrapProgram $out/bin/google_guest_agent \ + --prefix PATH ":" "$binPath" + ''; + + meta = with lib; { + homepage = "https://github.com/GoogleCloudPlatform/guest-agent"; + description = "Guest Agent for Google Compute Engine"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch new file mode 100644 index 0000000000..fe076baacd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch @@ -0,0 +1,54 @@ +From 2e8060f9ade13ba18ae5930c0781227bfcce11a5 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Mon, 10 Jan 2022 22:16:38 +0300 +Subject: [PATCH] Disable accounts setup phase and oslogin + +On NixOS we set up necessary groups and sudoers rules declaratively, +and have most of `/etc` directory read-only. This creates (harmless) +error messages when trying to create google-sudoers file. + +"oslogin" daemon sets up configuration necessary for OS Login to +work, including PAM, NSS and sudoers. On NixOS we perform all this +configuration declaratively and have most of /etc mounted read-only. +This creates (harmless) error messages when running the daemon. +--- + google_guest_agent/non_windows_accounts.go | 9 --------- + google_guest_agent/oslogin.go | 2 +- + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/google_guest_agent/non_windows_accounts.go b/google_guest_agent/non_windows_accounts.go +index 81013e3..05b830f 100644 +--- a/google_guest_agent/non_windows_accounts.go ++++ b/google_guest_agent/non_windows_accounts.go +@@ -104,15 +104,6 @@ func (a *accountsMgr) set() error { + sshKeys = make(map[string][]string) + } + +- logger.Debugf("create sudoers file if needed") +- if err := createSudoersFile(); err != nil { +- logger.Errorf("Error creating google-sudoers file: %v.", err) +- } +- logger.Debugf("create sudoers group if needed") +- if err := createSudoersGroup(); err != nil { +- logger.Errorf("Error creating google-sudoers group: %v.", err) +- } +- + mdkeys := newMetadata.Instance.Attributes.SSHKeys + if !newMetadata.Instance.Attributes.BlockProjectKeys { + mdkeys = append(mdkeys, newMetadata.Project.Attributes.SSHKeys...) +diff --git a/google_guest_agent/oslogin.go b/google_guest_agent/oslogin.go +index d05f733..980e84c 100644 +--- a/google_guest_agent/oslogin.go ++++ b/google_guest_agent/oslogin.go +@@ -76,7 +76,7 @@ func (o *osloginMgr) timeout() bool { + } + + func (o *osloginMgr) disabled(os string) bool { +- return os == "windows" ++ return true + } + + func (o *osloginMgr) set() error { +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch new file mode 100644 index 0000000000..07bb112ae2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch @@ -0,0 +1,43 @@ +diff --git a/google-guest-agent.service b/google-guest-agent.service +index 79b8e39..a39097b 100644 +--- a/google-guest-agent.service ++++ b/google-guest-agent.service +@@ -14,7 +14,7 @@ PartOf=network.service networking.service NetworkManager.service systemd-network + + [Service] + Type=notify +-ExecStart=/usr/bin/google_guest_agent ++ExecStart=@out@/bin/google_guest_agent + OOMScoreAdjust=-999 + Restart=always + +diff --git a/google-shutdown-scripts.service b/google-shutdown-scripts.service +index 16bb9c2..ae02067 100644 +--- a/google-shutdown-scripts.service ++++ b/google-shutdown-scripts.service +@@ -5,10 +5,10 @@ After=network-online.target rsyslog.service + + [Service] + Type=oneshot +-ExecStart=/bin/true ++ExecStart=@true@ + RemainAfterExit=true + # This service does nothing on start, and runs shutdown scripts on stop. +-ExecStop=/usr/bin/google_metadata_script_runner shutdown ++ExecStop=@out@/bin/google_metadata_script_runner shutdown + TimeoutStopSec=0 + KillMode=process + +diff --git a/google-startup-scripts.service b/google-startup-scripts.service +index dfc9838..2465265 100644 +--- a/google-startup-scripts.service ++++ b/google-startup-scripts.service +@@ -6,7 +6,7 @@ Before=apt-daily.service + + [Service] + Type=oneshot +-ExecStart=/usr/bin/google_metadata_script_runner startup ++ExecStart=@out@/bin/google_metadata_script_runner startup + #TimeoutStartSec is ignored for Type=oneshot service units. + KillMode=process + 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 new file mode 100644 index 0000000000..dd3c01c622 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, substituteAll +, ipcalc, iproute2, util-linux, coreutils, ethtool, gnugrep, gnused, nvme-cli }: + +stdenv.mkDerivation rec { + pname = "google-guest-configs"; + version = "20211116.00"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "guest-configs"; + rev = version; + sha256 = "sha256-0SRu6p/DsHNNI20mkXJitt/Ee5S2ooiy5hNmD+ndecM="; + }; + + binDeps = lib.makeBinPath [ coreutils util-linux gnugrep gnused ethtool ipcalc iproute2 ]; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + postPatch = '' + substitute ${./fix-paths.patch} fix-paths.patch \ + --subst-var out \ + --subst-var-by nvme "${nvme-cli}/bin/nvme" \ + --subst-var-by sh "${stdenv.shell}" \ + --subst-var-by umount "${util-linux}/bin/umount" \ + --subst-var-by logger "${util-linux}/bin/logger" + patch -p1 < ./fix-paths.patch + ''; + + installPhase = '' + mkdir -p $out/{bin,etc,lib} + cp -r src/etc/{modprobe.d,sysctl.d} $out/etc + cp -r src/lib/udev $out/lib + cp -r src/sbin/* $out/bin + cp -r src/usr/bin/* $out/bin + + for i in $out/bin/* $out/lib/udev/google_nvme_id; do + wrapProgram "$i" \ + --prefix "PATH" ":" "$binDeps" + done + ''; + + meta = with lib; { + homepage = "https://github.com/GoogleCloudPlatform/guest-configs"; + description = "Linux Guest Environment for Google Compute Engine"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch new file mode 100644 index 0000000000..7c9a86f106 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch @@ -0,0 +1,61 @@ +diff -ru3 source.old/src/lib/udev/google_nvme_id source.new/src/lib/udev/google_nvme_id +--- source.old/src/lib/udev/google_nvme_id 1970-01-01 03:00:01.000000000 +0300 ++++ source.new/src/lib/udev/google_nvme_id 2022-02-05 13:30:00.986242869 +0300 +@@ -17,7 +17,7 @@ + # the metadata server + + # Locations of the script's dependencies +-readonly nvme_cli_bin=/usr/sbin/nvme ++readonly nvme_cli_bin=@nvme@ + + # Bash regex to parse device paths and controller identification + readonly NAMESPACE_NUMBER_REGEX="/dev/nvme[[:digit:]]+n([[:digit:]]+).*" +diff -ru3 source.old/src/lib/udev/rules.d/64-gce-disk-removal.rules source.new/src/lib/udev/rules.d/64-gce-disk-removal.rules +--- source.old/src/lib/udev/rules.d/64-gce-disk-removal.rules 1970-01-01 03:00:01.000000000 +0300 ++++ source.new/src/lib/udev/rules.d/64-gce-disk-removal.rules 2022-02-05 13:27:42.635300567 +0300 +@@ -14,4 +14,4 @@ + # + # When a disk is removed, unmount any remaining attached volumes. + +-ACTION=="remove", SUBSYSTEM=="block", KERNEL=="sd*|vd*|nvme*", RUN+="/bin/sh -c '/bin/umount -fl /dev/$name && /usr/bin/logger -p daemon.warn -s WARNING: hot-removed /dev/$name that was still mounted, data may have been corrupted'" ++ACTION=="remove", SUBSYSTEM=="block", KERNEL=="sd*|vd*|nvme*", RUN+="@sh@ -c '@umount@ -fl /dev/$name && @logger@ -p daemon.warn -s WARNING: hot-removed /dev/$name that was still mounted, data may have been corrupted'" +diff -ru3 source.old/src/lib/udev/rules.d/65-gce-disk-naming.rules source.new/src/lib/udev/rules.d/65-gce-disk-naming.rules +--- source.old/src/lib/udev/rules.d/65-gce-disk-naming.rules 1970-01-01 03:00:01.000000000 +0300 ++++ source.new/src/lib/udev/rules.d/65-gce-disk-naming.rules 2022-02-05 13:27:05.053107964 +0300 +@@ -21,11 +21,11 @@ + KERNEL=="sd*|vd*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode" + + # NVME Local SSD naming +-KERNEL=="nvme*n*", ATTRS{model}=="nvme_card", PROGRAM="/bin/sh -c 'nsid=$$(echo %k|sed -re s/nvme[0-9]+n\([0-9]+\).\*/\\1/); echo $$((nsid-1))'", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-%c" ++KERNEL=="nvme*n*", ATTRS{model}=="nvme_card", PROGRAM="@sh@ -c 'nsid=$$(echo %k|sed -re s/nvme[0-9]+n\([0-9]+\).\*/\\1/); echo $$((nsid-1))'", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-%c" + KERNEL=="nvme*", ATTRS{model}=="nvme_card", ENV{ID_SERIAL}="Google_EphemeralDisk_$env{ID_SERIAL_SHORT}" + + # NVME Persistent Disk Naming +-KERNEL=="nvme*n*", ATTRS{model}=="nvme_card-pd", IMPORT{program}="google_nvme_id -d $tempnode" ++KERNEL=="nvme*n*", ATTRS{model}=="nvme_card-pd", IMPORT{program}="@out@/lib/udev/google_nvme_id -d $tempnode" + + # Symlinks + KERNEL=="sd*|vd*|nvme*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}" +diff -ru3 source.old/src/sbin/google-dhclient-script source.new/src/sbin/google-dhclient-script +--- source.old/src/sbin/google-dhclient-script 1970-01-01 03:00:01.000000000 +0300 ++++ source.new/src/sbin/google-dhclient-script 2022-02-05 13:29:37.430058984 +0300 +@@ -31,7 +31,6 @@ + # This script is found in EL 7 and used to fix local routing in EL 6. + # ---------- + +-PATH=/bin:/usr/bin:/sbin + # scripts in dhclient.d/ use $SAVEDIR (#833054) + SAVEDIR=/var/lib/dhclient + +@@ -58,9 +57,9 @@ + if need_hostname; then + status=1 + if [ -n "${new_ip_address}" ]; then +- eval $(/bin/ipcalc --silent --hostname ${new_ip_address} ; echo "status=$?") ++ eval $(ipcalc --silent --hostname ${new_ip_address} ; echo "status=$?") + elif [ -n "${new_ip6_address}" ]; then +- eval $(/bin/ipcalc --silent --hostname ${new_ip6_address} ; echo "status=$?") ++ eval $(ipcalc --silent --hostname ${new_ip6_address} ; echo "status=$?") + fi + + if [ ${status} -eq 0 ]; then diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix similarity index 60% rename from third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix rename to third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 0718e437b0..6dceeecfd6 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -9,38 +9,39 @@ }: stdenv.mkDerivation rec { - pname = "google-compute-engine-oslogin"; - version = "20210429.00"; + pname = "google-guest-oslogin"; + version = "20211213.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "eHAg9K5oxcygEzqaac81jSFHF+zsW6uB7q2Kfo9hSrA="; + sha256 = "sha256-8RuLYdWfk8zPfoF06r5E/6eHQ7tziZbgGhZlLCUW600="; }; postPatch = '' # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace src/include/compat.h --replace /bin/bash ${bashInteractive}/bin/bash + substituteInPlace src/include/compat.h --replace /bin/bash /run/current-system/sw/bin/bash ''; - buildInputs = [ curl.dev pam ]; + buildInputs = [ curl.dev pam json_c ]; - NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c"; - NIX_CFLAGS_LINK = "-L${json_c}/lib"; + NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" ]; makeFlags = [ "VERSION=${version}" - "DESTDIR=${placeholder "out"}" - "PREFIX=/" - "BINDIR=/bin" - "LIBDIR=/lib" - "PAMDIR=/lib" - "MANDIR=/share/man" + "PREFIX=$(out)" + "MANDIR=$(out)/share/man" + "SYSTEMDDIR=$(out)/etc/systemd/system" + "PRESETDIR=$(out)/etc/systemd/system-preset" ]; + postInstall = '' + sed -i "s,/usr/bin/,$out/bin/,g" $out/etc/systemd/system/google-oslogin-cache.service + ''; + enableParallelBuilding = true; passthru.tests = { @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine"; license = licenses.asl20; + platforms = platforms.linux; maintainers = with maintainers; [ flokli ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index ade2b437c5..31a3e5dac4 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "0vyvmfrq3jnwqqjf2rsd5qnnwvvq71165ws7smnxk5jn8lqkq6z1"; + sha256 = "1f0nrdg8hf650qxz79i3a1d2zyf24niyrcnbnhc9i7hzbnqbp5qg"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.113.0"; - specSha256 = "0r02h6a75ad2yahff62ilmlcnp3w4j4djkx187zyh9kdvf1lzqb9"; + specVersion = "4.115.0"; + specSha256 = "1s9pis1jl6d8znkb8hwsv89wzf38bhjing4x4q9ggy038y7xkkwg"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.15.0"; + version = "5.17.1"; src = fetchFromGitHub { owner = "linode"; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix index 1e0e963b8e..c1bcf3b4e9 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-bmMfrwxdriE/o8fezLbmhorBDvjtC4vaVamwDtrxiMQ="; + sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go="; }; - cargoSha256 = "sha256-5hTiu2fGyMcbsg05hLngQXsjw3Vql2q8zlW5e6jD9Ok="; + cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA="; patches = [ ./icon-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix index 837b25d600..fd4db1a934 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { description = "Automatic brightness adjustment based on screen contents and ALS"; homepage = "https://github.com/maximbaz/wluma"; license = licenses.isc; - maintainers = with maintainers; [ yevhenshymotiuk jmc-figueira ]; + maintainers = with maintainers; [ yshym jmc-figueira ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 256ce30759..82cc419298 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -3,11 +3,11 @@ lib: self: super: with self; let - # Removing recurseForDerivation prevents derivations of aliased attribute - # set to appear while listing all the packages available. + # Removing recurseForDerivation prevents derivations of aliased attribute set + # to appear while listing all the packages available. removeRecurseForDerivations = alias: with lib; - if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + if alias.recurseForDerivations or false + then removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package @@ -17,119 +17,133 @@ let dontDistribute alias else alias; - # Make sure that we are not shadowing something from - # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n super - then throw "Alias ${n} is still in all-packages.nix" - else alias; + # Make sure that we are not shadowing something from all-packages.nix. + checkInPkgs = n: alias: + if builtins.hasAttr n super + then throw "Alias ${n} is still in all-packages.nix" + else alias; mapAliases = aliases: - lib.mapAttrs (n: alias: removeDistribute - (removeRecurseForDerivations - (checkInPkgs n alias))) - aliases; + lib.mapAttrs (n: alias: + removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; in - ### Deprecated aliases - for backward compatibility +### Deprecated aliases - for backward compatibility +### Please maintain this list in ASCIIbetical ordering. +### Hint: the "sections" are delimited by ### ### mapAliases ({ + # forceSystem should not be used directly in Nixpkgs. + # Added 2018-07-16 + forceSystem = system: _: + (import self.path { localSystem = { inherit system; }; }); + _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; - PPSSPP = ppsspp; # added 2017-10-01 - QmidiNet = qmidinet; # added 2016-05-22 - accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 - adobeReader = adobe-reader; # added 2013-11-04 - adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01 - aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - ag = silver-searcher; # added 2018-04-25 - aircrackng = aircrack-ng; # added 2016-01-14 - airtame = throw "airtame has been removed due to being unmaintained."; # added 2022-01-19 - aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 - alienfx = throw "alienfx has been removed."; # added 2019-12-08 - alsaLib = alsa-lib; # added 2021-06-09 - alsaOss = alsa-oss; # added 2021-06-10 - alsaPlugins = alsa-plugins; # added 2021-06-10 - alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 - alsaTools = alsa-tools; # added 2021-06-10 - alsaUtils = alsa-utils; # added 2021-06-10 - amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 - aminal = throw "aminal was renamed to darktile."; # added 2021-09-28 - ammonite-repl = ammonite; # added 2017-05-02 - amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 - angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 - antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06 - antimicroX = antimicrox; # added 2021-10-31 - arduino_core = arduino-core; # added 2015-02-04 - ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 - arora = throw "arora has been removed."; # added 2020-09-09 - asciidocFull = asciidoc-full; # added 2014-06-22 - asn1c = throw "asn1c has been removed: deleted by upstream"; # added 2022-01-07 - asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 - at_spi2_atk = at-spi2-atk; # added 2018-02-25 - at_spi2_core = at-spi2-core; # added 2018-02-25 - aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 - avldrums-lv2 = x42-avldrums; # added 2020-03-29 - avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18 - azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02 + + ### A ### + + accounts-qt = libsForQt5.accounts-qt; # Added 2015-12-19 + adobeReader = adobe-reader; # Added 2013-11-04 + adobe_flex_sdk = apache-flex-sdk; # Added 2018-06-01 + aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + ag = silver-searcher; # Added 2018-04-25 + aircrackng = aircrack-ng; # Added 2016-01-14 + airtame = throw "airtame has been removed due to being unmaintained."; # Added 2022-01-19 + aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # Added 2020-11-30 + alienfx = throw "alienfx has been removed."; # Added 2019-12-08 + alsaLib = alsa-lib; # Added 2021-06-09 + alsaOss = alsa-oss; # Added 2021-06-10 + alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 + alsaPlugins = alsa-plugins; # Added 2021-06-10 + alsaTools = alsa-tools; # Added 2021-06-10 + alsaUtils = alsa-utils; # Added 2021-06-10 + amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 + aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 + ammonite-repl = ammonite; # Added 2017-05-02 + amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 + angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 + antimicroX = antimicrox; # Added 2021-10-31 + ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 + arduino_core = arduino-core; # Added 2015-02-04 + arora = throw "arora has been removed."; # Added 2020-09-09 + asciidocFull = asciidoc-full; # Added 2014-06-22 + asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 + asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # Added 2020-10-07 + at_spi2_atk = at-spi2-atk; # Added 2018-02-25 + at_spi2_core = at-spi2-core; # Added 2018-02-25 + aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # Added 2020-12-26 + avldrums-lv2 = x42-avldrums; # Added 2020-03-29 + avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 + azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 + + ### B ### + badtouch = authoscope; # Project was renamed, added 20210626 - bar-xft = lemonbar-xft; # added 2015-01-16 - bashburn = throw "bashburn has been removed: deleted by upstream"; # added 2022-01-07 + bar-xft = lemonbar-xft; # Added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 - bash_5 = bash; # added 2021-08-20 - bashInteractive_5 = bashInteractive; # added 2021-08-20 - batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 - bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 - bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 - bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22 - beegfs = throw "beegfs has been removed."; # added 2019-11-24 - beret = throw "beret has been removed"; # added 2021-11-16 - blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # added 2022-01-01 + bashInteractive_5 = bashInteractive; # Added 2021-08-20 + bash_5 = bash; # Added 2021-08-20 + bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 + batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 + bazaar = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19 + bazaarTools = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19 + bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 + beegfs = throw "beegfs has been removed."; # Added 2019-11-24 + beret = throw "beret has been removed"; # Added 2021-11-16 + bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 + bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 + blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # Added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 - bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # added 2022-01-07 + bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 + bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # Added 2019-12-10 bpftool = bpftools; # Added 2021-05-03 - brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 - bridge_utils = bridge-utils; # added 2015-02-20 - bro = zeek; # added 2019-09-29 - bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 - bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10 - btrfsProgs = btrfs-progs; # added 2016-01-03 - bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # added 2021-08-22 + brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 + bridge_utils = bridge-utils; # Added 2015-02-20 + bro = zeek; # Added 2019-09-29 + btrfsProgs = btrfs-progs; # Added 2016-01-03 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; - bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-mysql = vaultwarden-mysql; bitwarden_rs-postgresql = vaultwarden-postgresql; + bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-vault = vaultwarden-vault; - blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # added 2022-01-12 - bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 - bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07 - btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 - buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 - buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 - buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 - buildkite-agent3 = buildkite-agent; # added 2018-09-26 - bundler_HEAD = bundler; # added 2015-11-15 - bunny = throw "bunny has been removed: deleted by upstream"; # added 2022-01-07 - bypass403 = throw "bypass403 has been removed: deleted by upstream"; # added 2022-01-07 - calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 - calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 - caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 - cantarell_fonts = cantarell-fonts; # added 2018-03-03 - cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # Added 2022-01-12 + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02 + bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 + buildPerlPackage = perlPackages.buildPerlPackage; # Added 2018-10-12 + buildkite-agent3 = buildkite-agent; # Added 2018-09-26 + bundler_HEAD = bundler; # Added 2015-11-15 + bunny = throw "bunny has been removed: deleted by upstream"; # Added 2022-01-07 + bypass403 = throw "bypass403 has been removed: deleted by upstream"; # Added 2022-01-07 + + ### C ### + + caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 + calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # Added 2021-01-13 + calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # Added 2021-01-13 + cantarell_fonts = cantarell-fonts; # Added 2018-03-03 + cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; - catfish = xfce.catfish; # added 2019-12-22 - ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # added 2021-03-25 - cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # added 2022-01-12 - cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 - checkbashism = checkbashisms; # added 2016-08-16 - chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 - chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # added 2022-01-07 + catfish = xfce.catfish; # Added 2019-12-22 + ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 + cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # Added 2022-01-12 + cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # Added 2020-06-05 + checkbashism = checkbashisms; # Added 2016-08-16 + chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 + chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; - cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 - cifs_utils = cifs-utils; # added 2016-08 - ckb = ckb-next; # added 2018-10-21 - creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01 + cifs_utils = cifs-utils; # Added 2016-08 + cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 + ckb = ckb-next; # Added 2018-10-21 + callPackage_i686 = pkgsi686Linux.callPackage; + creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 # these are for convenience, not for backward compat and shouldn't expire clang5Stdenv = lowPrio llvmPackages_5.stdenv; @@ -141,73 +155,84 @@ mapAliases ({ clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; - clangAnalyzer = clang-analyzer; # added 2015-02-20 - claws-mail-gtk3 = claws-mail; # added 2021-07-10 - clawsMail = claws-mail; # added 2016-04-29 - claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # added 2021-12-05 - clutter_gtk = clutter-gtk; # added 2018-02-25 - cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05 - codimd = hedgedoc; # added 2020-11-29 - compton = picom; # added 2019-12-02 - compton-git = compton; # added 2019-05-20 - concurrencykit = libck; # added 2021-03 - conntrack_tools = conntrack-tools; # added 2018-05 - cool-old-term = cool-retro-term; # added 2015-01-31 - coprthr = throw "coprthr has been removed."; # added 2019-12-08 - couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 - couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 - coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 - corsmisc = throw "corsmisc has been removed (upstream is gone)"; # added 2022-01-24 - cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 - cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # added 2022-01-07 - crafty = throw "crafty has been removed: deleted by upstream"; # 2022-01-07 - cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 - cpp-gsl = microsoft_gsl; # added 2019-05-24 - cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 - cupsBjnp = cups-bjnp; # added 2016-01-02 - cups_filters = cups-filters; # added 2016-08 - cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + clangAnalyzer = clang-analyzer; # Added 2015-02-20 + claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 + claws-mail-gtk3 = claws-mail; # Added 2021-07-10 + clawsMail = claws-mail; # Added 2016-04-29 + clutter_gtk = clutter-gtk; # Added 2018-02-25 + cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 + codimd = hedgedoc; # Added 2020-11-29 + compton = picom; # Added 2019-12-02 + compton-git = compton; # Added 2019-05-20 + concurrencykit = libck; # Added 2021-03 + conntrack_tools = conntrack-tools; # Added 2018-05 + cool-old-term = cool-retro-term; # Added 2015-01-31 + coprthr = throw "coprthr has been removed."; # Added 2019-12-08 + coredumper = throw "coredumper has been removed: abandoned by upstream."; # Added 2019-11-16 + corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 + couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 + couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 + cpp-gsl = microsoft_gsl; # Added 2019-05-24 + cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # Added 2020-11-30 + cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 + crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 + cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 + + # CUDA Toolkit + + cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; - 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 - cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 - cv = progress; # added 2015-09-06 - cvs_fast_export = cvs-fast-export; # added 2021-06-10 - d1x_rebirth = dxx-rebirth; # added 2018-04-25 - d2x_rebirth = dxx-rebirth; # added 2018-04-25 - dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 - dart_old = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 - dart_stable = dart; # added 2020-01-15 + cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # Added 2020-06-15 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + cupsBjnp = cups-bjnp; # Added 2016-01-02 + cups_filters = cups-filters; # Added 2016-08 + 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 + cv = progress; # Added 2015-09-06 + cvs_fast_export = cvs-fast-export; # Added 2021-06-10 + + ### D ### + + d1x_rebirth = dxx-rebirth; # Added 2018-04-25 + d2x_rebirth = dxx-rebirth; # Added 2018-04-25 + dart_dev = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 + dart_old = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 + dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; - dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20 - dbus_daemon = dbus.daemon; # added 2018-04-25 - dbus_glib = dbus-glib; # added 2018-02-25 - dbus_libs = dbus; # added 2018-04-25 - diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 - dbus_tools = dbus.out; # added 2018-04-25 - deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 + dbus_daemon = dbus.daemon; # Added 2018-04-25 + dbus_glib = dbus-glib; # Added 2018-02-25 + dbus_libs = dbus; # Added 2018-04-25 + dbus_tools = dbus.out; # Added 2018-04-25 + dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 + deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # Added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; + debian_devscripts = debian-devscripts; # added 2016-03-23 - debugedit-unstable = debugedit; # added 2021-11-22 + debugedit-unstable = debugedit; # Added 2021-11-22 deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 + deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 + deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 deltachat-electron = deltachat-desktop; # added 2021-07-18 + diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 + deluge-1_x = throw '' Deluge 1.x (deluge-1_x) is no longer supported. Please use Deluge 2.x (deluge-2_x) instead, for example: @@ -215,108 +240,133 @@ mapAliases ({ services.deluge.package = pkgs.deluge-2_x; Note that it is NOT possible to switch back to Deluge 1.x after this change. - ''; # added 2021-08-18 - desktop_file_utils = desktop-file-utils; # added 2018-02-25 - devicemapper = lvm2; # added 2018-04-25 - digikam5 = digikam; # added 2017-02-18 - displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # added 2022-01-12 - dmtx = dmtx-utils; # added 2018-04-25 - dnnl = oneDNN; # added 2020-04-22 - docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 - docbookrx = throw "docbookrx has been removed since it was unmaintained"; # added 2021-01-12 - docbook_xml_xslt = docbook_xsl; # added 2018-04-25 - dolphinEmu = dolphin-emu; # added 2021-11-10 - dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10 - dotnet-netcore = dotnet-runtime; # added 2021-10-07 - double_conversion = double-conversion; # 2017-11-22 - docker_compose = docker-compose; # 2018-11-10 - draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 - dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 - dwarf_fortress = dwarf-fortress; # added 2016-01-23 - dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 - dylibbundler = macdylibbundler; # added 2021-04-24 - ec2_ami_tools = ec2-ami-tools; # added 2021-10-08 - ec2_api_tools = ec2-api-tools; # added 2021-10-08 - elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 - elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 - electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2021-01-06 - electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2021-01-06 - electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2021-01-06 - electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2021-01-06 - electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # added 2022-01-01 - emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 - emacsPackagesNg = emacs.pkgs; # added 2019-08-07 - emacs27Packages = emacs27.pkgs; # added 2020-12-18 - emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 - emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 - emacsPackages = emacs.pkgs; # added 2020-12-18 - enblendenfuse = enblend-enfuse; # 2015-09-30 - envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - epoxy = libepoxy; # 2021-11-11 - esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12 - euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # added 2022-01-01 - evolution_data_server = evolution-data-server; # added 2018-02-25 - etcdctl = etcd; # added 2018-04-25 - evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # added 2022-01-14 - exfat-utils = exfat; # 2015-09-11 - facette = throw "facette has been removed."; # added 2020-01-06 - 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 - fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13 - fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; - ffadoFull = ffado; # added 2018-05-01 - firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs"; - firefox-esr-wrapper = firefox-esr; # 2016-01 - firefox-wrapper = firefox; # 2016-01 - firefoxWrapper = firefox; # 2015-09 + ''; # Added 2021-08-18 + + demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 + desktop_file_utils = desktop-file-utils; # Added 2018-02-25 + devicemapper = lvm2; # Added 2018-04-25 + digikam5 = digikam; # Added 2017-02-18 + displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # Added 2022-01-12 + dmtx = dmtx-utils; # Added 2018-04-25 + dnnl = oneDNN; # Added 2020-04-22 + docbook5_xsl = docbook_xsl_ns; # Added 2018-04-25 + docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 + docbook_xml_xslt = docbook_xsl; # Added 2018-04-25 + docker_compose = docker-compose; # Added 2018-11-10 + dolphinEmu = dolphin-emu; # Added 2021-11-10 + dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 + dotnet-netcore = dotnet-runtime; # Added 2021-10-07 + double_conversion = double-conversion; # Added 2017-11-22 + draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 + dvb_apps = throw "dvb_apps has been removed."; # Added 2020-11-03 + dwarf_fortress = dwarf-fortress; # Added 2016-01-23 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # Added 2021-02-07 + dylibbundler = macdylibbundler; # Added 2021-04-24 + + ### E ### + + + ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 + ec2_api_tools = ec2-api-tools; # Added 2021-10-08 + ec2-utils = amazon-ec2-utils; # Added 2022-02-01 + elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 + elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + + # Electron + electron_3 = throw "electron_3 has been removed in favor of newer versions"; # Added 2021-01-06 + electron_4 = throw "electron_4 has been removed in favor of newer versions"; # Added 2021-01-06 + electron_5 = throw "electron_5 has been removed in favor of newer versions"; # Added 2021-01-06 + electron_6 = throw "electron_6 has been removed in favor of newer versions"; # Added 2021-01-06 + + electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # Added 2022-01-01 + + # Emacs + emacs27Packages = emacs27.pkgs; # Added 2020-12-18 + emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18 + emacsPackages = emacs.pkgs; # Added 2020-12-18 + emacsPackagesGen = emacsPackagesFor; # Added 2018-08-18 + emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 + emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 + emacsPackagesNgGen = emacsPackagesFor; # Added 2018-08-18 + emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + + enblendenfuse = enblend-enfuse; # Added 2015-09-30 + encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 + envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + epoxy = libepoxy; # Added 2021-11-11 + esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 + etcdctl = etcd; # Added 2018-04-25 + euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # Added 2022-01-01 + evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # Added 2022-01-14 + evolution_data_server = evolution-data-server; # Added 2018-02-25 + exfat-utils = exfat; # Added 2015-09-11 + + ### F ### + + facette = throw "facette has been removed."; # Added 2020-01-06 + 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 + fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # Added 2021-04-13 + fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; + ffadoFull = ffado; # Added 2018-05-01 + firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25."; + firefox-esr-wrapper = firefox-esr; # Added 2016-01 + firefoxWrapper = firefox; # Added 2015-09 + firefox-wrapper = firefox; # Added 2016-01 + firestr = throw "firestr has been removed."; # Added 2019-12-08 + firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 + fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 + flameGraph = flamegraph; # Added 2018-04-25 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31 + flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25 + flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15 + flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15 + flvtool2 = throw "flvtool2 has been removed."; # Added 2020-11-03 + fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # Added 2022-01-26 + foldingathome = fahclient; # Added 2020-09-03 + font-awesome-ttf = font-awesome; # Added 2018-02-25 - firestr = throw "firestr has been removed."; # added 2019-12-08 - firmwareLinuxNonfree = linux-firmware; # added 2022-01-09 - fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 - flameGraph = flamegraph; # added 2018-04-25 - flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # added 2021-06-31 - flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 - flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 - flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 - flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 - fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # added 2022-01-26 - foldingathome = fahclient; # added 2020-09-03 - font-awesome-ttf = font-awesome; # 2018-02-25 - # 2019-10-31 fontconfig-ultimate = throw '' fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. https://github.com/bohoomil/fontconfig-ultimate/issues/171. - ''; + ''; # Added 2019-10-31 + fontconfig-penultimate = throw '' fontconfig-penultimate has been removed. It was a fork of the abandoned fontconfig-ultimate. - ''; - # 2020-07-21 + ''; # Added 2020-07-21 + fontconfig_210 = throw '' fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 and has only been used for old fontconfig caches. ''; - foomatic_filters = foomatic-filters; # 2016-08 - fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # 2021-11-07 + + foomatic_filters = foomatic-filters; # Added 2016-08 + fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # Added 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; - fuse_exfat = exfat; # 2015-09-11 - fuseki = apache-jena-fuseki; # added 2018-04-25 - fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 - g4py = python3Packages.geant4; # added 2020-06-06 - gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # added 2020-06-06 - gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03 - gdb-multitarget = gdb; # added 2017-11-13 - gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 - gettextWithExpat = gettext; # 2016-02-19 - getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12 - giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12 - git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 - gitAndTools = self // { # added 2021-01-14 + fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 + fuse_exfat = exfat; # Added 2015-09-11 + fuseki = apache-jena-fuseki; # Added 2018-04-25 + fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 + + ### G ### + + g4py = python3Packages.geant4; # Added 2020-06-06 + gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 + gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # Added 2021-04-03 + gdb-multitarget = gdb; # Added 2017-11-13 + gdk_pixbuf = gdk-pixbuf; # Added 2019-05-22 + getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # Added 2022-01-12 + gettextWithExpat = gettext; # Added 2016-02-19 + gfm = throw "gfm has been removed"; # Added 2021-01-15 + giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # Added 2022-01-23 + giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 + git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01 + + gitAndTools = self // { darcsToGit = darcs-to-git; gitAnnex = git-annex; gitBrunch = git-brunch; @@ -324,242 +374,289 @@ mapAliases ({ gitRemoteGcrypt = git-remote-gcrypt; svn_all_fast_export = svn-all-fast-export; topGit = top-git; - }; - gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # added 2021-12-07 - gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # added 2022-01-12 - glib_networking = glib-networking; # added 2018-02-25 - gmailieer = lieer; # added 2020-04-19 - gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08 - gnome-mpv = celluloid; # added 2019-08-22 - gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 - gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 - gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 - gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 - gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 - gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 - # Added 2020-10-16 + }; # Added 2021-01-14 + + gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 + gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # Added 2022-01-12 + gksu = throw "gksu has been removed"; # Added 2022-01-16 + glib_networking = glib-networking; # Added 2018-02-25 + gmailieer = lieer; # Added 2020-04-19 + gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 + gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 + gnash = throw "gnash has been removed; broken and abandoned upstream."; # added 2022-02-06 + gnome-passwordsafe = gnome-secrets; # added 2022-01-30 + gnome-mpv = celluloid; # Added 2019-08-22 + gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 + gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14 + gnome_user_docs = gnome-user-docs; # Added 2019-11-20 + gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2019-12-10 + gnome_doc_utils = gnome-doc-utils; # Added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # Added 2018-02-25 + gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # Added 2019-05-27 + gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ "osmosdr" "ais" "gsm" "nacl" "rds" "limesdr" ] gnuradio3_7Packages; - }; - gnuradio-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 - gnuradio-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 - gnuradio-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 - gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 - gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 - gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 - gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # added 2022-01-16 - gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 - gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 - gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 - gr-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 - gr-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 - gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 - gnustep-make = gnustep.make; # added 2016-7-6 - gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 - gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 + }; # Added 2020-10-16 + gmock = gtest; # moved from top-level 2021-03-14 - go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 - go-pup = pup; # added 2017-12-19 - gobby5 = gobby; # added 2021-02-01 - gobjectIntrospection = gobject-introspection; # added 2018-12-02 - goimports = gotools; # added 2018-09-16 - gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 - google-gflags = gflags; # added 2019-07-25 - google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 - google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 - googleAuthenticator = google-authenticator; # added 2016-10-16 - googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # added 2022-01-22 - grantlee5 = libsForQt5.grantlee; # added 2015-12-19 - graalvm8 = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 - graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 + + gnome3 = gnome; # Added 2021-05-07 + gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12 + gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 + gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gnustep-make = gnustep.make; # Added 2016-7-6 + gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 + go_1_12 = throw "go_1_12 has been removed"; # Added 2020-04-26 + gobby5 = gobby; # Added 2021-02-01 + gobjectIntrospection = gobject-introspection; # Added 2018-12-02 + gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 + goimports = gotools; # Added 2018-09-16 + gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 + googleAuthenticator = google-authenticator; # Added 2016-10-16 + googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 + google-gflags = gflags; # Added 2019-07-25 + google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + go-pup = pup; # Added 2017-12-19 + gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 + graalvm11 = graalvm11-ce; - grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # added 2022-01-05 - gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - gtk_doc = gtk-doc; # added 2018-02-25 - gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01 - guileCairo = guile-cairo; # added 2017-09-24 - guileGnome = guile-gnome; # added 2017-09-24 - gnome3 = gnome; # added 2021-05-07 - guileLint = guile-lint; # added 2017-09-27 - guile_lib = guile-lib; # added 2017-09-24 - guile_ncurses = guile-ncurses; # added 2017-09-24 - gupnp_av = gupnp-av; # added 2018-02-25 - gupnp_dlna = gupnp-dlna; # added 2018-02-25 - gupnp_igd = gupnp-igd; # added 2018-02-25 - gupnptools = gupnp-tools; # added 2015-12-19 - gutenberg = zola; # added 2018-11-17 - hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # added 2022-01-15 - hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - heimdalFull = heimdal; # added 2018-05-01 - hepmc = hepmc2; # added 2019-08-05 - hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 - hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 - holochain-go = throw "holochain-go was abandoned by upstream"; # added 2022-01-01 - ht-rust = xh; # added 2021-02-13 - htmlTidy = html-tidy; # added 2014-12-06 - hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 - iana_etc = iana-etc; # added 2017-03-08 - iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08 - icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 - icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 - idea = jetbrains; # added 2017-04-03 - imagemagick7_light = imagemagick_light; # added 2021-02-22 - imagemagick7 = imagemagick; # added 2021-02-22 - imagemagick7Big = imagemagickBig; # added 2021-02-22 + graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 + graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 + gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + grantlee5 = libsForQt5.grantlee; # Added 2015-12-19 + gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 + gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gsettings_desktop_schemas = gsettings-desktop-schemas; # Added 2018-02-25 + gtk_doc = gtk-doc; # Added 2018-02-25 + gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 + gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 + guileCairo = guile-cairo; # Added 2017-09-24 + guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 + guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 + guile_lib = guile-lib; # Added 2017-09-24 + guileLint = guile-lint; # Added 2017-09-27 + guile_ncurses = guile-ncurses; # Added 2017-09-24 + gupnp_av = gupnp-av; # Added 2018-02-25 + gupnp_dlna = gupnp-dlna; # Added 2018-02-25 + gupnp_igd = gupnp-igd; # Added 2018-02-25 + gupnptools = gupnp-tools; # Added 2015-12-19 + gutenberg = zola; # Added 2018-11-17 + gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # Added 2022-02-06 + gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # Added 2022-02-06 + + ### H ### + + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 + heimdalFull = heimdal; # Added 2018-05-01 + heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 + hepmc = hepmc2; # Added 2019-08-05 + hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # Added 2019-12-11 + hicolor_icon_theme = hicolor-icon-theme; # Added 2018-02-25 + holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 + htmlTidy = html-tidy; # Added 2014-12-06 + ht-rust = xh; # Added 2021-02-13 + hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # Added 2020-04-06 + + ### I ### + + iana_etc = iana-etc; # Added 2017-03-08 + iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 + icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + idea = jetbrains; # Added 2017-04-03 + imagemagick7Big = imagemagickBig; # Added 2021-02-22 + imagemagick7 = imagemagick; # Added 2021-02-22 + imagemagick7_light = imagemagick_light; # Added 2021-02-22 + impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27 + i-score = throw "i-score has been removed: abandoned upstream."; # Added 2020-11-21 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; - infiniband-diags = rdma-core; # added 2019-08-09 + infiniband-diags = rdma-core; # Added 2019-08-09 + ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # Added 2022-01-12 inotifyTools = inotify-tools; - inter-ui = inter; # added 2021-03-27 + inter-ui = inter; # Added 2021-03-27 + iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 iproute = iproute2; # moved from top-level 2021-03-14 - ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # added 2021-12-15 - i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 + ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 + + ### J ### + + jack2Full = jack2; # moved from top-level 2021-03-14 - jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 - jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 - jbuilder = dune_1; # added 2018-09-09 + jamomacore = throw "jamomacore has been removed: abandoned upstream."; # Added 2020-11-21 + jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 + jbuilder = dune_1; # Added 2018-09-09 + jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # Added 2021-04-26 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; - joseki = apache-jena-fuseki; # added 2016-02-28 + joseki = apache-jena-fuseki; # Added 2016-02-28 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead."; - jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 - json_glib = json-glib; # added 2018-02-25 - kafkacat = kcat; # added 2021-10-07 - kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 - keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-01 - k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 - kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 + + # Julia + julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 + julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13 + julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15 + julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 + julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 + + json_glib = json-glib; # Added 2018-02-25 + jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + + ### K ### + + k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04 + k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06 + kafkacat = kcat; # Added 2021-10-07 + kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11 + kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 + kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 + kdiff3-qt5 = kdiff3; # Added 2017-02-18 + keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 + keepassx-community = keepassxc; # Added 2017-11 + keepassx-reboot = keepassx-community; # Added 2017-02-01 + keepassx2-http = keepassx-reboot; # Added 2016-10-17 + keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-01 + kerberos = libkrb5; # moved from top-level 2021-03-14 + kexectools = kexec-tools; # Added 2021-09-03 + keybase-go = keybase; # Added 2016-08-24 + keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # Added 2019-12-10 + keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 + kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + kicad-with-packages3d = kicad; # Added 2019-11-25 + kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # Added 2021-03-09 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # Added 2020-04-28 + kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 + knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # Added 2022-01-01 kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; - ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # added 2022-01-12 - jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26 - julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # added 2020-09-15 - julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 - julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 - julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 - julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02 - k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # added 2022-01-04 - kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11 - kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 - kdiff3-qt5 = kdiff3; # added 2017-02-18 - keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 - keepassx-community = keepassxc; # added 2017-11 - keepassx-reboot = keepassx-community; # added 2017-02-01 - keepassx2-http = keepassx-reboot; # added 2016-10-17 - kexectools = kexec-tools; # added 2021-09-03 - keybase-go = keybase; # added 2016-08-24 - keysmith = libsForQt5.plasmaMobileGear.keysmith; # added 2021-07-14 - kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 - kicad-with-packages3d = kicad; # added 2019-11-25 - kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09 - kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25 - knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # 2022-01-01 - krename-qt5 = krename; # added 2017-02-18 - kerberos = libkrb5; # moved from top-level 2021-03-14 - keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10 - kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23 + kodiPlugins = kodiPackages; # Added 2021-03-09; + kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 + krename-qt5 = krename; # Added 2017-02-18 krita-beta = krita; # moved from top-level 2021-12-23 - kvm = qemu_kvm; # added 2018-04-25 - lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # added 2022-01-01 + kvm = qemu_kvm; # Added 2018-04-25 + + ### L ### + + lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; - letsencrypt = certbot; # added 2016-05-16 - libaudit = audit; # added 2018-04-25 - libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 - libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 - libcap_manpages = libcap.doc; # added 2016-04-29 - libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 - libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # added 2020-03-04 - libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libcap_progs = libcap.out; # added 2016-04-29 - libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # added 2021-05-16 - libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 - libdbusmenu-glib = libdbusmenu; # added 2018-05-01 - liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 - liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 - liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 - libgnome_keyring = libgnome-keyring; # added 2018-02-25 - libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 - libgpgerror = libgpg-error; # added 2021-09-04 - libgumbo = gumbo; # added 2018-01-21 - libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # added 2022-01-21 - libGL_driver = mesa.drivers; # added 2019-05-28 - libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 - libjpeg_drop = libjpeg_original; # added 2020-06-05 - libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # added 2021-11-09 - liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 - liblastfm = libsForQt5.liblastfm; # added 2020-06-14 - liblrdf = lrdf; # added 2018-04-25 + letsencrypt = certbot; # Added 2016-05-16 + libGL_driver = mesa.drivers; # Added 2019-05-28 + libaudit = audit; # Added 2018-04-25 + libcanberra_gtk2 = libcanberra-gtk2; # Added 2018-02-25 + libcanberra_gtk3 = libcanberra-gtk3; # Added 2018-02-25 + libcap_manpages = libcap.doc; # Added 2016-04-29 + libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 + libcap_progs = libcap.out; # Added 2016-04-29 + libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # Added 2021-05-16 + libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # Added 2020-03-04 + libdbusmenu-glib = libdbusmenu; # Added 2018-05-01 + libdbusmenu_qt5 = libsForQt5.libdbusmenu; # Added 2015-12-19 + liberation_ttf_v1_from_source = liberation_ttf_v1; # Added 2018-12-12 + liberation_ttf_v2_from_source = liberation_ttf_v2; # Added 2018-12-12 + liberationsansnarrow = liberation-sans-narrow; # Added 2018-12-12 + libgksu = throw "libgksu has been removed"; # Added 2022-01-16 + libgnome_keyring = libgnome-keyring; # Added 2018-02-25 + libgnome_keyring3 = libgnome-keyring3; # Added 2018-02-25 + libgpgerror = libgpg-error; # Added 2021-09-04 + libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 + libgumbo = gumbo; # Added 2018-01-21 + libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 + libjpeg_drop = libjpeg_original; # Added 2020-06-05 + libjson_rpc_cpp = libjson-rpc-cpp; # Added 2017-02-28 + libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2021-11-09 + liblapackWithoutAtlas = lapack-reference; # Added 2018-11-05 + liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 + liblrdf = lrdf; # Added 2018-04-25 + libmsgpack = msgpack; # Added 2018-08-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; - libqrencode = qrencode; # added 2019-01-01 - librdf = lrdf; # added 2020-03-22 - librecad2 = librecad; # backwards compatibility alias, added 2015-10 - librsync_0_9 = throw "librsync_0_9 has been removed"; # added 2021-07-24 - libseat = seatd; # added 2021-06-24 - libsysfs = sysfsutils; # added 2018-04-25 - libtidy = html-tidy; # added 2014-12-21 + libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 + libqrencode = qrencode; # Added 2019-01-01 + librdf = lrdf; # Added 2020-03-22 + librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + libseat = seatd; # Added 2021-06-24 + libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2019-12-10 + libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # Added 2020-06-22 + libsysfs = sysfsutils; # Added 2018-04-25 + libtidy = html-tidy; # Added 2014-12-21 + libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 + libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # Added 2020-12-20 + libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 + libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; - libudev = udev; # added 2018-04-25 - libungif = giflib; # added 2020-02-12 - libusb = libusb1; # added 2020-04-28 - libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 - libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 - libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + libudev = udev; # Added 2018-04-25 + libungif = giflib; # Added 2020-02-12 + libusb = libusb1; # Added 2020-04-28 + libva-full = libva; # Added 2018-03-26 + libva1-full = libva1; # Added 2018-03-26 libwnck3 = libwnck; - lilypond-unstable = lilypond; # added 2021-03-11 - lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14 - lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14 - links = links2; # added 2016-01-31 - linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09 - linux_rpi0 = linuxKernel.kernels.linux_rpi1; + lilypond-unstable = lilypond; # Added 2021-03-11 + lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 + lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 + links = links2; # Added 2016-01-31 + linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # Added 2021-12-09 + + # Linux kernels + linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; + linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; + linuxPackages_4_14 = linuxKernel.packages.linux_4_14; + linuxPackages_4_19 = linuxKernel.packages.linux_4_19; + linuxPackages_4_4 = linuxKernel.packages.linux_4_4; + linuxPackages_4_9 = linuxKernel.packages.linux_4_9; + linuxPackages_5_10 = linuxKernel.packages.linux_5_10; + linuxPackages_5_15 = linuxKernel.packages.linux_5_15; + linuxPackages_5_16 = linuxKernel.packages.linux_5_16; + linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; - linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; - linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4; - linuxPackages_4_4 = linuxKernel.packages.linux_4_4; - linuxPackages_4_9 = linuxKernel.packages.linux_4_9; - linuxPackages_4_14 = linuxKernel.packages.linux_4_14; - linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; - linuxPackages_4_19 = linuxKernel.packages.linux_4_19; - linuxPackages_5_4 = linuxKernel.packages.linux_5_4; - linuxPackages_5_10 = linuxKernel.packages.linux_5_10; - linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_16 = linuxKernel.packages.linux_5_16; - + linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; + linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; + linux_4_14 = linuxKernel.kernels.linux_4_14; + linux_4_19 = linuxKernel.kernels.linux_4_19; + linux_4_4 = linuxKernel.kernels.linux_4_4; + linux_4_9 = linuxKernel.kernels.linux_4_9; + linux_5_10 = linuxKernel.kernels.linux_5_10; + linux_5_15 = linuxKernel.kernels.linux_5_15; + linux_5_16 = linuxKernel.kernels.linux_5_16; + linux_5_4 = linuxKernel.kernels.linux_5_4; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; + linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi1 = linuxKernel.kernels.linux_rpi1; linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - linux_4_4 = linuxKernel.kernels.linux_4_4; - linux_4_9 = linuxKernel.kernels.linux_4_9; - linux_4_14 = linuxKernel.kernels.linux_4_14; - linux_4_19 = linuxKernel.kernels.linux_4_19; - linux_5_4 = linuxKernel.kernels.linux_5_4; - linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; - linux_5_10 = linuxKernel.kernels.linux_5_10; - linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_16 = linuxKernel.kernels.linux_5_16; - # added 2020-04-04 + # Added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; - # added 2021-04-04 + # Added 2021-04-04 linuxPackages_xen_dom0 = linuxPackages; linuxPackages_latest_xen_dom0 = linuxPackages_latest; linuxPackages_xen_dom0_hardened = linuxPackages_hardened; linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; - # added 2021-08-16 + # Added 2021-08-16 linuxPackages_latest_hardened = throw '' The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches frequently lag behind the upstream kernel. In some cases this meant that this attribute @@ -573,173 +670,201 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; - linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 - loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - lobster-two = google-fonts; # added 2021-07-22 - lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 - lttngTools = lttng-tools; # added 2014-07-31 - lttngUst = lttng-ust; # added 2014-07-31 - lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 - lua5_expat = luaPackages.luaexpat; # added 2017-05-02 - lua5_sec = luaPackages.luasec; # added 2017-05-02 - lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12 - love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15 - love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15 - love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # added 2022-01-15 - lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # Added 2020-05-22 + + loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + lobster-two = google-fonts; # Added 2021-07-22 + love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 + love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 + love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 + lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 + lttngTools = lttng-tools; # Added 2014-07-31 + lttngUst = lttng-ust; # Added 2014-07-31 + lua5_1_sockets = lua51Packages.luasocket; # Added 2017-05-02 + lua5_expat = luaPackages.luaexpat; # Added 2017-05-02 + lua5_sec = luaPackages.luasec; # Added 2017-05-02 + lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 + lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 - m3d-linux = m33-linux; # added 2016-08-13 - mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # added 2021-08-21 - mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12 - man_db = man-db; # added 2016-05 - manpages = man-pages; # added 2015-12-06 - marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 - mysql = mariadb; # moved from top-level 2021-03-14 + + ### M ### + + m3d-linux = m33-linux; # Added 2016-08-13 + mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 + mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 + man_db = man-db; # Added 2016-05 + manpages = man-pages; # Added 2015-12-06 + marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 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 - matrique = spectral; # added 2020-01-27 - mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 - meme = meme-image-generator; # added 2021-04-21 - mess = mame; # added 2019-10-30 - metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # added 2022-01-12 - mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 - mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 - mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # added 2022-01-12 - mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # added 2022-01-01 - mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 - minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 - minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 - minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14 - monero = monero-cli; # added 2021-11-28 - mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + matrique = spectral; # Added 2020-01-27 + mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # Added 2019-12-08 + mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 + mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # Added 2019-12-10, modified 2020-11-25 + mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 + meme = meme-image-generator; # Added 2021-04-21 + memtest86 = memtest86plus; # Added 2019-05-08 + mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 + mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + mess = mame; # Added 2019-10-30 + metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # Added 2022-01-12 + mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # Added 2022-01-12 + midoriWrapper = midori; # Added 2015-01 + mime-types = mailcap; # Added 2022-01-21 + mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # Added 2022-01-01 + minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 + mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 + mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 + mlt-qt5 = libsForQt5.mlt; # Added 2015-12-19 + mobile_broadband_provider_info = mobile-broadband-provider-info; # Added 2018-02-25 + moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; + module_init_tools = kmod; # Added 2016-04-22 + monero = monero-cli; # Added 2021-11-28 + monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 + mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 + + morituri = whipper; # Added 2018-09-13 + mozart-binary = mozart2-binary; # Added 2019-09-23 + mozart = mozart2-binary; # Added 2019-09-23 + mpc_cli = mpc-cli; # moved from top-level 2022-01-24 + mpd_clientlib = libmpdclient; # Added 2021-02-11 + mpich2 = mpich; # Added 2018-08-06 + msf = metasploit; # Added 2018-04-25 + multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 + mumble_git = pkgs.mumble; # Added 2019-08-01 + murmur_git = pkgs.murmur; # Added 2019-08-01 mysql-client = hiPrio mariadb.client; - memtest86 = memtest86plus; # added 2019-05-08 - mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # added 2021-10-18 - mesa_noglu = mesa; # added 2019-05-28 + mysql = mariadb; # moved from top-level 2021-03-14 + # NOTE: 2018-07-12: legacy alias: # grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; - mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 - midoriWrapper = midori; # added 2015-01 - mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # added 2020-08-15 - mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 - mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 - moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; - module_init_tools = kmod; # added 2016-04-22 - mozart = mozart2-binary; # added 2019-09-23 - mozart-binary = mozart2-binary; # added 2019-09-23 - mpc_cli = mpc-cli; # moved from top-level 2022-01-24 - mpd_clientlib = libmpdclient; # added 2021-02-11 - mpich2 = mpich; # added 2018-08-06 - msf = metasploit; # added 2018-04-25 - libmsgpack = msgpack; # added 2018-08-17 - mssys = ms-sys; # added 2015-12-13 - mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 - multipath_tools = multipath-tools; # added 2016-01-21 - mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18 - mupen64plus1_5 = mupen64plus; # added 2016-02-12 - mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 - mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 - mysqlWorkbench = mysql-workbench; # added 2017-01-19 + mesa_noglu = mesa; # Added 2019-05-28 + + mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22 + mssys = ms-sys; # Added 2015-12-13 + multipath_tools = multipath-tools; # Added 2016-01-21 + mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 + mupen64plus1_5 = mupen64plus; # Added 2016-02-12 + mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # Added 2021-04-15 + mysqlWorkbench = mysql-workbench; # Added 2017-01-19 + + ### N ### + + net_snmp = net-snmp; # Added 2019-12-21 nagiosPluginsOfficial = monitoring-plugins; - navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07 - ncat = nmap; # added 2016-01-26 - neap = throw "neap was removed from nixpkgs, as it relies on python2"; # added 2022-01-12 - netcat-openbsd = libressl.nc; # added 2018-04-25 - netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 - networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 - networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 - networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 - networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 - networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 - neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - nfsUtils = nfs-utils; # added 2014-12-06 - nginxUnstable = nginxMainline; # added 2018-04-25 - nilfs_utils = nilfs-utils; # added 2018-04-25 + navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 + ncat = nmap; # Added 2016-01-26 + neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 + netcat-openbsd = libressl.nc; # Added 2018-04-25 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # Added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # Added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # Added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # Added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # Added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # Added 2018-02-25 + neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + nfsUtils = nfs-utils; # Added 2014-12-06 + nginxUnstable = nginxMainline; # Added 2018-04-25 + nilfs_utils = nilfs-utils; # Added 2018-04-25 nix-direnv-flakes = nix-direnv; - nix-review = nixpkgs-review; # added 2019-12-22 - nixFlakes = nixVersions.stable; # added 2021-05-21 - nixStable = nixVersions.stable; # added 2022-01-24 - nixUnstable = nixVersions.unstable; # added 2022-01-26 + nix-review = nixpkgs-review; # Added 2019-12-22 + nixFlakes = nixVersions.stable; # Added 2021-05-21 + nixStable = nixVersions.stable; # Added 2022-01-24 + nixUnstable = nixVersions.unstable; # Added 2022-01-26 nix_2_3 = nixVersions.nix_2_3; nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; - nmap_graphical = nmap-graphical; # added 2017-01-19 - nmap-unfree = nmap; # added 2021-04-06 - nologin = shadow; # added 2018-04-25 - nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 - nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # added 2022-01-15 - noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16 - now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05 - nxproxy = nx-libs; # added 2019-02-15 + nmap-unfree = nmap; # Added 2021-04-06 + nmap_graphical = nmap-graphical; # Added 2017-01-19 + nologin = shadow; # Added 2018-04-25 + nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 + noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 + nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 + now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 + nxproxy = nx-libs; # Added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; - oauth2_proxy = oauth2-proxy; # added 2021-04-18 - opencascade_oce = opencascade; # added 2018-04-25 - oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 + + ### O ### + + oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # Added 2020-10-09 + OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 + OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 + oauth2_proxy = oauth2-proxy; # Added 2021-04-18 + oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # Added 2019-12-10 + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # Added 2021-01-24 + ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 ofp = throw "ofp is not compatible with odp-dpdk"; - olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06 - openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06 - opencl-icd = ocl-icd; # added 2017-01-20 - openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 - openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10 - openexr_ctl = ctl; # added 2018-04-25 - openisns = open-isns; # added 2020-01-28 - openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 - openjpeg_2 = openjpeg; # added 2021-01-25 - openmpt123 = libopenmpt; # added 2021-09-05 - opensans-ttf = open-sans; # added 2018-12-04 - openssh_with_kerberos = openssh; # added 2018-01-28 - orchis = orchis-theme; # added 2021-06-09 - onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 - osquery = throw "osquery has been removed."; # added 2019-11-24 - osxfuse = macfuse-stubs; # added 2021-03-20 - otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 - OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16 - OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16 - owncloudclient = owncloud-client; # added 2016-08 - ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 - p11_kit = p11-kit; # added 2018-02-25 - packet-cli = metal-cli; # added 2021-10-25 - paperless = paperless-ng; # added 2021-06-06 - parity = openethereum; # added 2020-08-01 - parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # added 2022-01-10 - parquet-cpp = arrow-cpp; # added 2018-09-08 - pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 - pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22 - pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # added 2022-01-01 - pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 - perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 - perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 - pgp-tools = signing-party; # added 2017-03-26 - pg_tmp = ephemeralpg; # added 2018-01-16 + olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04 + openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 + openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 + opencascade_oce = opencascade; # Added 2018-04-25 + opencl-icd = ocl-icd; # Added 2017-01-20 + openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 + openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 + openexr_ctl = ctl; # Added 2018-04-25 + openisns = open-isns; # Added 2020-01-28 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 + openjpeg_2 = openjpeg; # Added 2021-01-25 + openmpt123 = libopenmpt; # Added 2021-09-05 + opensans-ttf = open-sans; # Added 2018-12-04 + openssh_with_kerberos = openssh; # Added 2018-01-28 + orchis = orchis-theme; # Added 2021-06-09 + osquery = throw "osquery has been removed."; # Added 2019-11-24 + osxfuse = macfuse-stubs; # Added 2021-03-20 + otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 + owncloudclient = owncloud-client; # Added 2016-08 + + ### P ### + + PPSSPP = ppsspp; # Added 2017-10-01 + + p11_kit = p11-kit; # Added 2018-02-25 + packet-cli = metal-cli; # Added 2021-10-25 + paperless = paperless-ng; # Added 2021-06-06 + parity = openethereum; # Added 2020-08-01 + parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 + parquet-cpp = arrow-cpp; # Added 2018-09-08 + pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # Added 2018-05-04 + pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 + pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 + pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # Added 2022-01-01 + pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 + perlXMLParser = perlPackages.XMLParser; # Added 2018-10-12 + perlArchiveCpio = perlPackages.ArchiveCpio; # Added 2018-10-12 + pgp-tools = signing-party; # Added 2017-03-26 + pg_tmp = ephemeralpg; # Added 2018-01-16 # Obsolete PHP version aliases - php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # added 2021-06-03 - php73Packages = php73; # added 2021-06-03 - php73Extensions = php73; # added 2021-06-03 + php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # Added 2021-06-03 + php73Packages = php73; # Added 2021-06-03 + php73Extensions = php73; # Added 2021-06-03 php-embed = throw '' php*-embed has been dropped, you can build something similar with the following snippet: php74.override { embedSupport = true; apxs2Support = false; } - ''; # added 2020-04-01 - php73-embed = php-embed; # added 2020-04-01 - php74-embed = php-embed; # added 2020-04-01 + ''; # Added 2020-04-01 + php73-embed = php-embed; # Added 2020-04-01 + php74-embed = php-embed; # Added 2020-04-01 phpPackages-embed = throw '' php*Packages-embed has been dropped, you can build something similar with the following snippet: (php74.override { embedSupport = true; apxs2Support = false; }).packages - ''; # added 2020-04-01 + ''; # Added 2020-04-01 php73Packages-embed = phpPackages-embed; php74Packages-embed = phpPackages-embed; @@ -754,9 +879,9 @@ mapAliases ({ cgiSupport = false; fpmSupport = false; } - ''; # added 2020-04-01 - php73-unit = php-unit; # added 2020-04-01 - php74-unit = php-unit; # added 2020-04-01 + ''; # Added 2020-04-01 + php73-unit = php-unit; # Added 2020-04-01 + php74-unit = php-unit; # Added 2020-04-01 phpPackages-unit = throw '' php*Packages-unit has been dropped, you can build something @@ -769,191 +894,195 @@ mapAliases ({ cgiSupport = false; fpmSupport = false; }).packages - ''; # added 2020-04-01 + ''; # Added 2020-04-01 php73Packages-unit = phpPackages-unit; php74Packages-unit = phpPackages-unit; - pidgin-with-plugins = pidgin; # added 2016-06 - pidginlatex = pidgin-latex; # added 2018-01-08 - pidginlatexSF = pidgin-latex; # added 2014-11-02 - pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08 - pidginosd = pidgin-osd; # added 2018-01-08 - pidginotr = pidgin-otr; # added 2018-01-08 - pidginsipe = pidgin-sipe; # added 2018-01-08 - pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 - pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # added 2022-01-19 - piwik = matomo; # added 2018-01-16 - pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 - pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 - planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02 - pleroma-otp = pleroma; # added 2021-07-10 - pltScheme = racket; # just to be sure + pidgin-with-plugins = pidgin; # Added 2016-06 + pidginlatex = pidgin-latex; # Added 2018-01-08 + pidginlatexSF = pidgin-latex; # Added 2014-11-02 + pidginmsnpecan = pidgin-msn-pecan; # Added 2018-01-08 + pidginosd = pidgin-osd; # Added 2018-01-08 + pidginotr = pidgin-otr; # Added 2018-01-08 + pidginsipe = pidgin-sipe; # Added 2018-01-08 + pidginwindowmerge = pidgin-window-merge; # Added 2018-01-08 + pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # Added 2022-01-19 + piwik = matomo; # Added 2018-01-16 + pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfigUpstream = pkg-configUpstream; # Added 2018-02-02 + planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # Added 2021-02-02 + pleroma-otp = pleroma; # Added 2021-07-10 plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 - pmtools = acpica-tools; # added 2018-11-01 - polarssl = mbedtls; # added 2018-04-25 - polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01 - poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + pltScheme = racket; # just to be sure + pmtools = acpica-tools; # Added 2018-11-01 + polarssl = mbedtls; # Added 2018-04-25 + polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 + poppler_qt5 = libsForQt5.poppler; # Added 2015-12-19 + + # postgresql postgresql96 = postgresql_9_6; - postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # added 2021-12-03 + postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # Added 2021-12-03 + # postgresql plugins - pgjwt = postgresqlPackages.pgjwt; + cstore_fdw = postgresqlPackages.cstore_fdw; + pg_cron = postgresqlPackages.pg_cron; + pg_hll = postgresqlPackages.pg_hll; pg_repack = postgresqlPackages.pg_repack; - pgroonga = postgresqlPackages.pgroonga; pg_similarity = postgresqlPackages.pg_similarity; + pg_topn = postgresqlPackages.pg_topn; + pgjwt = postgresqlPackages.pgjwt; + pgroonga = postgresqlPackages.pgroonga; pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; + postgis = postgresqlPackages.postgis; + tilp2 = throw "tilp2 has been removed"; # Added 2022-01-15 + timekeeper = throw "timekeeper has been removed"; # Added 2022-01-16 timescaledb = postgresqlPackages.timescaledb; tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; - cstore_fdw = postgresqlPackages.cstore_fdw; - pg_hll = postgresqlPackages.pg_hll; - pg_cron = postgresqlPackages.pg_cron; - pg_topn = postgresqlPackages.pg_topn; - pinentry_curses = pinentry-curses; # added 2019-10-14 - pinentry_emacs = pinentry-emacs; # added 2019-10-14 - pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14 - pinentry_qt = pinentry-qt; # added 2019-10-14 - pinentry_gnome = pinentry-gnome; # added 2019-10-14 - pinentry_qt5 = pinentry-qt; # added 2020-02-11 - postgis = postgresqlPackages.postgis; - # end - privateer = throw "privateer was removed because it was broken"; # added 2021-05-18 - processing3 = processing; # added 2019-08-16 - procps-ng = procps; # added 2018-06-08 - proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # added 2021-06-30 - proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12 - prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16 - pygmentex = texlive.bin.pygmentex; # added 2019-12-15 - pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # added 2021-03-21 + + phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # Added 2019-11-22 + phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # Added 2019-11-22 + phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # Added 2019-11-22 + pinentry_curses = pinentry-curses; # Added 2019-10-14 + pinentry_emacs = pinentry-emacs; # Added 2019-10-14 + pinentry_gnome = pinentry-gnome; # Added 2019-10-14 + pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 + pinentry_qt = pinentry-qt; # Added 2019-10-14 + pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # Added 2019-12-10 + privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 + processing3 = processing; # Added 2019-08-16 + procps-ng = procps; # Added 2018-06-08 + proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 + proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # Added 2021-04-12 + prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # Added 2021-03-16 + pulseaudioLight = pulseaudio; # Added 2018-04-25 + pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # Added 2021-02-13 + pulseeffects-pw = easyeffects; # Added 2021-07-07 + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; + pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 + pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01 + pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 + pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # 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; - pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 - pulseaudioLight = pulseaudio; # added 2018-04-25 - pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # added 2021-02-13 - pulseeffects-pw = easyeffects; # added 2021-07-07 - phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 - phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 - phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 - pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14 - pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 - 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 - pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 - pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 - pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 - pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01 - python = python2; # added 2022-01-11 - python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 - python-swiftclient = swiftclient; # added 2021-09-09 - pythonFull = python2Full; # added 2022-01-11 - pythonPackages = python.pkgs; # added 2022-01-11 - quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 - qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 - qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 - qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 - qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 - qt5ct = libsForQt5.qt5ct; # added 2021-12-27 - quake3game = ioquake3; # added 2016-01-14 - quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-03 - qvim = throw "qvim has been removed."; # added 2020-08-31 - qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 - qwt6 = libsForQt5.qwt; # added 2015-12-19 - qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04 - qtcurve = libsForQt5.qtcurve; # added 2020-11-07 - quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 - raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24 - rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # added 2022-01-01 - rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 - rdiff_backup = rdiff-backup; # added 2014-11-23 - rdmd = dtools; # added 2017-08-19 - readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22 - rng_tools = rng-tools; # added 2018-10-24 + pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-01 + python = python2; # Added 2022-01-11 + python-swiftclient = swiftclient; # Added 2021-09-09 + python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # Added 2021-03-08 + pythonFull = python2Full; # Added 2022-01-11 + pythonPackages = python.pkgs; # Added 2022-01-11 + + ### Q ### + + QmidiNet = qmidinet; # Added 2016-05-22 + qca-qt5 = libsForQt5.qca-qt5; # Added 2015-12-19 + qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 + qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 + qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 + qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 + qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 + qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 + qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 + quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 + quake3game = ioquake3; # Added 2016-01-14 + quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 + quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-03 + qvim = throw "qvim has been removed."; # Added 2020-08-31 + qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 + qwt6 = libsForQt5.qwt; # Added 2015-12-19 + + ### R ### + + radare2-cutter = cutter; # Added 2021-03-30 + raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 + rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # Added 2022-01-01 + rdf4store = throw "rdf4store has been removed from nixpkgs."; # Added 2019-12-21 + rdiff_backup = rdiff-backup; # Added 2014-11-23 + rdmd = dtools; # Added 2017-08-19 + readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 + recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 + redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 + redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 + renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # Added 2022-01-12 + residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 + retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 + retroshare06 = retroshare; + rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 + riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 + rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 + ring-daemon = jami-daemon; # Added 2021-10-26 + rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 + rng_tools = rng-tools; # Added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 + rpiboot-unstable = rpiboot; # Added 2021-07-30 rssglx = rss-glx; #added 2015-03-25 - rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 - # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, - # due to it being inside the linuxPackagesFor function. - rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14 - recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 - residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # added 2021-11-27 - retroshare06 = retroshare; - gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 - qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 - rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 - rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # added 2022-01-15 - riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 - ring-daemon = jami-daemon; # added 2021-10-26 - radare2-cutter = cutter; # added 2021-03-30 - redkite = throw "redkite was archived by upstream"; # added 2021-04-12 - redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # added 2021-12-25 - renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # added 2022-01-12 - retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19 - rkt = throw "rkt was archived by upstream"; # added 2020-05-16 - rpiboot-unstable = rpiboot; # added 2021-07-30 - rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08 - rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; + rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 + rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 rubyMinimal = throw "rubyMinimal was removed due to being unused"; + rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; - runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 - rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # added 2021-10-19 - rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 - rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 - subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 - thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs"; - thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs"; - togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; - urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 - urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 - urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02 - urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # added 2020-02-02 - urxvt_font_size = rxvt-unicode-plugins.font-size; # added 2020-02-02 - urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02 - urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02 - urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02 - s2n = s2n-tls; # added 2021-03-03 - s6Dns = s6-dns; # added 2018-07-23 - s6Networking = s6-networking; # added 2018-07-23 - s6LinuxUtils = s6-linux-utils; # added 2018-07-23 - s6PortableUtils = s6-portable-utils; # added 2018-07-23 - sagemath = sage; # added 2018-10-27 - sam = deadpixi-sam; # added 2018-04-25 - samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 - saneBackends = sane-backends; # added 2016-01-02 - saneBackendsGit = sane-backends; # added 2016-01-02 - sane-backends-git = sane-backends; # added 2021-02-19 - saneFrontends = sane-frontends; # added 2016-01-02 - scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01 - scim = sc-im; # added 2016-01-22 - scollector = bosun; # added 2018-04-25 - scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # added 2021-10-07 - sdlmame = mame; # added 2019-10-30 - seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21 + runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 + rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19 + rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 + rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 + + # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, + # due to it being inside the linuxPackagesFor function. + rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + + ### S ### + + s2n = s2n-tls; # Added 2021-03-03 + s6Dns = s6-dns; # Added 2018-07-23 + s6LinuxUtils = s6-linux-utils; # Added 2018-07-23 + s6Networking = s6-networking; # Added 2018-07-23 + s6PortableUtils = s6-portable-utils; # Added 2018-07-23 + sagemath = sage; # Added 2018-10-27 + sam = deadpixi-sam; # Added 2018-04-25 + samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # Added 2016-01-25 + sane-backends-git = sane-backends; # Added 2021-02-19 + saneBackends = sane-backends; # Added 2016-01-02 + saneBackendsGit = sane-backends; # Added 2016-01-02 + saneFrontends = sane-frontends; # Added 2016-01-02 + scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 + scim = sc-im; # Added 2016-01-22 + scollector = bosun; # Added 2018-04-25 + scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 + sdlmame = mame; # Added 2019-10-30 + seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; - sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11 - shared_mime_info = shared-mime-info; # added 2018-02-25 - sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 - sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 - sigurlx = throw "sigurlx has been removed (upstream is gone)"; # added 2022-01-24 - skrooge2 = skrooge; # added 2017-02-18 + sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 + shared_mime_info = shared-mime-info; # Added 2018-02-25 + shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 + sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 + sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 + sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 + skrooge2 = skrooge; # Added 2017-02-18 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; - skype = skypeforlinux; # added 2017-07-27 - skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31 - skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # added 2021-07-14 - slack-dark = slack; # added 2020-03-27 - slic3r-prusa3d = prusa-slicer; # added 2019-05-21 + skype = skypeforlinux; # Added 2017-07-27 + skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2021-07-14 + skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2020-10-31 + slack-dark = slack; # Added 2020-03-27 + slic3r-prusa3d = prusa-slicer; # Added 2019-05-21 + slim = throw "slim has been removed. Please use a different display-manager"; # Added 2019-11-11 + slimThemes = throw "slimThemes has been removed because slim has been also"; # Added 2019-11-11 + slurm-full = slurm; # Added 2018-05-1 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 - slurm-full = slurm; # added 2018-05-1 - smbclient = samba; # added 2018-04-25 - smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 - slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 - slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 - solr_8 = solr; # added 2021-01-30 - spectral = neochat; # added 2020-12-27 - sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; + smbclient = samba; # Added 2018-04-25 + smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2020-11-04 + solr_8 = solr; # Added 2021-01-30 - # added 2020-02-10 + # Added 2020-02-10 sourceHanSansPackages = { japanese = source-han-sans; korean = source-han-sans; @@ -974,365 +1103,286 @@ mapAliases ({ source-han-serif-korean = source-han-serif; source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; - source-sans-pro = source-sans; # added 2021-10-20 - source-serif-pro = source-serif; # added 2021-10-20 + source-sans-pro = source-sans; # Added 2021-10-20 + source-serif-pro = source-serif; # Added 2021-10-20 - net_snmp = net-snmp; # added 2019-12-21 - oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09 spaceOrbit = space-orbit; # added 2016-05-23 + spectral = neochat; # Added 2020-12-27 speech_tools = speech-tools; # added 2018-04-25 speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03 - spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 - spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16 - spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 + spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21 + spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # Added 2019-10-16 + spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21 + spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead."; # added 2022-01-04 + # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell + spidermonkey = spidermonkey_78; # Added 2020-10-09 spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 - sqliteInteractive = sqlite-interactive; # added 2014-12-06 + sqliteInteractive = sqlite-interactive; # Added 2014-12-06 squid4 = squid; # added 2019-08-22 sshfsFuse = sshfs-fuse; # added 2016-09 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 - stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 - surf-webkit2 = surf; # added 2017-04-02 - svgcleaner = throw "svgcleaner has been removed."; # added 2021-11-17 - swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 - swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 - swtpm-tpm2 = swtpm; # added 2021-02-26 - syncthing-cli = syncthing; # added 2021-04-06 - synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # added 2021-11-26 - system_config_printer = system-config-printer; # added 2016-01-03 - systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 - systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 - systool = sysfsutils; # added 2018-04-25 - tahoelafs = tahoe-lafs; # added 2018-03-26 - tangogps = foxtrotgps; # added 2020-01-26 + stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 + subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 + sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; + surf-webkit2 = surf; # Added 2017-04-02 + svgcleaner = throw "svgcleaner has been removed."; # Added 2021-11-17 + swec = throw "swec has been removed; broken and abandoned upstream."; # Added 2021-10-14 + swfdec = throw "swfdec has been removed as broken and unmaintained."; # Added 2020-08-23 + swtpm-tpm2 = swtpm; # Added 2021-02-26 + syncthing-cli = syncthing; # Added 2021-04-06 + synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 + system_config_printer = system-config-printer; # Added 2016-01-03 + systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 + systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 + systool = sysfsutils; # Added 2018-04-25 + + ### T ### + + tahoelafs = tahoe-lafs; # Added 2018-03-26 + tangogps = foxtrotgps; # Added 2020-01-26 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead."; - telepathy_farstream = telepathy-farstream; # added 2018-02-25 - telepathy_gabble = telepathy-gabble; # added 2018-02-25 - telepathy_glib = telepathy-glib; # added 2018-02-25 - telepathy_haze = telepathy-haze; # added 2018-02-25 - telepathy_idle = telepathy-idle; # added 2018-02-25 - telepathy_logger = telepathy-logger; # added 2018-02-25 - telepathy_mission_control = telepathy-mission-control; # added 2018-02-25 - telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02 - telepathy_qt = telepathy-qt; # added 2018-02-25 - telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 - telepathy_salut = telepathy-salut; # added 2018-02-25 - telnet = inetutils; # added 2018-05-15 - terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # added 2021-08-21 + telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # Added 2020-07-02 + telepathy_farstream = telepathy-farstream; # Added 2018-02-25 + telepathy_gabble = telepathy-gabble; # Added 2018-02-25 + telepathy_glib = telepathy-glib; # Added 2018-02-25 + telepathy_haze = telepathy-haze; # Added 2018-02-25 + telepathy_idle = telepathy-idle; # Added 2018-02-25 + telepathy_logger = telepathy-logger; # Added 2018-02-25 + telepathy_mission_control = telepathy-mission-control; # Added 2018-02-25 + telepathy_qt = telepathy-qt; # Added 2018-02-25 + telepathy_qt5 = libsForQt5.telepathy; # Added 2015-12-19 + telepathy_salut = telepathy-salut; # Added 2018-02-25 + telnet = inetutils; # Added 2018-05-15 + terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 + terraform-provider-ibm = terraform-providers.ibm; # Added 2018-09-28 + terraform-provider-libvirt = terraform-providers.libvirt; # Added 2018-09-28 + terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; - terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # added 2021-06-15 - terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # added 2021-12-08 - terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 - terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 - terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 - tesseract_4 = tesseract4; # added 2018-12-19 - tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 - tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 - tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 - tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 - tftp_hpa = tftp-hpa; # added 2015-04-03 - timescale-prometheus = promscale; # added 2020-09-29 - timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05 - tomboy = throw "tomboy is not actively developed anymore and was removed."; # added 2022-01-27 - tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 - tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 - tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 - tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # added 2022-01-01 - torbrowser = tor-browser-bundle-bin; # added 2017-04-05 - torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - trang = jing-trang; # added 2018-04-25 - transmission_gtk = transmission-gtk; # added 2018-01-06 - transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 - transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14 + terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 + terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 + tesseract_4 = tesseract4; # Added 2018-12-19 + tex-gyre-bonum-math = tex-gyre-math.bonum; # Added 2018-04-03 + tex-gyre-pagella-math = tex-gyre-math.pagella; # Added 2018-04-03 + tex-gyre-schola-math = tex-gyre-math.schola; # Added 2018-04-03 + tex-gyre-termes-math = tex-gyre-math.termes; # Added 2018-04-03 + tftp_hpa = tftp-hpa; # Added 2015-04-03 + 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; + timescale-prometheus = promscale; # Added 2020-09-29 + timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 + togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 + tomboy = throw "tomboy is not actively developed anymore and was removed."; # Added 2022-01-27 + tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 + tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 + tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # Added 2020-03-11 + tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # Added 2022-01-01 + torbrowser = tor-browser-bundle-bin; # Added 2017-04-05 + torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + trang = jing-trang; # Added 2018-04-25 + transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 + transmission_gtk = transmission-gtk; # Added 2018-01-06 + transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned."; - trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 - truecrypt = veracrypt; # added 2018-10-24 - tshark = wireshark-cli; # added 2018-04-25 - tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 - turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08 - typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11 - uberwriter = apostrophe; # added 2020-04-23 - ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 - ucsFonts = ucs-fonts; # added 2016-07-15 - ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11 - ultrastardx-beta = ultrastardx; # added 2017-08-12 - unicorn-emu = unicorn; # added 2020-10-29 - unifiStable = unifi6; # added 2020-12-28 - untrunc = untrunc-anthwlock; # added 2021-02-01 - usb_modeswitch = usb-modeswitch; # added 2016-05-10 - usbguard-nox = usbguard; # added 2019-09-04 - utillinux = util-linux; # added 2020-11-24 - uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; - v4l_utils = v4l-utils; # added 2019-08-07 - v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; - vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; - vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 - varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 - varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 - varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15 - venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 - vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 - vimbWrapper = vimb; # added 2015-01 - vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 - vimprobable2-unwrapped = vimprobable2; # added 2019-12-05 - virtviewer = virt-viewer; # added 2015-12-24 - virtmanager = virt-manager; # added 2019-10-29 - virtmanager-qt = virt-manager-qt; # added 2019-10-29 - virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 - vorbisTools = vorbis-tools; # added 2016-01-26 - vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29 - 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 - webkit = webkitgtk; # added 2019-03-05 - webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 - webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 - weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 - wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11 - wineStaging = wine-staging; # added 2018-01-08 - wineWayland = wine-wayland; - winusb = woeusb; # added 2017-12-22 - winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 - wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 - wireguard = wireguard-tools; # added 2018-05-19 - morituri = whipper; # added 2018-09-13 - xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19 - xp-pen-g430 = pentablet-driver; # added 2020-05-03 - xdg_utils = xdg-utils; # added 2021-02-01 - xfceUnstable = xfce4-14; # added 2019-09-17 - xfce4-14 = xfce; - xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 - x11 = xlibsWrapper; # added 2015-09 - xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24 - xbmc = kodi; # added 2018-04-25 - xbmcPlain = kodiPlain; # added 2018-04-25 - xbmcPlugins = kodiPackages; # added 2018-04-25 - kodiPlugins = kodiPackages; # added 2021-03-09; - xineLib = xine-lib; # added 2021-04-27 - xineUI = xine-ui; # added 2021-04-27 - xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 - xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; - pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; - pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; - xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 - xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" - + "and is broken. Working alternatives are libinput and synaptics."); - xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20 - xlibs = xorg; # added 2015-09 - xpraGtk3 = xpra; # added 2018-09-13 - xv = xxv; # added 2020-02-22 - xvfb_run = xvfb-run; # added 2021-05-07 - yacc = bison; # moved from top-level 2021-03-14 - youtubeDL = youtube-dl; # added 2014-10-26 - ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; - yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 - yuzu = yuzu-mainline; # added 2021-01-25 - zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # added 2021-04-07 - zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28 - zdfmediathk = mediathekview; # added 2019-01-19 + trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # Added 2020-04-29 + truecrypt = veracrypt; # Added 2018-10-24 + tshark = wireshark-cli; # Added 2018-04-25 + tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 + typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # Added 2021-09-11 - gnome_user_docs = gnome-user-docs; # added 2019-11-20 - # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell - spidermonkey = spidermonkey_78; # added 2020-10-09 - libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20 - libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20 - libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20 - libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20 + ### U ### + + uberwriter = apostrophe; # Added 2020-04-23 + ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + ucsFonts = ucs-fonts; # Added 2016-07-15 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # Added 2020-01-11 + ultrastardx-beta = ultrastardx; # Added 2017-08-12 + unicorn-emu = unicorn; # Added 2020-10-29 + unifiStable = unifi6; # Added 2020-12-28 + untrunc = untrunc-anthwlock; # Added 2021-02-01 + urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 + urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 + urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 + urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02 + urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02 + urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 + urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 + urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 + usb_modeswitch = usb-modeswitch; # Added 2016-05-10 + usbguard-nox = usbguard; # Added 2019-09-04 + utillinux = util-linux; # Added 2020-11-24 + uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; + + ### V ### + + v4l_utils = v4l-utils; # Added 2019-08-07 + v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; + vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 + vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; + varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26 + varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26 + varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-09-15 + vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 + vimbWrapper = vimb; # Added 2015-01 + vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # Added 2019-12-05 + vimprobable2-unwrapped = vimprobable2; # Added 2019-12-05 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 + virtmanager = virt-manager; # Added 2019-10-29 + virtmanager-qt = virt-manager-qt; # Added 2019-10-29 + virtviewer = virt-viewer; # Added 2015-12-24 + vorbisTools = vorbis-tools; # Added 2016-01-26 + vtun = throw "vtune has been removed as it's unmaintained upstream."; # Added 2021-10-29 + + ### W ### + + 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 + webkit = webkitgtk; # Added 2019-03-05 + webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 + webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 + weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # Added 2018-09-06 + wicd = throw "wicd has been removed as it is abandoned."; # Added 2021-09-11 + wineFull = winePackages.full; # Added 2017-05-27 + wineMinimal = winePackages.minimal; # Added 2017-05-27 + wineStable = winePackages.stable; # Added 2017-05-27 + wineStaging = wine-staging; # Added 2018-01-08 + wineUnstable = winePackages.unstable; # Added 2017-05-27 + wineWayland = wine-wayland; + winswitch = throw "winswitch has been removed from nixpkgs."; # Added 2019-12-10 + winusb = woeusb; # Added 2017-12-22 + wireguard = wireguard-tools; # Added 2018-05-19 + wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # Added 2019-11-18 + wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # Added 2022-01-31 + + ### X ### + + x11 = xlibsWrapper; # Added 2015-09 + xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 + xbmc = kodi; # Added 2018-04-25 + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 + xbmcPlain = kodiPlain; # Added 2018-04-25 + xbmcPlugins = kodiPackages; # Added 2018-04-25 + xdg_utils = xdg-utils; # Added 2021-02-01 + xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14 + xfce4-14 = xfce; + xfceUnstable = xfce4-14; # Added 2019-09-17 + xineLib = xine-lib; # Added 2021-04-27 + xineUI = xine-ui; # Added 2021-04-27 + xmonad_log_applet_gnome3 = xmonad_log_applet; # Added 2018-05-01 + xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; + xp-pen-g430 = pentablet-driver; # Added 2020-05-03 + xf86_video_nouveau = xorg.xf86videonouveau; # Added 2015-09 + xf86_input_mtrack = throw '' + xf86_input_mtrack has been removed from nixpkgs as it is broken and + unmaintained. Working alternatives are libinput and synaptics. + ''; + xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # Added 2020-01-20 + xlibs = xorg; # Added 2015-09 + xpraGtk3 = xpra; # Added 2018-09-13 + xv = xxv; # Added 2020-02-22 + xvfb_run = xvfb-run; # Added 2021-05-07 + + ### Y ### + + yacc = bison; # moved from top-level 2021-03-14 + yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 + youtubeDL = youtube-dl; # Added 2014-10-26 + ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; + yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # Added 2021-03-08 + yuzu = yuzu-mainline; # Added 2021-01-25 + + ### Z ### + + zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 + zdfmediathk = mediathekview; # Added 2019-01-19 + zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # Added 2021-03-28 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off - # added 2017-05-27 - wineMinimal = winePackages.minimal; - wineFull = winePackages.full; - wineStable = winePackages.stable; - wineUnstable = winePackages.unstable; - - # added 2018-03-26 - libva-full = libva; - libva1-full = libva1; - - # forceSystem should not be used directly in Nixpkgs. - # added 2018-07-16 - forceSystem = system: _: - (import self.path { localSystem = { inherit system; }; }); - callPackage_i686 = pkgsi686Linux.callPackage; - - inherit (ocaml-ng) # added 2016-09-14 + inherit (ocaml-ng) # Added 2016-09-14 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 - ocamlPackages_4_03 - ocamlPackages_latest; + ocamlPackages_4_03 ocamlPackages_latest; - mumble_git = pkgs.mumble; # added 2019-08-01 - murmur_git = pkgs.murmur; # added 2019-08-01 - zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2020-08-17 + zabbix44 = throw '' + Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at + https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 + ''; # Added 2020-08-17 - # added 2019-09-06 + # Added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; - # added 2020-06-22 + # Added 2020-06-22 zeromq3 = throw "zeromq3 has been deprecated by zeromq4."; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; -} // (with ocaml-ng; { # added 2016-09-14 + +} // (with ocaml-ng; { # Added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; }) // { - gnatsd = nats-server; # added 2019-10-28 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 - dina-font-pcf = dina-font; # added 2020-02-09 - - /* Cleanup before 20.09 */ - oraclejdk8psu = throw '' - oraclejdk8psu: The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! - ''; - oraclejre8psu = oraclejdk8psu; - oraclejdk8psu_distro = oraclejdk8psu; - - dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 - sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 - gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; - todolist = throw "todolist is now ultralist."; # added 2020-12-27 - - /* Cleanup before 21.05 */ - riot-desktop = throw "riot-desktop is now element-desktop!"; - riot-web = throw "riot-web is now element-web"; - - ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; - - /* Added 2021-01-02 */ - ttyrec = ovh-ttyrec; - - tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # added 2012-06-12 - - zplugin = zinit; # Added 2021-01-30 - - posix_man_pages = man-pages-posix; # Added 2021-04-15 - - /* Cleanup before 21.11, Added 2021-05-07 */ avian = throw '' - The package doesn't compile anymore on NixOS and both development - & maintenance is abandoned by upstream. - ''; + The package doesn't compile anymore on NixOS and both development & + maintenance is abandoned by upstream. + ''; # Cleanup before 21.11, Added 2021-05-07 + ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + dina-font-pcf = dina-font; # Added 2020-02-09 + dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # Added 2020-02-02 + gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + gnatsd = nats-server; # Added 2019-10-28 - # Added 2021-06-01 obs-gstreamer = throw '' obs-gstreamer has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-gstreamer. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-move-transition = throw '' obs-move-transition has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-move-transition. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-multi-rtmp = throw '' obs-multi-rtmp has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-multi-rtmp. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-ndi = throw '' obs-ndi has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-ndi. - ''; + ''; # Added 2021-06-01 - obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 + obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 - # Added 2021-06-01 obs-wlrobs = throw '' wlrobs has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.wlrobs. - ''; + ''; # Added 2021-06-01 - multimc = throw "multimc was removed from nixpkgs; use polymc instead"; # Added 2022-01-08 + oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream."; # Cleanup before 20.09 + oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09 + oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09 + posix_man_pages = man-pages-posix; # Added 2021-04-15 + riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 + riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 + sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 + todolist = throw "todolist is now ultralist."; # Added 2020-12-27 + tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 + tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 + tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # Added 2012-06-12 + ttyrec = ovh-ttyrec; # Added 2021-01-02 + zplugin = zinit; # Added 2021-01-30 - /* If these are in the scope of all-packages.nix, they cause collisions - between mixed versions of qt. See: - https://github.com/NixOS/nixpkgs/pull/101369 */ - - inherit (plasma5Packages) breeze-icons oxygen-icons5; - inherit (plasma5Packages) - akonadi akregator ark - bomber bovo - dolphin dragon - elisa - ffmpegthumbs filelight - granatier gwenview - k3b - kaddressbook kalzium kapptemplate kapman kate katomic - kblackbox kblocks kbounce - kcachegrind kcalc kcharselect kcolorchooser - kdenlive kdf kdialog kdiamond - keditbookmarks - kfind kfloppy - kget kgpg - khelpcenter - kig kigo killbots kitinerary - kleopatra klettres klines - kmag kmail kmines kmix kmplot - knavalbattle knetwalk knights - kollision kolourpaint kompare konsole kontact korganizer - kpkpass - krdc kreversi krfb - kshisen ksquares ksystemlog - kteatime ktimer ktouch kturtle - kwalletmanager kwave - marble minuet - okular - picmi - spectacle - yakuake - ; - inherit (plasma5Packages) - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth - discover - kactivitymanagerd - kde-cli-tools kde-gtk-config kdeplasma-addons - kgamma5 - kinfocenter - kmenuedit - kscreen kscreenlocker ksshaskpass - kwallet-pam kwayland-integration kwin kwrited - milou - oxygen - plasma-browser-integration - plasma-desktop - plasma-integration - plasma-nm - plasma-pa - plasma-systemmonitor - plasma-thunderbolt - plasma-vault - plasma-workspace plasma-workspace-wallpapers - polkit-kde-agent powerdevil - qqc2-breeze-style - sddm-kcm systemsettings - xdg-desktop-portal-kde - plasma-phone-components - plasma-nano - ; - inherit (plasma5Packages.thirdParty) - plasma-applet-caffeine-plus - plasma-applet-virtual-desktop-bar - kwin-dynamic-workspaces - kwin-tiling - krohnkite - krunner-symbols - ; - inherit (libsForQt5) - sddm - ; + inherit (stdenv.hostPlatform) system; # Added 2021-10-22 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { @@ -1341,6 +1391,41 @@ mapAliases ({ targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; }); - inherit (stdenv.hostPlatform) system; # added 2021-10-22 + /* If these are in the scope of all-packages.nix, they cause collisions + between mixed versions of qt. See: + https://github.com/NixOS/nixpkgs/pull/101369 */ + + inherit (plasma5Packages) + akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk + breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa + ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook + kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce + kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config + kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy + kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary + kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot + knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact + korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares + ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam + kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet + okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop + plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components + plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style + sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake + ; + + inherit (plasma5Packages.thirdParty) + krohnkite + krunner-symbols + kwin-dynamic-workspaces + kwin-tiling + plasma-applet-caffeine-plus + plasma-applet-virtual-desktop-bar + ; + + inherit (libsForQt5) + sddm + ; }) diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 55669acf3e..3e2b883730 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -182,6 +182,8 @@ with pkgs; althttpd = callPackage ../servers/althttpd { }; + anders = callPackage ../applications/science/logic/anders { }; + ankisyncd = callPackage ../servers/ankisyncd { }; aocd = with python3Packages; toPythonApplication aocd; @@ -200,12 +202,16 @@ with pkgs; fission = callPackage ../development/tools/fission { }; + appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; + authy = callPackage ../applications/misc/authy { }; avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + bada-bib = callPackage ../applications/science/misc/bada-bib {}; + bakelite = callPackage ../tools/backup/bakelite { }; beyond-identity = callPackage ../tools/security/beyond-identity {}; @@ -347,7 +353,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - proto-contrib = callPackage ../development/tools/proto-contrib {}; + proto-contrib = callPackage ../development/tools/proto-contrib { }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -519,9 +525,7 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - packer = callPackage ../development/tools/packer { - buildGoModule = buildGo117Module; - }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; @@ -699,8 +703,14 @@ with pkgs; makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out - makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } - ../build-support/setup-hooks/make-wrapper.sh; + makeWrapper = makeSetupHook + { deps = [ dieHook ]; + substitutions = { + shell = targetPackages.runtimeShell; + passthru.tests = tests.makeWrapper; + }; + } + ../build-support/setup-hooks/make-wrapper.sh; makeBinaryWrapper = let f = { cc, sanitizers }: let @@ -1009,6 +1019,8 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; + glooctl = callPackage ../applications/networking/cluster/glooctl { }; + gobgp = callPackage ../tools/networking/gobgp { }; gofu = callPackage ../applications/misc/gofu { }; @@ -1074,6 +1086,10 @@ with pkgs; stdenv = clangStdenv; }; + archi = callPackage ../tools/misc/archi { }; + + breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1081,8 +1097,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; - archi = callPackage ../tools/misc/archi { }; - contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -1103,20 +1117,16 @@ with pkgs; hyper = callPackage ../applications/terminal-emulators/hyper { }; - iqueue = callPackage ../development/libraries/iqueue {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; - iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; + kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; kitty = callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; - lifecycled = callPackage ../tools/misc/lifecycled { }; - - lilo = callPackage ../tools/misc/lilo { }; - - logseq = callPackage ../applications/misc/logseq { }; + kitty-themes = callPackage ../misc/kitty-themes {}; lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; @@ -1130,26 +1140,26 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - natls = callPackage ../tools/misc/natls { }; - nimmm = callPackage ../applications/terminal-emulators/nimmm { }; - notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; - - pikchr = callPackage ../tools/graphics/pikchr { }; - - popsicle = callPackage ../tools/misc/popsicle { }; - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; + rxvt-unicode-emoji = rxvt-unicode.override { + rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji; + }; + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; + rxvt-unicode-unwrapped-emoji = rxvt-unicode-unwrapped.override { + emojiSupport = true; + }; + sakura = callPackage ../applications/terminal-emulators/sakura { }; st = callPackage ../applications/terminal-emulators/st { @@ -1162,16 +1172,12 @@ with pkgs; mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; - snowflake = callPackage ../tools/networking/snowflake { }; - stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; }; terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminal-colors = callPackage ../applications/misc/terminal-colors { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; @@ -1181,36 +1187,56 @@ with pkgs; termonad = termonad-with-packages; - termsyn = callPackage ../data/fonts/termsyn { }; - tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; tilix = callPackage ../applications/terminal-emulators/tilix { }; - timedoctor = callPackage ../applications/office/timedoctor { }; - - tvnamer = callPackage ../tools/misc/tvnamer { }; - - twine = with python3Packages; toPythonApplication twine; - wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = callPackage ../applications/terminal-emulators/wezterm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; }; - writefreely = callPackage ../applications/misc/writefreely { }; - x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xterm = callPackage ../applications/terminal-emulators/xterm { }; - xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { }; yaft = callPackage ../applications/terminal-emulators/yaft { }; + writefreely = callPackage ../applications/misc/writefreely { }; + + iqueue = callPackage ../development/libraries/iqueue { }; + + lifecycled = callPackage ../tools/misc/lifecycled { }; + + lilo = callPackage ../tools/misc/lilo { }; + + logseq = callPackage ../applications/misc/logseq { + electron = electron_16; + }; + + natls = callPackage ../tools/misc/natls { }; + + notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; + + pikchr = callPackage ../tools/graphics/pikchr { }; + + popsicle = callPackage ../tools/misc/popsicle { }; + + terminal-colors = callPackage ../applications/misc/terminal-colors { }; + + termsyn = callPackage ../data/fonts/termsyn { }; + + timedoctor = callPackage ../applications/office/timedoctor { }; + + tvnamer = callPackage ../tools/misc/tvnamer { }; + + twine = with python3Packages; toPythonApplication twine; + aldo = callPackage ../applications/radio/aldo { }; almanah = callPackage ../applications/misc/almanah { }; @@ -1477,8 +1503,6 @@ with pkgs; ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; - ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; - exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; altermime = callPackage ../tools/networking/altermime {}; @@ -1691,6 +1715,8 @@ with pkgs; dkimpy = with python3Packages; toPythonApplication dkimpy; + dontgo403 = callPackage ../tools/security/dontgo403 { }; + dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; dot-http = callPackage ../development/tools/dot-http { @@ -1711,10 +1737,6 @@ with pkgs; emplace = callPackage ../tools/package-management/emplace { }; - encryptr = callPackage ../tools/security/encryptr { - gconf = gnome2.GConf; - }; - enchive = callPackage ../tools/security/enchive { }; enjarify = callPackage ../tools/misc/enjarify { }; @@ -1761,9 +1783,7 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; - galene = callPackage ../servers/web-apps/galene { - buildGoModule = buildGo115Module; - }; + galene = callPackage ../servers/web-apps/galene { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1887,6 +1907,8 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; + lesspass-cli = callPackage ../tools/security/lesspass-cli { }; lsix = callPackage ../tools/graphics/lsix { }; @@ -1937,6 +1959,8 @@ with pkgs; git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gosh = callPackage ../tools/security/gosh { }; gospider = callPackage ../tools/security/gospider { }; @@ -2336,9 +2360,7 @@ with pkgs; btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; - btrbk = callPackage ../tools/backup/btrbk { - asciidoc = asciidoc-full; - }; + btrbk = callPackage ../tools/backup/btrbk { }; buildpack = callPackage ../development/tools/buildpack { }; @@ -2521,7 +2543,7 @@ with pkgs; clog-cli = callPackage ../development/tools/clog-cli { }; - cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; + cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; }; cloudbrute = callPackage ../tools/security/cloudbrute { }; @@ -2754,10 +2776,6 @@ with pkgs; dehydrated = callPackage ../tools/admin/dehydrated { }; - deis = callPackage ../development/tools/deis {}; - - deisctl = callPackage ../development/tools/deisctl {}; - deja-dup = callPackage ../applications/backup/deja-dup { }; dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { }; @@ -2927,9 +2945,9 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_13; + electron = electron_15; }; - element-desktop-wayland = writeScript "element-desktop-wayland" '' + element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" ''; @@ -2976,6 +2994,8 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + extrude = callPackage ../tools/security/extrude { }; + f3 = callPackage ../tools/filesystems/f3 { }; f3d = callPackage ../applications/graphics/f3d { @@ -2986,6 +3006,8 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; + findimagedupes = callPackage ../tools/graphics/findimagedupes { }; + facter = callPackage ../tools/system/facter { }; fasd = callPackage ../tools/misc/fasd { }; @@ -3113,6 +3135,8 @@ with pkgs; ghidra-bin = callPackage ../tools/security/ghidra { }; + gh2md = callPackage ../tools/backup/gh2md { }; + gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; giph = callPackage ../applications/video/giph { }; @@ -3165,7 +3189,9 @@ with pkgs; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; - godu = callPackage ../tools/misc/godu { }; + godu = callPackage ../tools/misc/godu { + buildGoModule = buildGo116Module; + }; goss = callPackage ../tools/misc/goss { }; @@ -3175,7 +3201,9 @@ with pkgs; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; - gping = callPackage ../tools/networking/gping { }; + gping = callPackage ../tools/networking/gping { + inherit (darwin.apple_sdk.frameworks) Security; + }; gpu-burn = callPackage ../applications/misc/gpu-burn { }; @@ -3461,6 +3489,8 @@ with pkgs; mrkd = with python3Packages; toPythonApplication mrkd; + nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; + n2n = callPackage ../tools/networking/n2n { }; nextdns = callPackage ../applications/networking/nextdns { }; @@ -3515,6 +3545,8 @@ with pkgs; oneshot = callPackage ../tools/networking/oneshot { }; + orjail = callPackage ../tools/security/orjail { }; + online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; xkbd = callPackage ../applications/misc/xkbd { }; @@ -3855,14 +3887,7 @@ with pkgs; bdsync = callPackage ../tools/backup/bdsync { }; - beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { - # developed for a compiler with C++20 support - stdenv = - if stdenv.isDarwin then - overrideCC stdenv clang_10 - else - stdenv; - }; + beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; beanstalkd = callPackage ../servers/beanstalkd { }; @@ -4189,6 +4214,10 @@ with pkgs; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; + unparam = callPackage ../tools/misc/unparam { }; + + inherit (nodePackages) uppy-companion; + usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; @@ -4246,9 +4275,7 @@ with pkgs; ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { - go = go_1_15; - }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -4296,13 +4323,9 @@ with pkgs; dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; - age = callPackage ../tools/security/age { - buildGoModule = buildGo117Module; - }; + age = callPackage ../tools/security/age { }; - agebox = callPackage ../tools/security/agebox { - buildGoModule = buildGo117Module; - }; + agebox = callPackage ../tools/security/agebox { }; age-plugin-yubikey = callPackage ../tools/security/age-plugin-yubikey { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; @@ -4926,7 +4949,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - schildichat-desktop-wayland = writeScript "schildichat-desktop-wayland" '' + schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@" ''; @@ -4983,7 +5006,9 @@ with pkgs; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - utahfs = callPackage ../applications/networking/utahfs { }; + utahfs = callPackage ../applications/networking/utahfs { + buildGoPackage = buildGo116Package; + }; wakeonlan = callPackage ../tools/networking/wakeonlan { }; @@ -4993,6 +5018,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; + snowflake = callPackage ../tools/networking/snowflake { }; + wsl-open = callPackage ../tools/misc/wsl-open { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; @@ -5122,9 +5149,11 @@ with pkgs; escrotum = callPackage ../tools/graphics/escrotum { }; etcher = callPackage ../tools/misc/etcher { - electron = electron_14; + electron = electron_12; }; + ethercalc = callPackage ../servers/web-apps/ethercalc { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; @@ -5246,12 +5275,16 @@ with pkgs; fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { }; + fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { }; fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; + fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { }; + fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { }; fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { }; @@ -5559,6 +5592,8 @@ with pkgs; gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; + garage = callPackage ../tools/filesystems/garage { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {}; @@ -5894,19 +5929,17 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; - gnash = callPackage ../misc/gnash { - autoreconfHook = buildPackages.autoreconfHook269; - }; - gnirehtet = callPackage ../tools/networking/gnirehtet { }; + gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; + gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; gnome-keysign = callPackage ../tools/security/gnome-keysign { }; - gnome-passwordsafe = callPackage ../applications/misc/gnome-passwordsafe { }; + gnome-secrets = callPackage ../applications/misc/gnome-secrets { }; gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; @@ -5988,7 +6021,9 @@ with pkgs; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - goofys = callPackage ../tools/filesystems/goofys { }; + goofys = callPackage ../tools/filesystems/goofys { + buildGoModule = buildGo116Module; + }; go-sct = callPackage ../tools/X11/go-sct { }; @@ -6019,12 +6054,16 @@ with pkgs; google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; - google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; + google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; google-java-format = callPackage ../development/tools/google-java-format { }; + google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { }; + + google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { }; + gdown = with python3Packages; toPythonApplication gdown; gopro = callPackage ../tools/video/gopro { }; @@ -6370,9 +6409,7 @@ with pkgs; heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { - buildGoModule = buildGo117Module; - }; + headscale = callPackage ../servers/headscale { }; heisenbridge = callPackage ../servers/heisenbridge { }; @@ -6610,8 +6647,6 @@ with pkgs; ioping = callPackage ../tools/system/ioping { }; - iops = callPackage ../tools/system/iops { }; - ior = callPackage ../tools/system/ior { }; iouyap = callPackage ../tools/networking/iouyap { }; @@ -6626,8 +6661,12 @@ with pkgs; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; + ipfs = callPackage ../applications/networking/ipfs { + buildGoModule = buildGo116Module; + }; + ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { + buildGoModule = buildGo116Module; + }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo116Module; }; @@ -6697,6 +6736,8 @@ with pkgs; jadx = callPackage ../tools/security/jadx { }; + jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -6732,6 +6773,8 @@ with pkgs; jl = haskellPackages.callPackage ../development/tools/jl { }; + jless = callPackage ../development/tools/jless { }; + jmespath = callPackage ../development/tools/jmespath { }; jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; @@ -7581,6 +7624,8 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; + lziprecover = callPackage ../tools/compression/lziprecover { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { openimagedenoise = openimagedenoise_1_2_x; }; @@ -7750,9 +7795,7 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minio-client = callPackage ../tools/networking/minio-client { - buildGoModule = buildGo117Module; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minio-certgen = callPackage ../tools/security/minio-certgen { }; @@ -7833,6 +7876,10 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; + morgen = callPackage ../applications/office/morgen { + electron = electron_15; + }; + mosh = callPackage ../tools/networking/mosh { }; mpage = callPackage ../tools/text/mpage { }; @@ -7895,10 +7942,6 @@ with pkgs; munge = callPackage ../tools/security/munge { }; - munt = libsForQt5.callPackage ../applications/audio/munt { - jack = libjack2; - }; - mutagen = callPackage ../tools/misc/mutagen { }; mycli = callPackage ../tools/admin/mycli { }; @@ -8081,11 +8124,6 @@ with pkgs; # with different versions we pin Go for all versions. # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { - buildGoPackage = buildGo115Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix { buildGoModule = buildGo116Module; inherit (linuxPackages) nvidia_x11; @@ -8279,7 +8317,9 @@ with pkgs; obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + buildGoModule = buildGo116Module; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -8479,6 +8519,7 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -8692,8 +8733,6 @@ with pkgs; pdfminer = with python3Packages; toPythonApplication pdfminer; - pdfmod = callPackage ../applications/misc/pdfmod { }; - pdf-quench = callPackage ../applications/misc/pdf-quench { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; @@ -8708,6 +8747,8 @@ with pkgs; pcapc = callPackage ../tools/networking/pcapc { }; + pdm = callPackage ../tools/package-management/pdm { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; peco = callPackage ../tools/text/peco { }; @@ -8762,6 +8803,8 @@ with pkgs; xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; + pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; + pingtcp = callPackage ../tools/networking/pingtcp { }; pinnwand = callPackage ../servers/pinnwand { }; @@ -9188,6 +9231,8 @@ with pkgs; rep = callPackage ../development/tools/rep { }; + repseek = callPackage ../applications/science/biology/repseek { }; + reicast = callPackage ../misc/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9478,7 +9523,7 @@ with pkgs; sasquatch = callPackage ../tools/filesystems/sasquatch { }; - sasview = callPackage ../applications/science/misc/sasview {}; + sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; scallion = callPackage ../tools/security/scallion { }; @@ -9608,10 +9653,6 @@ with pkgs; shout = nodePackages.shout; - shellinabox = callPackage ../servers/shellinabox { - openssl = openssl_1_0_2; - }; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -10140,9 +10181,7 @@ with pkgs; pythonPackages = python3Packages; }; - telepresence2 = callPackage ../tools/networking/telepresence2 { - buildGoModule = buildGo116Module; - }; + telepresence2 = callPackage ../tools/networking/telepresence2 { }; teler = callPackage ../tools/security/teler { }; @@ -10232,8 +10271,6 @@ with pkgs; tilem = callPackage ../misc/emulators/tilem { }; - tilp2 = callPackage ../applications/science/math/tilp2 { }; - timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; @@ -10242,8 +10279,6 @@ with pkgs; timetagger = callPackage ../servers/timetagger { }; - timekeeper = callPackage ../applications/office/timekeeper { }; - timezonemap = callPackage ../development/libraries/timezonemap { }; tzupdate = callPackage ../applications/misc/tzupdate { }; @@ -10574,13 +10609,9 @@ with pkgs; uwufetch = callPackage ../tools/misc/uwufetch { }; - v2ray = callPackage ../tools/networking/v2ray { - buildGoModule = buildGo117Module; - }; + v2ray = callPackage ../tools/networking/v2ray { }; - v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { - pkgsBuildBuild.buildGoModule = pkgsBuildBuild.buildGo117Module; - }; + v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; @@ -10794,6 +10825,10 @@ with pkgs; wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { }; + wg-netmanager = callPackage ../tools/networking/wg-netmanager { + inherit (darwin.apple_sdk.frameworks) Security; + }; + woff2 = callPackage ../development/web/woff2 { }; woof = callPackage ../tools/misc/woof { }; @@ -10826,7 +10861,9 @@ with pkgs; testdisk-qt = testdisk.override { enableQt = true; }; - textql = callPackage ../development/tools/textql { }; + textql = callPackage ../development/tools/textql { + buildGoPackage = buildGo116Package; + }; html2text = callPackage ../tools/text/html2text { }; @@ -11232,7 +11269,9 @@ with pkgs; yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yajsv = callPackage ../tools/misc/yajsv { }; + yajsv = callPackage ../tools/misc/yajsv { + buildGoModule = buildGo116Module; + }; yallback = callPackage ../development/tools/analysis/yallback { }; @@ -11769,7 +11808,7 @@ with pkgs; copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { - llvmPackages = llvmPackages_10; + llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; }) crystal_1_0 crystal_1_1 @@ -12381,13 +12420,6 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -12402,6 +12434,13 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); + go_1_18 = callPackage ../development/compilers/go/1.18.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; + }); + go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -12409,7 +12448,7 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_16; + go = go_1_17; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -12672,10 +12711,7 @@ with pkgs; /**/ if platform.isDarwin then 11 else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then - /**/ if platform.isRiscV then 11 - else if platform.isMusl then 11 - else 7 + else if platform.isLinux then 11 else if platform.isWasm then 8 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the @@ -12952,18 +12988,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_57 = callPackage ../development/compilers/rust/1_57.nix { + rust_1_58 = callPackage ../development/compilers/rust/1_58.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_57; + rust = rust_1_58; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_57 = rust_1_57.packages.stable; - rustPackages = rustPackages_1_57; + rustPackages_1_58 = rust_1_58.packages.stable; + rustPackages = rustPackages_1_58; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -13140,6 +13176,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { }; + rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; @@ -13280,6 +13317,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + uasm = callPackage ../development/compilers/uasm { }; + urn = callPackage ../development/compilers/urn { }; urweb = callPackage ../development/compilers/urweb { @@ -13526,9 +13565,7 @@ with pkgs; io = callPackage ../development/interpreters/io { }; - ivy = callPackage ../development/interpreters/ivy { - buildGoModule = buildGo117Module; - }; + ivy = callPackage ../development/interpreters/ivy { }; j = callPackage ../development/interpreters/j { stdenv = clangStdenv; @@ -13629,6 +13666,8 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; + nextflow = callPackage ../development/interpreters/nextflow { }; + ngn-k = callPackage ../development/interpreters/ngn-k { }; obb = callPackage ../development/interpreters/clojure/obb.nix { }; @@ -13896,7 +13935,6 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { }; @@ -13972,12 +14010,6 @@ with pkgs; guile-git = callPackage ../development/guile-modules/guile-git { }; - guile-gnome = callPackage ../development/guile-modules/guile-gnome { - gconf = gnome2.GConf; - guile = guile_2_0; - inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; - }; - guile-json = callPackage ../development/guile-modules/guile-json { }; guile-lib = callPackage ../development/guile-modules/guile-lib { }; @@ -14058,9 +14090,7 @@ with pkgs; abuild = callPackage ../development/tools/abuild { }; - actionlint = callPackage ../development/tools/analysis/actionlint { - buildGoModule = buildGo117Module; - }; + actionlint = callPackage ../development/tools/analysis/actionlint { }; adtool = callPackage ../tools/admin/adtool { }; @@ -14149,7 +14179,8 @@ with pkgs; electron_13 electron_14 electron_15 - electron_16; + electron_16 + electron_17; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -14263,13 +14294,7 @@ with pkgs; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { - # error: no viable constructor or deduction guide for deduction of template arguments of 'map' - stdenv = if stdenv.hostPlatform.system == "x86_64-darwin" then - llvmPackages_11.stdenv - else - stdenv; - }; + bear = callPackage ../development/tools/build-managers/bear { }; bingrep = callPackage ../development/tools/analysis/bingrep { }; @@ -14336,6 +14361,8 @@ with pkgs; bloaty = callPackage ../development/tools/bloaty { }; + bloomrpc = callPackage ../development/web/bloomrpc { }; + bloop = callPackage ../development/tools/build-managers/bloop { }; bossa = callPackage ../development/embedded/bossa { @@ -14444,6 +14471,8 @@ with pkgs; cfr = callPackage ../development/tools/java/cfr { }; + cfripper = callPackage ../tools/security/cfripper { }; + checkra1n = callPackage ../development/mobile/checkra1n { }; checkstyle = callPackage ../development/tools/analysis/checkstyle { }; @@ -14721,6 +14750,8 @@ with pkgs; emma = callPackage ../development/tools/analysis/emma { }; + ent-go = callPackage ../development/tools/ent { }; + epm = callPackage ../development/tools/misc/epm { }; eresi = callPackage ../development/tools/analysis/eresi { }; @@ -14927,6 +14958,8 @@ with pkgs; ccloud-cli = callPackage ../development/tools/ccloud-cli { }; + confluent-cli = callPackage ../development/tools/confluent-cli { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -15505,7 +15538,9 @@ with pkgs; spooles = callPackage ../development/libraries/science/math/spooles {}; - spruce = callPackage ../development/tools/misc/spruce { }; + spruce = callPackage ../development/tools/misc/spruce { + buildGoModule = buildGo116Module; + }; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; @@ -15554,9 +15589,7 @@ with pkgs; c2ffi = callPackage ../development/tools/misc/c2ffi { }; - c3c = callPackage ../development/compilers/c3c { - llvmPackages = llvmPackages_11; - }; + c3c = callPackage ../development/compilers/c3c { }; swfmill = callPackage ../tools/video/swfmill { }; @@ -15589,9 +15622,7 @@ with pkgs; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; - terraformer = callPackage ../development/tools/misc/terraformer { - buildGoModule = buildGo117Module; - }; + terraformer = callPackage ../development/tools/misc/terraformer { }; terrascan = callPackage ../tools/security/terrascan { }; @@ -15781,7 +15812,9 @@ with pkgs; aalib = callPackage ../development/libraries/aalib { }; - abseil-cpp = callPackage ../development/libraries/abseil-cpp { }; + abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { }; + abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; + abseil-cpp = abseil-cpp_202103; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -16424,6 +16457,8 @@ with pkgs; ffmpeg_3 = ffmpeg_3_4; # Please make sure this is updated to the latest version on the next major # update to ffmpeg + # Packages which use ffmpeg as a library, should pin to the relevant major + # version number which the upstream support. ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { @@ -16558,10 +16593,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { - # https://github.com/burrowers/garble/issues/124 - buildGoModule = buildGo115Module; - }; + garble = callPackage ../build-support/go/garble.nix { }; gcab = callPackage ../development/libraries/gcab { }; @@ -16634,8 +16666,6 @@ with pkgs; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; - giblib = callPackage ../development/libraries/giblib { }; - gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; gio-sharp = callPackage ../development/libraries/gio-sharp { }; @@ -16866,8 +16896,6 @@ with pkgs; gflags = callPackage ../development/libraries/gflags { }; - gfm = callPackage ../applications/science/math/gfm { }; - gperftools = callPackage ../development/libraries/gperftools { }; grab-site = callPackage ../tools/backup/grab-site { }; @@ -16922,8 +16950,6 @@ with pkgs; pgweb = callPackage ../development/tools/database/pgweb { }; - gpgstats = callPackage ../tools/security/gpgstats { }; - gpshell = callPackage ../development/tools/misc/gpshell { }; grantlee = callPackage ../development/libraries/grantlee { }; @@ -17014,8 +17040,6 @@ with pkgs; gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; - gnome-menus = callPackage ../development/libraries/gnome-menus { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; @@ -17058,17 +17082,9 @@ with pkgs; gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { }; - gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; @@ -17334,8 +17350,7 @@ with pkgs; iso-flags = callPackage ../data/icons/iso-flags { }; ispc = callPackage ../development/compilers/ispc { - stdenv = llvmPackages_11.stdenv; - llvmPackages = llvmPackages_11; + inherit (llvmPackages) stdenv; }; isso = callPackage ../servers/isso { @@ -17874,9 +17889,7 @@ with pkgs; libinklevel = callPackage ../development/libraries/libinklevel { }; - libnats-c = callPackage ../development/libraries/libnats-c { - openssl = openssl_1_0_2; - }; + libnats-c = callPackage ../development/libraries/libnats-c { }; liburing = callPackage ../development/libraries/liburing { }; @@ -17975,8 +17988,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - libgksu = callPackage ../development/libraries/libgksu { }; - libgnt = callPackage ../development/libraries/libgnt { }; libgpg-error = callPackage ../development/libraries/libgpg-error { }; @@ -19068,10 +19079,6 @@ with pkgs; neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { - openssl = openssl_1_0_2; - }; - nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newman = callPackage ../development/web/newman {}; @@ -19223,10 +19230,12 @@ with pkgs; opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; + ffmpeg = ffmpeg_4; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + ffmpeg = ffmpeg_4; }; opencv3WithoutCuda = opencv3.override { @@ -19236,6 +19245,7 @@ with pkgs; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; pythonPackages = python3Packages; + ffmpeg = ffmpeg_4; }; opencv = opencv4; @@ -19800,6 +19810,8 @@ with pkgs; SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; + sdnotify-wrapper = skawarePackages.sdnotify-wrapper; sdrplay = callPackage ../applications/radio/sdrplay {}; @@ -19855,6 +19867,8 @@ with pkgs; skaffold = callPackage ../development/tools/skaffold { }; + skjold = callPackage ../development/tools/skjold { }; + skalibs = skawarePackages.skalibs; skalibs_2_10 = skawarePackages.skalibs_2_10; @@ -20219,9 +20233,7 @@ with pkgs; triehash = callPackage ../tools/misc/triehash { }; - trillian = callPackage ../tools/misc/trillian { - buildGoModule = buildGo115Module; - }; + trillian = callPackage ../tools/misc/trillian { }; twolame = callPackage ../development/libraries/twolame { }; @@ -20392,7 +20404,10 @@ with pkgs; websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; + # bump when majoring of packages have updated + webrtc-audio-processing = webrtc-audio-processing_0_3; wildmidi = callPackage ../development/libraries/wildmidi { }; @@ -20416,21 +20431,14 @@ with pkgs; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; - }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { @@ -20445,10 +20453,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; - inherit (darwin.stubs) setfile rez derez; - }; + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { }; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; @@ -20647,10 +20652,6 @@ with pkgs; httpunit = callPackage ../development/libraries/java/httpunit { }; - gwtdragdrop = callPackage ../development/libraries/java/gwt-dragdrop { }; - - gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - javaCup = callPackage ../development/libraries/java/cup { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -20693,39 +20694,29 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo115Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_15; - }; buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoPackage != buildGo117Package`. buildGo117Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_17; }; - - buildGoPackage = buildGo116Package; - - buildGo115Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_15; + buildGo118Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_18; }; + + buildGoPackage = buildGo117Package; + buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoModule != buildGo117Module`. buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; }; + buildGo118Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_18; + }; - buildGoModule = buildGo116Module; + buildGoModule = buildGo117Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -20847,7 +20838,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - alps = callPackage ../servers/alps {}; + alps = callPackage ../servers/alps { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -21014,7 +21005,6 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - go = go_1_15; jdk = openjdk11; gn = gn1924; }; @@ -21092,9 +21082,13 @@ with pkgs; grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; - grafana-loki = callPackage ../servers/monitoring/loki { - buildGoModule = buildGo116Module; - }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + + promtail = grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; + }); grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -21214,7 +21208,7 @@ with pkgs; mailman = callPackage ../servers/mail/mailman/wrapped.nix { }; - mailman-rss = callPackage ../development/python-modules/mailman-rss { }; + mailman-rss = callPackage ../tools/misc/mailman-rss { }; mailman-web = with python3.pkgs; toPythonApplication mailman-web; @@ -21233,25 +21227,19 @@ with pkgs; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { - buildGoModule = buildGo117Module; - }; + matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; mbtileserver = callPackage ../servers/mbtileserver { }; - mediatomb = callPackage ../servers/mediatomb { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { - buildGoModule = buildGo117Module; - }; + minio = callPackage ../servers/minio { }; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; @@ -21270,7 +21258,7 @@ with pkgs; mod_timestamp = apacheHttpdPackages.mod_timestamp; inherit (callPackages ../servers/mpd { - stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; + stdenv = if (with stdenv; cc.isClang && isx86_64) then llvmPackages_8.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; }) mpd mpd-small mpdWithFeatures; @@ -21296,7 +21284,9 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; + mycorrhiza = callPackage ../servers/mycorrhiza { + buildGoModule = buildGo116Module; + }; myserver = callPackage ../servers/http/myserver { }; @@ -21473,9 +21463,7 @@ with pkgs; libpulseaudio = libpulseaudio-vanilla; - easyeffects = callPackage ../applications/audio/easyeffects { - glibmm = glibmm_2_68; - }; + easyeffects = callPackage ../applications/audio/easyeffects { }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { boost = boost172; @@ -21556,12 +21544,8 @@ with pkgs; }; influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb2-server = callPackage ../servers/nosql/influxdb2 { - buildGoModule = buildGo117Module; - }; - influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { - buildGoModule = buildGo117Module; - }; + influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; + influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, # which bundled the server and CLI into the same derivation. Will be # removed in a few releases. @@ -21640,8 +21624,7 @@ with pkgs; openfire = callPackage ../servers/xmpp/openfire { }; - softether_4_29 = callPackage ../servers/softether/4.29.nix { }; - softether = softether_4_29; + softether = callPackage ../servers/softether { }; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; @@ -21847,7 +21830,9 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { }; + sampler = callPackage ../applications/misc/sampler { + buildGoModule = buildGo116Module; + }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; @@ -21912,9 +21897,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo117Module; - }; + tailscale = callPackage ../servers/tailscale { }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -21954,7 +21937,9 @@ with pkgs; inherit (callPackages ../servers/unifi { }) unifiLTS unifi5 - unifi6; + unifi6 + unifi7; + unifi = unifi6; unifi-video = callPackage ../servers/unifi-video { }; @@ -21965,10 +21950,14 @@ with pkgs; urserver = callPackage ../servers/urserver { }; - vouch-proxy = callPackage ../servers/vouch-proxy { }; + vouch-proxy = callPackage ../servers/vouch-proxy { + buildGoModule = buildGo116Module; + }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + virtiofsd = callPackage ../servers/misc/virtiofsd { }; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; virtualenv = with python3Packages; toPythonApplication virtualenv; @@ -22312,7 +22301,7 @@ with pkgs; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailctl = callPackage ../applications/networking/gmailctl {}; + gmailctl = callPackage ../applications/networking/gmailctl { }; gomp = callPackage ../applications/version-management/gomp { }; @@ -22449,6 +22438,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + linthesia = callPackage ../games/linthesia/default.nix { }; + libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; @@ -22606,6 +22597,8 @@ with pkgs; lockdep = callPackage ../os-specific/linux/lockdep { }; + lsirec = callPackage ../os-specific/linux/lsirec { }; + lsiutil = callPackage ../os-specific/linux/lsiutil { }; kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { }; @@ -22805,19 +22798,13 @@ with pkgs; quicktemplate = callPackage ../development/tools/quicktemplate { }; - gogoclient = callPackage ../os-specific/linux/gogoclient { - openssl = openssl_1_0_2; - }; - linux-pam = callPackage ../os-specific/linux/pam { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { - llvmPackages = llvmPackages_11; - }; + odin = callPackage ../development/compilers/odin { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -23549,7 +23536,9 @@ with pkgs; go-font = callPackage ../data/fonts/go-font { }; - graphite-gtk-theme = callPackage ../data/themes/graphite { }; + graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; + + graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; greybird = callPackage ../data/themes/greybird { }; @@ -23641,6 +23630,8 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; + kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -23944,6 +23935,8 @@ with pkgs; publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + phinger-cursors = callPackage ../data/icons/phinger-cursors { }; + qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; qogir-theme = callPackage ../data/themes/qogir { }; @@ -23984,8 +23977,6 @@ with pkgs; sweet = callPackage ../data/themes/sweet { }; - mime-types = callPackage ../data/misc/mime-types { }; - shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; @@ -24469,9 +24460,7 @@ with pkgs; bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - blocky = callPackage ../applications/networking/blocky { - buildGoModule = buildGo117Module; - }; + blocky = callPackage ../applications/networking/blocky { }; cadence = libsForQt5.callPackage ../applications/audio/cadence { }; @@ -24762,6 +24751,8 @@ with pkgs; boops = callPackage ../applications/audio/boops { }; + ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; + ChowKick = callPackage ../applications/audio/ChowKick { }; CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; @@ -24814,6 +24805,8 @@ with pkgs; cmatrix = callPackage ../applications/misc/cmatrix { }; + cmctl = callPackage ../applications/networking/cluster/cmctl { }; + cmus = callPackage ../applications/audio/cmus { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; @@ -24883,9 +24876,7 @@ with pkgs; coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim { - buildGoPackage = buildGo115Package; - }; + coyim = callPackage ../applications/networking/instant-messengers/coyim { }; cozy-drive = callPackage ../applications/networking/cozy-drive {}; @@ -24934,7 +24925,7 @@ with pkgs; darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; darktable = callPackage ../applications/graphics/darktable { - lua = lua5_3; + lua = lua5_4; pugixml = pugixml.override { shared = true; }; }; @@ -25020,13 +25011,9 @@ with pkgs; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; - docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; - docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; inherit (darwin) cctools; @@ -25039,9 +25026,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { - buildGoModule = buildGo117Module; - }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -25093,11 +25078,9 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff {}; + dyff = callPackage ../development/tools/dyff { }; - dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_14; - }; + dwl = callPackage ../applications/window-managers/dwl { }; dwm = callPackage ../applications/window-managers/dwm { # dwm is configured entirely through source modification. Allow users to @@ -25149,6 +25132,8 @@ with pkgs; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; + electrum-grs = libsForQt5.callPackage ../applications/misc/electrum-grs { }; + electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -25442,8 +25427,6 @@ with pkgs; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; - gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { @@ -26136,8 +26119,6 @@ with pkgs; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; - heme = callPackage ../applications/editors/heme { }; - herbe = callPackage ../applications/misc/herbe { }; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; @@ -26250,6 +26231,12 @@ with pkgs; musikcube = callPackage ../applications/audio/musikcube {}; + libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; + + mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; + + mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { }; + p2pool = callPackage ../applications/misc/p2pool { }; pass2csv = python3Packages.callPackage ../tools/security/pass2csv {}; @@ -26264,6 +26251,8 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -26322,6 +26311,8 @@ with pkgs; swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; + tiramisu = callPackage ../applications/misc/tiramisu { }; rootbar = callPackage ../applications/misc/rootbar {}; @@ -26526,9 +26517,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - # Impressive, formerly known as "KeyJNote". - impressive = callPackage ../applications/office/impressive { }; - index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; @@ -26768,9 +26756,7 @@ with pkgs; kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - kuttl = callPackage ../applications/networking/cluster/kuttl { - buildGoModule = buildGo115Module; - }; + kuttl = callPackage ../applications/networking/cluster/kuttl { }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; @@ -26794,10 +26780,7 @@ with pkgs; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { - # Fix-Me: This locking should be removed once PR #154059 is merged. - buildGoModule = buildGo117Module; - }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; @@ -26857,7 +26840,7 @@ with pkgs; lame = callPackage ../development/libraries/lame { }; labwc = callPackage ../applications/window-managers/labwc { - wlroots = wlroots_0_14; + wlroots = wlroots_0_15; }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -26902,8 +26885,10 @@ with pkgs; boost = boost175; }; - libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped = libreoffice.libreoffice; + libreoffice = if stdenv.isDarwin + then callPackage ../applications/office/libreoffice/darwin.nix {} + else hiPrio libreoffice-still; + libreoffice-unwrapped = (hiPrio libreoffice-still).libreoffice; libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; @@ -27032,6 +27017,8 @@ with pkgs; inherit (luajitPackages) luafilesystem; }; + lookatme = callPackage ../tools/misc/lookatme {}; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; ltc-tools = callPackage ../applications/audio/ltc-tools { }; @@ -27229,7 +27216,6 @@ with pkgs; minikube = callPackage ../applications/networking/cluster/minikube { inherit (darwin.apple_sdk.frameworks) vmnet; - buildGoModule = buildGo117Module; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -27287,8 +27273,6 @@ with pkgs; monkeysphere = callPackage ../tools/security/monkeysphere { }; - monodevelop = callPackage ../applications/editors/monodevelop {}; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; boost = boost170; @@ -27344,6 +27328,8 @@ with pkgs; mozjpeg = callPackage ../applications/graphics/mozjpeg { }; + edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; + easytag = callPackage ../applications/audio/easytag { }; mp3gain = callPackage ../applications/audio/mp3gain { }; @@ -27809,9 +27795,7 @@ with pkgs; nvpy = callPackage ../applications/editors/nvpy { }; - obconf = callPackage ../tools/X11/obconf { - inherit (gnome2) libglade; - }; + obconf = callPackage ../tools/X11/obconf { }; oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; @@ -28134,8 +28118,7 @@ with pkgs; plexamp = callPackage ../applications/audio/plexamp { }; - # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails - plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -28356,7 +28339,7 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; @@ -28399,6 +28382,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + redux = callPackage ../applications/audio/redux { }; + roomeqwizard = callPackage ../applications/audio/roomeqwizard { }; radiotray-ng = callPackage ../applications/audio/radiotray-ng { @@ -28555,6 +28540,8 @@ with pkgs; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seahub = callPackage ../applications/networking/seahub { }; + seatd = callPackage ../applications/misc/seatd { }; secretscanner = callPackage ../tools/security/secretscanner { }; @@ -29017,9 +29004,7 @@ with pkgs; tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; - tendermint = callPackage ../tools/networking/tendermint { - buildGoModule = buildGo116Module; - }; + tendermint = callPackage ../tools/networking/tendermint { }; termdbms = callPackage ../development/tools/database/termdbms { }; @@ -29308,7 +29293,7 @@ with pkgs; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; vengi-tools = callPackage ../applications/graphics/vengi-tools { - inherit (darwin.apple_sdk.frameworks) Carbon OpenCL; + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices OpenCL; }; verbiste = callPackage ../applications/misc/verbiste { @@ -29626,7 +29611,7 @@ with pkgs; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; - weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; + weston = callPackage ../applications/window-managers/weston { }; whalebird = callPackage ../applications/misc/whalebird { electron = electron_14; @@ -29671,6 +29656,8 @@ with pkgs; wofi-emoji = callPackage ../applications/misc/wofi-emoji { }; + cl-wordle = callPackage ../games/cl-wordle { }; + wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -29754,6 +29741,8 @@ with pkgs; gtk = gtk2; }; + xxh = with python3Packages; toPythonApplication xxh; + kodiPackages = recurseIntoAttrs (kodi.packages); kodi = callPackage ../applications/video/kodi { @@ -29986,8 +29975,6 @@ with pkgs; yarp = callPackage ../applications/science/robotics/yarp {}; - yarssr = callPackage ../applications/misc/yarssr { }; - yate = callPackage ../applications/misc/yate { }; ydiff = with python3.pkgs; toPythonApplication ydiff; @@ -30030,7 +30017,8 @@ with pkgs; zanshin = libsForQt5.callPackage ../applications/office/zanshin { }; - zathura = callPackage ../applications/misc/zathura { }; + zathuraPkgs = callPackage ../applications/misc/zathura { }; + zathura = zathuraPkgs.zathuraWrapper; zdns = callPackage ../tools/security/zdns { }; @@ -30146,6 +30134,8 @@ with pkgs; clightning = callPackage ../applications/blockchains/clightning { }; + besu = callPackage ../applications/blockchains/besu { }; + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { boost = boost165; withGui = true; @@ -30237,6 +30227,8 @@ with pkgs; faraday = callPackage ../applications/blockchains/faraday { }; + fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; + go-ethereum = callPackage ../applications/blockchains/go-ethereum { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; @@ -30343,7 +30335,7 @@ with pkgs; boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; + zcash = callPackage ../applications/blockchains/zcash { }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; @@ -30398,8 +30390,6 @@ with pkgs; tts = callPackage ../tools/audio/tts { }; - fslint = callPackage ../applications/misc/fslint { }; - ### GAMES _1oom = callPackage ../games/1oom { }; @@ -30972,10 +30962,11 @@ with pkgs; inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) - minetestclient_4 minetestserver_4 minetestclient_5 minetestserver_5; - minetest = minetestclient_5; + minetest = minetestclient; + minetestclient = minetestclient_5; + minetestserver = minetestserver_5; mnemosyne = callPackage ../games/mnemosyne { python = python3; @@ -31114,9 +31105,14 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = libsForQt5.callPackage ../games/pokerth { }; + pokerth = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + }; - pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; }; + pokerth-server = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + target = "server"; + }; powermanga = callPackage ../games/powermanga { }; @@ -31392,9 +31388,7 @@ with pkgs; typespeed = callPackage ../games/typespeed { }; - uchess = callPackage ../games/uchess { - buildGoModule = buildGo116Module; - }; + uchess = callPackage ../games/uchess { }; udig = callPackage ../applications/gis/udig { }; @@ -31554,6 +31548,8 @@ with pkgs; _0verkill = callPackage ../games/0verkill { }; + _7kaa = callPackage ../games/7kaa { }; + hhexen = callPackage ../games/hhexen { }; wyvern = callPackage ../games/wyvern { }; @@ -32155,6 +32151,8 @@ with pkgs; sherpa = callPackage ../applications/science/physics/sherpa {}; + shtns = callPackage ../applications/science/physics/shtns { }; + xfitter = callPackage ../applications/science/physics/xfitter {}; xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; @@ -32853,8 +32851,6 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - demjson = with python3Packages; toPythonApplication demjson; - dosbox = callPackage ../misc/emulators/dosbox { }; dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; @@ -33014,13 +33010,9 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; - colima = callPackage ../applications/virtualization/colima { - buildGoModule = buildGo117Module; - }; + colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { - buildGoModule = buildGo117Module; - }; + lima = callPackage ../applications/virtualization/lima { }; logtop = callPackage ../tools/misc/logtop { }; @@ -33119,15 +33111,17 @@ with pkgs; mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + mysides = callPackage ../os-specific/darwin/mysides { }; + nar-serve = callPackage ../tools/nix/nar-serve { }; neo = callPackage ../applications/misc/neo { }; - nixVersions = callPackage ../tools/package-management/nix { + nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; inherit (darwin.apple_sdk.frameworks) Security; - }; + }); nix = nixVersions.stable; @@ -33211,6 +33205,20 @@ with pkgs; in c.config.system.build // c; + /* + A NixOS/home-manager/arion/... module that sets the `pkgs` module argument. + */ + pkgsModule = { lib, options, ... }: { + config = + if options?nixpkgs.pkgs then { + # legacy / nixpkgs.nix style + nixpkgs.pkgs = pkgs; + } + else { + # minimal + _module.args.pkgs = pkgs; + }; + }; /* * Run a NixOS VM network test using this evaluation of Nixpkgs. @@ -33347,6 +33355,8 @@ with pkgs; nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; + alejandra = callPackage ../tools/nix/alejandra { }; + nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -33708,9 +33718,7 @@ with pkgs; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; - inherit (callPackage ../applications/networking/cluster/terraform { - buildGoModule = buildGo117Module; - }) + inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform terraform_0_13 terraform_0_14 @@ -33724,9 +33732,7 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { - buildGoModule = buildGo117Module; - } + callPackage ../applications/networking/cluster/terraform-providers { } ); terraforming = callPackage ../applications/networking/cluster/terraforming { }; @@ -33747,7 +33753,7 @@ with pkgs; tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; - tilt = callPackage ../applications/networking/cluster/tilt {}; + tilt = callPackage ../applications/networking/cluster/tilt { }; timeular = callPackage ../applications/office/timeular {}; @@ -33820,9 +33826,7 @@ with pkgs; unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - vault = callPackage ../tools/security/vault { - buildGoModule = buildGo117Module; - }; + vault = callPackage ../tools/security/vault { }; vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; @@ -33965,8 +33969,6 @@ with pkgs; wraith = callPackage ../applications/networking/irc/wraith { }; - wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; - wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { wxGTK = wxGTK30; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -34385,9 +34387,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { - buildGoModule = buildGo117Module; - }; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; @@ -34405,7 +34405,7 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; @@ -34433,7 +34433,7 @@ with pkgs; jami-daemon jami-libclient jami-client-gnome jami-client-qt; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { - electron = electron_13; + electron = electron_16; }; zenstates = callPackage ../os-specific/linux/zenstates {}; diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index 2e031e2730..ff23949ae4 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -154,8 +154,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { trash = callPackage ../os-specific/darwin/trash { }; - usr-include = callPackage ../os-specific/darwin/usr-include { }; - xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { }; inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 132105fabe..378c2c4385 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -12,10 +12,14 @@ let "ghcjs810" "integer-simple" "native-bignum" + "ghc902" + "ghc921" "ghcHEAD" ]; nativeBignumIncludes = [ + "ghc902" + "ghc921" "ghcHEAD" ]; @@ -111,8 +115,8 @@ in { packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; }; ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix { bootPkgs = diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix index d86c9c6778..6771ffe65b 100644 --- a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -1,4 +1,4 @@ -{ lib, newScope, kodi, libretro }: +{ config, lib, newScope, kodi, libretro }: with lib; @@ -54,25 +54,7 @@ let self = rec { arteplussept = callPackage ../applications/video/kodi/addons/arteplussept { }; - controllers = { - default = callPackage ../applications/video/kodi/addons/controllers { controller = "default"; }; - - dreamcast = callPackage ../applications/video/kodi/addons/controllers { controller = "dreamcast"; }; - - gba = callPackage ../applications/video/kodi/addons/controllers { controller = "gba"; }; - - genesis = callPackage ../applications/video/kodi/addons/controllers { controller = "genesis"; }; - - mouse = callPackage ../applications/video/kodi/addons/controllers { controller = "mouse"; }; - - n64 = callPackage ../applications/video/kodi/addons/controllers { controller = "n64"; }; - - nes = callPackage ../applications/video/kodi/addons/controllers { controller = "nes"; }; - - ps = callPackage ../applications/video/kodi/addons/controllers { controller = "ps"; }; - - snes = callPackage ../applications/video/kodi/addons/controllers { controller = "snes"; }; - }; + controller-topology-project = callPackage ../applications/video/kodi/addons/controller-topology-project { }; iagl = callPackage ../applications/video/kodi/addons/iagl { }; @@ -171,4 +153,8 @@ let self = rec { trakt-module = callPackage ../applications/video/kodi/addons/trakt-module { }; trakt = callPackage ../applications/video/kodi/addons/trakt { }; -}; in self +}; in self // lib.optionalAttrs (config.allowAliases or true) { + # deprecated or renamed packages + + controllers = throw "kodi.packages.controllers has been replaced with kodi.packages.controller-topology-project - a package which contains a large number of controller profiles." { }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 785a78a853..3e38ce116a 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -288,6 +288,8 @@ in { dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; + dpdk = pkgs.dpdk.override { inherit kernel; }; + exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; diff --git a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix index c5a5a43769..a634322364 100644 --- a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix @@ -64,7 +64,7 @@ pkgs.releaseTools.sourceTarball { header "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages diff --git a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix index 441f9b3382..28f8cf3329 100644 --- a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -30,12 +30,22 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } # Relies on impure eval export NIX_ABORT_ON_WARN=true - nix-env -f $src \ - --show-trace --argstr system "$platform" \ - --arg config '{ allowAliases = false; }' \ - --option experimental-features 'no-url-literals' \ - -qa --drv-path --system-filter \* --system \ - "''${opts[@]}" 2> eval-warnings.log > packages1 + set +e + ( + set -x + nix-env -f $src \ + --show-trace --argstr system "$platform" \ + --arg config '{ allowAliases = false; }' \ + --option experimental-features 'no-url-literals' \ + -qa --drv-path --system-filter \* --system \ + "''${opts[@]}" 2> eval-warnings.log > packages1 + ) + rc=$? + set -e + if [ "$rc" != "0" ]; then + cat eval-warnings.log + exit $rc + fi s1=$(sha1sum packages1 | cut -c1-40) echo $s1 diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index f3773c9069..a29602dfb7 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -140,7 +140,9 @@ let ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; - cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; + cairo2 = callPackage ../development/ocaml-modules/cairo2 { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; + }; callipyge = callPackage ../development/ocaml-modules/callipyge { }; @@ -1055,8 +1057,6 @@ let ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; - ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; - ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; @@ -1179,6 +1179,8 @@ let printbox = callPackage ../development/ocaml-modules/printbox { }; + printbox-text = callPackage ../development/ocaml-modules/printbox/text.nix { }; + process = callPackage ../development/ocaml-modules/process { }; prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { }; diff --git a/third_party/nixpkgs/pkgs/top-level/packages-config.nix b/third_party/nixpkgs/pkgs/top-level/packages-config.nix index 1602eaf9f4..c33f8b2dc2 100644 --- a/third_party/nixpkgs/pkgs/top-level/packages-config.nix +++ b/third_party/nixpkgs/pkgs/top-level/packages-config.nix @@ -13,7 +13,6 @@ fdbPackages fusePackages gns3Packages - haskellPackages idrisPackages nodePackages nodePackages_latest @@ -31,6 +30,15 @@ zeroadPackages ; + haskellPackages = super.haskellPackages // { + # mesos, which this depends on, has been removed from nixpkgs. We are keeping + # the error message for now, so users will get an error message they can make + # sense of, but need to work around it here. + # TODO(@sternenseemann): remove this after branch-off of 22.05, along with the + # override in configuration-nix.nix + hs-mesos = null; + }; + # Make sure haskell.compiler is included, so alternative GHC versions show up, # but don't add haskell.packages.* since they contain the same packages (at # least by name) as haskellPackages. diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index f7d291928f..85a7f7b198 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -729,11 +729,20 @@ let Appcpanminus = buildPerlPackage { pname = "App-cpanminus"; - version = "1.7044"; + version = "1.7045"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz"; - sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3"; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7045.tar.gz"; + sha256 = "1779w07zxlgfk35s24ksr7k9azd5yl8sbb48y1aaph7y4gf4lkmc"; }; + # Use TLS endpoints for downloads and metadata by default + preConfigure = '' + substituteInPlace bin/cpanm \ + --replace http://www.cpan.org https://www.cpan.org \ + --replace http://backpan.perl.org https://backpan.perl.org \ + --replace http://fastapi.metacpan.org https://fastapi.metacpan.org \ + --replace http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org + ''; + propagatedBuildInputs = [ IOSocketSSL ]; meta = { homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; @@ -3674,7 +3683,7 @@ let }; }; - ConfigIniFiles = buildPerlModule { + ConfigIniFiles = buildPerlPackage { pname = "Config-IniFiles"; version = "3.000003"; src = fetchurl { @@ -4043,12 +4052,12 @@ let CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.28"; + version = "2.29"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.28.tar.gz"; - sha256 = "39d357489283d479695027640d7fc25b42ec3c52003071d1ec94496e34af5974"; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.29.tar.gz"; + sha256 = "1f55672efd505a9baacfa1924d115362120aa6bf8efab7a17c7cb090b17ccc41"; }; - propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases CompressBzip2 Expect FileHomeDir FileWhich LWP LogLog4perl ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck IOSocketSSL ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -4121,10 +4130,10 @@ let CPANChecksums = buildPerlPackage { pname = "CPAN-Checksums"; - version = "2.12"; + version = "2.14"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz"; - sha256 = "0f1dbpp4638jfdfwrywjmz88na5wzw4fdsmm2r7gh1x0s6r0yq4r"; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.14.tar.gz"; + sha256 = "4080716c5da7e03b504e3cc0ea1fd5ef9ed6915f6fb737564e9e13d355a89e39"; }; propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; meta = { @@ -9676,21 +9685,6 @@ let propagatedBuildInputs = [ Pango ]; }; - Gtk2GladeXML = buildPerlPackage { - pname = "Gtk2-GladeXML"; - version = "1.007"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz"; - sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; - }; - propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ]; - meta = { - description = "Create user interfaces directly from Glade XML files"; - license = lib.licenses.lgpl2Plus; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2GladeXML.x86_64-darwin - }; - }; - Gtk2TrayIcon = buildPerlPackage { pname = "Gtk2-TrayIcon"; version = "0.06"; @@ -11417,11 +11411,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.29"; + version = "12.39"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95"; + sha256 = "sha256-QDq1KTpEcl8EWj9a/bxF0TwghUulH30O5yDV0wsxy6I="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -25447,4 +25441,5 @@ let SubExporterUtil = self.SubExporter; version = self.Version; + Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 }; in self diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index e8416f9110..85072959df 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -33,13 +33,17 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 + asyncio-nats-client = nats-py; # added 2022-02-08 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 + carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 ConfigArgParse = configargparse; # added 2021-03-18 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 dateutil = python-dateutil; # added 2021-07-03 + demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 diff_cover = diff-cover; # added 2021-07-02 @@ -52,7 +56,9 @@ mapAliases ({ 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 + eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 + garminconnect-ha = garminconnect; # added 2022-02-05 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 @@ -60,6 +66,7 @@ mapAliases ({ grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 HAP-python = hap-python; # added 2021-06-01 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 + hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 IMAPClient = imapclient; # added 2021-10-28 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 @@ -72,6 +79,8 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 + pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 + pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 0b544bc862..d2a18db510 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 @@ in { adax = callPackage ../development/python-modules/adax { }; + adax-local = callPackage ../development/python-modules/adax-local { }; + adb-enhanced = callPackage ../development/python-modules/adb-enhanced { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; @@ -258,6 +260,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + aioaseko = callPackage ../development/python-modules/aioaseko { }; + aioasuswrt = callPackage ../development/python-modules/aioasuswrt { }; aioazuredevops = callPackage ../development/python-modules/aioazuredevops { }; @@ -362,6 +366,8 @@ in { aionotion = callPackage ../development/python-modules/aionotion { }; + aiooncue = callPackage ../development/python-modules/aiooncue { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; @@ -386,6 +392,8 @@ in { aiorun = callPackage ../development/python-modules/aiorun { }; + aiosenseme = callPackage ../development/python-modules/aiosenseme { }; + aiosenz = callPackage ../development/python-modules/aiosenz { }; aioserial = callPackage ../development/python-modules/aioserial { }; @@ -400,6 +408,8 @@ in { aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + aiosteamist = callPackage ../development/python-modules/aiosteamist { }; + aiostream = callPackage ../development/python-modules/aiostream { }; aioswitcher = callPackage ../development/python-modules/aioswitcher { }; @@ -416,6 +426,8 @@ in { aiowatttime = callPackage ../development/python-modules/aiowatttime { }; + aiowebostv = callPackage ../development/python-modules/aiowebostv { }; + aiowinreg = callPackage ../development/python-modules/aiowinreg { }; aioymaps = callPackage ../development/python-modules/aioymaps { }; @@ -534,8 +546,6 @@ in { anyio = callPackage ../development/python-modules/anyio { }; - anyjson = callPackage ../development/python-modules/anyjson { }; - anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; @@ -568,6 +578,8 @@ in { apptools = callPackage ../development/python-modules/apptools { }; + appthreat-vulnerability-db = callPackage ../development/python-modules/appthreat-vulnerability-db { }; + aprslib = callPackage ../development/python-modules/aprslib { }; APScheduler = callPackage ../development/python-modules/APScheduler { }; @@ -602,6 +614,8 @@ in { argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { }; + args = callPackage ../development/python-modules/args { }; aria2p = callPackage ../development/python-modules/aria2p { }; @@ -682,8 +696,6 @@ in { asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; - asyncio-nats-client = callPackage ../development/python-modules/asyncio-nats-client { }; - asyncio-rlock = callPackage ../development/python-modules/asyncio-rlock { }; asyncmy = callPackage ../development/python-modules/asyncmy { }; @@ -744,6 +756,8 @@ in { auroranoaa = callPackage ../development/python-modules/auroranoaa { }; + aurorapy = callPackage ../development/python-modules/aurorapy { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; authcaptureproxy = callPackage ../development/python-modules/authcaptureproxy { }; @@ -1441,8 +1455,6 @@ in { carbon = callPackage ../development/python-modules/carbon { }; - carrot = callPackage ../development/python-modules/carrot { }; - cart = callPackage ../development/python-modules/cart { }; cartopy = callPackage ../development/python-modules/cartopy { }; @@ -1515,6 +1527,8 @@ in { cffi = callPackage ../development/python-modules/cffi { }; + cffsubr = callPackage ../development/python-modules/cffsubr { }; + cfgv = callPackage ../development/python-modules/cfgv { }; cfn-flip = callPackage ../development/python-modules/cfn-flip { }; @@ -1577,6 +1591,8 @@ in { ci-py = callPackage ../development/python-modules/ci-py { }; + circuit-webhook = callPackage ../development/python-modules/circuit-webhook { }; + circuitbreaker = callPackage ../development/python-modules/circuitbreaker { }; cirq = callPackage ../development/python-modules/cirq { }; @@ -1769,6 +1785,8 @@ in { compiledb = callPackage ../development/python-modules/compiledb { }; + compreffor = callPackage ../development/python-modules/compreffor { }; + concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { }; conda = callPackage ../development/python-modules/conda { }; @@ -2088,8 +2106,6 @@ in { deluge-client = callPackage ../development/python-modules/deluge-client { }; - demjson = callPackage ../development/python-modules/demjson { }; - demjson3 = callPackage ../development/python-modules/demjson3 { }; dendropy = callPackage ../development/python-modules/dendropy { }; @@ -2158,6 +2174,8 @@ in { discordpy = callPackage ../development/python-modules/discordpy { }; + discovery30303 = callPackage ../development/python-modules/discovery30303 { }; + diskcache = callPackage ../development/python-modules/diskcache { }; dissononce = callPackage ../development/python-modules/dissononce { }; @@ -2176,9 +2194,10 @@ in { # Current LTS django_2 = callPackage ../development/python-modules/django/2.nix { }; + django_3 = callPackage ../development/python-modules/django/3.nix { }; # Current latest - django_3 = callPackage ../development/python-modules/django/3.nix { }; + django_4 = callPackage ../development/python-modules/django/4.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; @@ -2506,8 +2525,6 @@ in { edward = callPackage ../development/python-modules/edward { }; - eebrightbox = callPackage ../development/python-modules/eebrightbox { }; - effect = callPackage ../development/python-modules/effect { }; eggdeps = callPackage ../development/python-modules/eggdeps { }; @@ -2552,6 +2569,8 @@ in { emoji = callPackage ../development/python-modules/emoji { }; + empty-files = callPackage ../development/python-modules/empty-files { }; + empy = callPackage ../development/python-modules/empy { }; emulated-roku = callPackage ../development/python-modules/emulated-roku { }; @@ -2844,6 +2863,8 @@ in { flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; + flake8-bugbear = callPackage ../development/python-modules/flake8-bugbear { }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-length = callPackage ../development/python-modules/flake8-length { }; @@ -3117,7 +3138,7 @@ in { garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { }; - garminconnect-ha = callPackage ../development/python-modules/garminconnect-ha { }; + garminconnect = callPackage ../development/python-modules/garminconnect { }; gast = callPackage ../development/python-modules/gast { }; @@ -3187,6 +3208,8 @@ in { geomet = callPackage ../development/python-modules/geomet { }; + geometric = callPackage ../development/python-modules/geometric { }; + geopandas = callPackage ../development/python-modules/geopandas { }; geopy = callPackage ../development/python-modules/geopy { }; @@ -3462,6 +3485,8 @@ in { grandalf = callPackage ../development/python-modules/grandalf { }; + grapheme = callPackage ../development/python-modules/grapheme { }; + graphite_api = callPackage ../development/python-modules/graphite-api { }; graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; @@ -3641,8 +3666,6 @@ in { hdfs = callPackage ../development/python-modules/hdfs { }; - hdlparse = callPackage ../development/python-modules/hdlparse { }; - hdmedians = callPackage ../development/python-modules/hdmedians { }; headerparser = callPackage ../development/python-modules/headerparser { }; @@ -3885,6 +3908,8 @@ in { ijson = callPackage ../development/python-modules/ijson { }; + ilua = callPackage ../development/python-modules/ilua { }; + imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { }; imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; @@ -3925,6 +3950,8 @@ in { impacket = callPackage ../development/python-modules/impacket { }; + importlab = callPackage ../development/python-modules/importlab { }; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; importlib-resources = callPackage ../development/python-modules/importlib-resources { }; @@ -3985,6 +4012,8 @@ in { intelhex = callPackage ../development/python-modules/intelhex { }; + intellifire4py = callPackage ../development/python-modules/intellifire4py { }; + intensity-normalization = callPackage ../development/python-modules/intensity-normalization { }; internetarchive = callPackage ../development/python-modules/internetarchive { }; @@ -4113,7 +4142,11 @@ in { jax = callPackage ../development/python-modules/jax { }; - jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { }; + jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + cudatoolkit_11 = tensorflow_compat_cudatoolkit; + cudnn = tensorflow_compat_cudnn; + }; jaxlib-build = callPackage ../development/python-modules/jaxlib { # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. @@ -4125,6 +4158,14 @@ in { jaxlib = self.jaxlib-build; + jaxlibWithCuda = self.jaxlib-build.override { + cudaSupport = true; + }; + + jaxlibWithoutCuda = self.jaxlib-build.override { + cudaSupport = false; + }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; @@ -4424,7 +4465,7 @@ in { language-data = callPackage ../development/python-modules/language-data { }; - lark-parser = callPackage ../development/python-modules/lark-parser { }; + lark = callPackage ../development/python-modules/lark { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; @@ -5281,6 +5322,8 @@ in { nassl = callPackage ../development/python-modules/nassl { }; + nats-py = callPackage ../development/python-modules/nats-py { }; + nats-python = callPackage ../development/python-modules/nats-python { }; natsort = callPackage ../development/python-modules/natsort { }; @@ -5632,6 +5675,8 @@ in { opensimplex = callPackage ../development/python-modules/opensimplex { }; + openstackdocstheme = callPackage ../development/python-modules/openstackdocstheme { }; + openstacksdk = callPackage ../development/python-modules/openstacksdk { }; opentimestamps = callPackage ../development/python-modules/opentimestamps { }; @@ -6066,6 +6111,8 @@ in { pyhiveapi = callPackage ../development/python-modules/pyhiveapi { }; + pyhumps = callPackage ../development/python-modules/pyhumps { }; + pyisy = callPackage ../development/python-modules/pyisy { }; pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; @@ -6309,6 +6356,8 @@ in { prettytable = callPackage ../development/python-modules/prettytable { }; + primecountpy = callPackage ../development/python-modules/primecountpy { }; + primer3 = callPackage ../development/python-modules/primer3 { }; priority = callPackage ../development/python-modules/priority { }; @@ -6512,6 +6561,8 @@ in { pyaudio = callPackage ../development/python-modules/pyaudio { }; + pyaussiebb = callPackage ../development/python-modules/pyaussiebb { }; + pyautogui = callPackage ../development/python-modules/pyautogui { }; pyavm = callPackage ../development/python-modules/pyavm { }; @@ -6552,8 +6603,6 @@ in { inherit (pkgs.buildPackages) meson; }; - pycallgraph = callPackage ../development/python-modules/pycallgraph { }; - py = callPackage ../development/python-modules/py { }; pycangjie = callPackage ../development/python-modules/pycangjie { }; @@ -6578,6 +6627,8 @@ in { inherit (pkgs) graphviz; }; + pycfmodel = callPackage ../development/python-modules/pycfmodel { }; + pychannels = callPackage ../development/python-modules/pychannels { }; pychart = callPackage ../development/python-modules/pychart { }; @@ -7282,6 +7333,8 @@ in { pypykatz = callPackage ../development/python-modules/pypykatz { }; + pypytools = callPackage ../development/python-modules/pypytools { }; + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; @@ -7315,6 +7368,8 @@ in { pyquil = callPackage ../development/python-modules/pyquil { }; + pyqvrpro = callPackage ../development/python-modules/pyqvrpro { }; + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; pyrad = callPackage ../development/python-modules/pyrad { }; @@ -7920,6 +7975,8 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; + python-i18n = callPackage ../development/python-modules/python-i18n { }; + pythonix = callPackage ../development/python-modules/pythonix { nix = pkgs.nixVersions.nix_2_3; meson = pkgs.meson.override { python3 = self.python; }; @@ -8007,7 +8064,8 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; + inherit (pkgs) fontconfig rapidjson; + inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }); @@ -8364,6 +8422,8 @@ in { qscintilla = self.qscintilla-qt5; + qt5reactor = callPackage ../development/python-modules/qt5reactor { }; + qtawesome = callPackage ../development/python-modules/qtawesome { }; qtconsole = callPackage ../development/python-modules/qtconsole { }; @@ -8407,6 +8467,8 @@ in { radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + railroad-diagrams = callPackage ../development/python-modules/railroad-diagrams { }; + rainbowstream = callPackage ../development/python-modules/rainbowstream { }; ramlfications = callPackage ../development/python-modules/ramlfications { }; @@ -8699,6 +8761,8 @@ in { rtslib = callPackage ../development/python-modules/rtslib { }; + rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; + ruamel-base = callPackage ../development/python-modules/ruamel-base { }; ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { }; @@ -9224,6 +9288,8 @@ in { sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; + sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; @@ -9392,6 +9458,8 @@ in { statistics = callPackage ../development/python-modules/statistics { }; + statmake = callPackage ../development/python-modules/statmake { }; + statsd = callPackage ../development/python-modules/statsd { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; @@ -9572,6 +9640,8 @@ in { tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + teamcity-messages = callPackage ../development/python-modules/teamcity-messages { }; + telegram = callPackage ../development/python-modules/telegram { }; telethon = callPackage ../development/python-modules/telethon { @@ -9903,6 +9973,8 @@ in { trytond = callPackage ../development/python-modules/trytond { }; + ttls = callPackage ../development/python-modules/ttls { }; + ttp = callPackage ../development/python-modules/ttp { }; tubes = callPackage ../development/python-modules/tubes { }; @@ -9973,6 +10045,8 @@ in { txtorcon = callPackage ../development/python-modules/txtorcon { }; + txzmq = callPackage ../development/python-modules/txzmq { }; + typecode = callPackage ../development/python-modules/typecode { }; typecode-libmagic = callPackage ../development/python-modules/typecode/libmagic.nix { @@ -10043,6 +10117,10 @@ in { inherit (pkgs.xorg) libX11 libXext; }; + ufo2ft = callPackage ../development/python-modules/ufo2ft { }; + + ufoLib2 = callPackage ../development/python-modules/ufoLib2 { }; + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; @@ -10308,10 +10386,14 @@ in { wandb = callPackage ../development/python-modules/wandb { }; + warcio = callPackage ../development/python-modules/warcio { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; + warrant-lite = callPackage ../development/python-modules/warrant-lite { }; + waqiasync = callPackage ../development/python-modules/waqiasync { }; wasabi = callPackage ../development/python-modules/wasabi { }; @@ -10583,6 +10665,8 @@ in { inherit (pkgs.xorg) xorgserver; }; + xxh = callPackage ../tools/networking/xxh { }; + xxhash = callPackage ../development/python-modules/xxhash { }; yahooweather = callPackage ../development/python-modules/yahooweather { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix index 4a15b64da0..b98357a2cb 100644 --- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix @@ -26,6 +26,8 @@ with self; with super; { contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; + coverage = callPackage ../development/python2-modules/coverage { }; + cryptography = callPackage ../development/python2-modules/cryptography { }; cryptography_vectors = callPackage ../development/python2-modules/cryptography-vectors { }; @@ -108,12 +110,10 @@ with self; with super; { pygtk = callPackage ../development/python2-modules/pygtk { }; - pyGtkGlade = self.pygtk.override { - inherit (pkgs.gnome2) libglade; - }; - pyjwt = callPackage ../development/python2-modules/pyjwt { }; + pyparsing = callPackage ../development/python2-modules/pyparsing { }; + pyroma = callPackage ../development/python2-modules/pyroma { }; pysqlite = callPackage ../development/python2-modules/pysqlite { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index 2c2aecff4a..82828a3d61 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -311,11 +311,7 @@ let cabal2nix = released; cabal2nix-unstable = released; funcmp = released; - haskell-language-server = [ - compilerNames.ghc884 - compilerNames.ghc8107 - compilerNames.ghc902 - ]; + haskell-language-server = released; hoogle = released; hlint = released; hsdns = released; @@ -398,8 +394,8 @@ let jobs.pkgsMusl.haskell.compiler.ghc921 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc902 - jobs.pkgsMusl.haskell.compiler.integer-simple.ghc921 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc921 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-small.nix b/third_party/nixpkgs/pkgs/top-level/release-small.nix index 66c6bb3734..a267b20d66 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-small.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-small.nix @@ -30,7 +30,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; bind = linux; bsdiff = all; bzip2 = all; - classpath = linux; cmake = all; coreutils = all; cpio = all; @@ -41,12 +40,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; diffutils = all; e2fsprogs = linux; emacs = linux; - enscript = all; file = all; findutils = all; flex = all; gcc = all; - gcj = linux; glibc = linux; glibcLocales = linux; gnugrep = all; @@ -58,10 +55,8 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; gnused = all; gnutar = all; gnutls = linux; - gogoclient = linux; grub = linux; grub2 = linux; - gsl = linux; guile = linux; # tests fail on Cygwin gzip = all; hddtemp = linux; @@ -73,10 +68,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; idutils = all; inetutils = linux; iputils = linux; - jnettop = linux; - jwhois = linux; - kbd = linux; - keen4 = ["i686-linux"]; kvm = linux; qemu = linux; qemu_kvm = linux; @@ -97,17 +88,11 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; man = linux; man-pages = linux; mc = all; - mcabber = linux; - mcron = linux; mdadm = linux; mesa = mesaPlatforms; - midori = linux; mingetty = linux; - mk = linux; mktemp = all; - mono = linux; monotone = linux; - mpg321 = linux; mutt = linux; mysql = linux; # netcat broken on darwin @@ -122,24 +107,20 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; openssh = linux; openssl = all; pan = linux; - par2cmdline = all; pciutils = linux; pdf2xml = all; perl = all; pkg-config = all; pmccabe = linux; procps = linux; - python = unix; # Cygwin builds fail + python3 = unix; # Cygwin builds fail readline = all; rlwrap = all; - rpm = linux; rpcbind = linux; rsync = linux; screen = linux ++ darwin; scrot = linux; sdparm = linux; - sharutils = all; - sloccount = unix; # Cygwin builds fail smartmontools = all; sqlite = unix; # Cygwin builds fail squid = linux; @@ -150,8 +131,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; sudo = linux; sysklogd = linux; syslinux = ["i686-linux"]; - sysvinit = linux; - sysvtools = linux; tcl = linux; tcpdump = linux; texinfo = all; @@ -166,12 +145,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; webkitgtk = linux; wget = all; which = all; - wireshark = linux; wirelesstools = linux; wpa_supplicant = linux; xfsprogs = linux; xkeyboard_config = linux; - zile = linux; zip = all; } )) diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index 5980d88b01..0c759095f5 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -136,6 +136,7 @@ let ++ lib.optionals supportDarwin.x86_64 [ jobs.stdenv.x86_64-darwin jobs.cargo.x86_64-darwin + jobs.cachix.x86_64-darwin jobs.go.x86_64-darwin jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix index 9ac4a2ba15..9e64afe31f 100644 --- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -121,14 +121,15 @@ version = "7.0.1"; }; addressable = { + dependencies = ["idn-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + sha256 = "sha256-920p0tH1S2xqSa7Fj5WDsI2X4IjCJ6P8upL2xlMdWQg="; type = "gem"; }; - version = "2.4.0"; + version = "2.8.0"; }; ansi = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/top-level/wine-packages.nix b/third_party/nixpkgs/pkgs/top-level/wine-packages.nix index 5dbfd2d541..4f993bdf08 100644 --- a/third_party/nixpkgs/pkgs/top-level/wine-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/wine-packages.nix @@ -8,9 +8,6 @@ rec { }; base = minimal.override { - pngSupport = true; - jpegSupport = true; - tiffSupport = true; gettextSupport = true; fontconfigSupport = true; alsaSupport = true; @@ -25,7 +22,6 @@ rec { pulseaudioSupport = config.pulseaudio or stdenv.isLinux; udevSupport = true; xineramaSupport = true; - xmlSupport = true; sdlSupport = true; mingwSupport = true; }; @@ -33,8 +29,6 @@ rec { full = base.override { gtkSupport = true; gstreamerSupport = true; - colorManagementSupport = true; - mpg123Support = true; openalSupport = true; openclSupport = true; odbcSupport = true; @@ -42,10 +36,8 @@ rec { vaSupport = true; pcapSupport = true; v4lSupport = true; - gsmSupport = true; gphoto2Support = true; ldapSupport = true; - faudioSupport = true; vkd3dSupport = true; embedInstallers = true; };